Commit Graph
582 Commits
Author SHA1 Message Date
李玉春 ecf6797cb2 Merge branch 'sprint/master_zhouxudong_15146' into 'master'
Sprint/master zhouxudong 15146

See merge request easycorp/zentaopms!2855
2022-04-11 06:14:39 +00:00
周旭东 36e1809e7c Update control.php 2022-04-11 06:11:03 +00:00
xieqiyu 93cb0c08bf * Fix bug#15146. 2022-04-11 14:07:49 +08:00
zhouxudong 5e5f3c50d1 * Fix bug #15146. 2022-04-11 09:50:59 +08:00
朱金勇 1518796b03 Merge branch 'app_zry' into 'master'
* Fix bug 21591.

See merge request easycorp/zentaopms!2828
2022-04-08 06:05:36 +00:00
zhengrunyu a7d7cca753 * Fix bug 21591. 2022-04-08 14:03:21 +08:00
王怡栋 3f74884813 * fix bug #21411. 2022-04-02 15:53:38 +08:00
王怡栋 adb3a7ea72 Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
#   module/project/model.php
2022-04-02 07:33:24 +00:00
tanghucheng 8c81661d37 * Fix bug #21431. 2022-04-02 14:30:25 +08:00
tianshujie b2e99c8dd4 * Modify the jump link mode. 2022-04-02 10:37:43 +08:00
tianshujie b9dc9b118e * Fix bug #19676. 2022-04-01 14:05:06 +08:00
xieqiyu 2a57f4fd28 * Fix bug#19665. 2022-03-31 16:08:33 +08:00
xieqiyu 2ed1eedfcf * Fix bug#19273. 2022-03-31 13:42:28 +08:00
孙广明 df2cda6e8b Merge branch 'sprint/master_zhouxudong_18083' into 'master'
Sprint/master zhouxudong 18083

See merge request easycorp/zentaopms!2653
2022-03-31 03:06:37 +00:00
xieqiyu 0983c30e8d * Fix bug#18083. 2022-03-30 17:26:17 +08:00
caoyanyi c2bc48fc38 * Fix bug #6971. 2022-03-30 13:29:38 +08:00
tianshujie c9c1573a2d * Fix bug #20523. 2022-03-24 14:40:38 +08:00
zhujinyong 0c39542c38 Merge branch 'Zentao_app1.1' 2022-03-22 10:55:09 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
caoyanyi bd8dfd8269 Merge branch 'Zentao_app1.1' of https://gitlab.zcorp.cc/easycorp/zentaopms into Zentao_app1.1 2022-03-21 14:41:49 +08:00
caoyanyi f2d6299356 * Fix bug #20662. 2022-03-21 10:39:41 +08:00
Zongjun Lan 3d936d7dc8 * fix bug #20703 2022-03-14 15:43:15 +08:00
zhouxin f9c4e15149 Fix bug #50416. 2022-03-14 02:09:18 +00:00
孙广明 4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
xieqiyu 4ba238cd27 * Modify review code. 2022-03-09 14:36:50 +08:00
mayue 9f38f5cd10 * Fix bug #50240. 2022-03-09 13:27:42 +08:00
xieqiyu 139ea1e04a * Modify review code. 2022-03-09 11:17:36 +08:00
zhangzilong 6327b37eae * Code for task #49888. 2022-03-09 10:41:46 +08:00
xieqiyu 944c0efdfe * Add selected lane when batch create in kanban. 2022-03-08 14:43:55 +08:00
孙华伟 03e3f26ad5 * 2022-03-08 10:03:06 +08:00
zhangzilong 45ad8dbf96 * Code for task #49888. 2022-03-07 13:07:52 +08:00
liumengyi 9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
liumengyi e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
tanghucheng 6b2bc49830 * Finish task #49409. 2022-02-22 16:59:09 +08:00
zhujinyong 408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
tianshujie e22bd59961 * Fix bug #19306. 2022-02-16 09:57:17 +08:00
tanghucheng 1506fe5e4c * fix bug #19025. 2022-01-28 13:15:02 +08:00
tanghucheng 516001b2eb * Fix bug #19064. 2022-01-27 13:54:06 +08:00
tanghucheng 2e2dc5581b * fix project index and global create card. 2022-01-24 16:48:06 +08:00
孙广明 7e250dfaee Merge branch 'xieqiyu_fixbug_18792' into 'master'
* Fix bug#18792.

See merge request easycorp/zentaopms!1520
2022-01-21 06:35:15 +00:00
tianshujie fe23db6218 * Finish task #48012. 2022-01-21 12:23:38 +08:00
tianshujie d38bb533b9 * Restore code. 2022-01-21 09:02:16 +08:00
tianshujie c3ca6cf370 * Remove useless code. 2022-01-21 08:48:59 +08:00
tianshujie 25ee419afc * Implement the partial refresh function of the task card. 2022-01-20 15:31:10 +08:00
xieqiyu 795d691e8d * Fix bug#18792. 2022-01-20 15:00:16 +08:00
tianshujie 7383bb566d * Modify the question. 2022-01-20 13:49:21 +08:00
tianshujie ee15a96157 * Achieve smooth refresh of completed tasks. 2022-01-20 13:41:20 +08:00
朱金勇 d39aa0ecbb Merge branch 'zentao_client_fix' into 'master'
Zentao client fix

See merge request easycorp/zentaopms!1460
2022-01-18 02:33:01 +00:00
tianshujie 103f9b8935 * Refactored update swimlane code. 2022-01-17 14:54:08 +08:00