Commit Graph
36398 Commits
Author SHA1 Message Date
zhengrunyu d3b31cae7c * Fix bug 21065. 2022-03-30 10:01:54 +08:00
zhengrunyu b118024249 * Fix bug for change story. 2022-03-30 10:01:42 +08:00
zhengrunyu c047d2b422 * Add api for close bug and confirm bug. 2022-03-30 10:01:28 +08:00
songchenxuan 1bc250a4b3 *Fix api bug. 2022-03-30 10:01:17 +08:00
zhengrunyu f8768f8a6e * Change api for story. 2022-03-30 09:59:01 +08:00
zhengrunyu a6612ff750 * Change api for story. 2022-03-30 09:35:52 +08:00
Zongjun Lan 97ddf11ecd * fix bug gantt 2022-03-29 17:42:44 +08:00
liyuchun e314fac838 * Fix bug #18316. 2022-03-29 17:28:30 +08:00
王怡栋 3191f7fc6e Merge branch 'sprint/lite6_lwr_remove_chat_menu_on_nonstandalone_lite' into 'sprint/165_package'
* show chat admin menu only in standalone lite vision, bug #21295.

See merge request easycorp/zentaopms!2623
2022-03-29 09:15:44 +00:00
liyuchun 673dfc017e Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package 2022-03-29 17:14:30 +08:00
王怡栋 bb5febef40 Merge branch 'sprint/165_package_lanzongjun_bugfix' into 'sprint/165_package'
* fix bug gantt

See merge request easycorp/zentaopms!2617
2022-03-29 09:14:21 +00:00
Wenrui LI 441fd846ba * show chat admin menu only in standalone lite vision, bug #21295. 2022-03-29 17:14:17 +08:00
liyuchun 94d0076249 * Fix error when import demo in alm. 2022-03-29 17:14:03 +08:00
Zongjun Lan 593fcc2db6 * fix bug gantt 2022-03-29 17:12:54 +08:00
王怡栋 90324495bc Merge branch 'sprint/xuanxuan96_lwr_fix_header_hook' into 'sprint/165_package'
* fix xuan header hook not loaded.

See merge request easycorp/zentaopms!2618
2022-03-29 08:21:09 +00:00
Wenrui LI 3446e4bf55 * fix xuan header hook not loaded. 2022-03-29 16:14:11 +08:00
Zongjun Lan 7c99a6153d * fix bug gantt 2022-03-29 16:11:21 +08:00
王怡栋 901a9c7d0f Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package 2022-03-29 11:02:35 +08:00
王怡栋 e051df4562 * fix for merge program. 2022-03-29 11:01:22 +08:00
Zongjun Lan 4206ffb843 * fix bug #21181 2022-03-29 09:53:04 +08:00
hufangzhou 125c0a424e * Modify the pack script file. 2022-03-28 17:16:39 +08:00
hufangzhou a09750983b * Modify the pack script file. 2022-03-28 16:55:23 +08:00
王怡栋 3ea4811433 Merge branch 'sprint/165_package_lanzongjun_bugfix' into 'sprint/165_package'
* fix bug #21181

See merge request easycorp/zentaopms!2589
2022-03-28 08:37:29 +00:00
Zongjun Lan 81791ba223 * fix bug #21181 2022-03-28 16:23:08 +08:00
mayue b59f8c454a * Optimize code. 2022-03-28 15:05:26 +08:00
王怡栋 43ed5b9e0c Merge branch 'sprint/lite6_lwr_fix_xuan_lite' into 'sprint/165_package'
Sprint/lite6 lwr fix xuan lite

See merge request easycorp/zentaopms!2580
2022-03-28 06:59:21 +00:00
Wenrui LI df0f6cfac4 * fix chat priv and menu, bug #21175. 2022-03-28 14:57:31 +08:00
Wenrui LI 63f93bdde2 * change client to chat. 2022-03-28 14:57:31 +08:00
mayue 872808d0ac * Optimize code. 2022-03-28 14:55:22 +08:00
zhouxin ce6da7784b * Fix bug #21221. 2022-03-28 05:58:42 +00:00
王怡栋 8b41a9b627 Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package'
* fix bug #21077

See merge request easycorp/zentaopms!2566
2022-03-28 05:03:53 +00:00
mayue 3a3e351c8d * Optimize code. 2022-03-28 10:52:41 +08:00
xieqiyu 41908ac69b * Fix bug of modify index of batch create. 2022-03-28 10:27:48 +08:00
Zongjun Lan 4851dce4e1 * fix bug #21077 2022-03-28 10:27:34 +08:00
zhouxin 94c3233d5a * Fix bug #17415. 2022-03-28 00:58:29 +00:00
王怡栋 15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
王怡栋 c2a4bd5cbf Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-28 08:47:13 +08:00
hufangzhou b6724d3971 * Fix bug #21188. 2022-03-28 08:43:04 +08:00
孙广明 21d4a48642 Merge branch 'liyuchun_fixbug' into 'master'
Fix bug #17252,17367.

See merge request easycorp/zentaopms!2539
2022-03-28 00:42:01 +00:00
孙广明 e736c8d8c0 Merge branch 'autotest_ly' into 'master'
add project and product data

See merge request easycorp/zentaopms!2559
2022-03-28 00:41:34 +00:00
liyang ce6fd25ee2 add project and product data 2022-03-28 08:39:33 +08:00
李玉春 7e0cf1500e Merge branch 'fixbug_cyy' into 'master'
* Fix bug #19745.

See merge request easycorp/zentaopms!2555
2022-03-28 00:38:56 +00:00
李玉春 5d0e802a49 Merge branch 'devops24_51136' into 'master'
Finish task#51136

See merge request easycorp/zentaopms!2554
2022-03-25 09:35:43 +00:00
zenggang 0867f72e20 * Finish task#51136 2022-03-25 07:56:31 +00:00
孙广明 2ea79a7e21 Merge branch 'autotest_ly' into 'master'
update story data

See merge request easycorp/zentaopms!2552
2022-03-25 07:34:01 +00:00
孙广明 0d6d80e6f2 Merge branch 'sprint/autoTest_liumengyi_product' into 'master'
* Add auto test of product.

See merge request easycorp/zentaopms!2551
2022-03-25 07:33:06 +00:00
liyang 5cc3608d29 update story data 2022-03-25 15:30:29 +08:00
liyuchun d1f18c6b08 Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package 2022-03-25 15:30:06 +08:00
liumengyi 2af66dd17f * Fix bug. 2022-03-25 15:29:40 +08:00
王怡栋 67d4afd772 Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package'
* fix bug #21005

See merge request easycorp/zentaopms!2546
2022-03-25 07:29:20 +00:00