Commit Graph
1573 Commits
Author SHA1 Message Date
孙广明 5cc345e666 Merge branch 'master_xieqiyu_19665' into 'master'
* Fix bug#19665.

See merge request easycorp/zentaopms!2676
2022-03-31 09:42:04 +00:00
xieqiyu 2a57f4fd28 * Fix bug#19665. 2022-03-31 16:08:33 +08:00
tianshujie deeced3e14 * Fix bug #21307. 2022-03-31 16:04:41 +08:00
孙广明 4e2f0a3d86 Merge branch 'master_xieqiyu_19273' into 'master'
* Fix bug#19273.

See merge request easycorp/zentaopms!2666
2022-03-31 07:24:15 +00:00
孙广明 50f370f185 Merge branch 'sprint/tianshujie_bug21300' into 'master'
* Fix bug #21300.

See merge request easycorp/zentaopms!2673
2022-03-31 07:21:28 +00:00
孙广明 0a2abf6cb9 Merge branch 'master_xieqiyu_19197' into 'master'
* Fix bug#19197.

See merge request easycorp/zentaopms!2667
2022-03-31 07:18:21 +00:00
tianshujie b1bb3b7400 * Fix bug #21300. 2022-03-31 15:15:24 +08:00
孙广明 d388d2bfe7 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2671
2022-03-31 06:26:21 +00:00
xieqiyu 4542ffb0e2 * Fix bug#19197. 2022-03-31 13:59:38 +08:00
xieqiyu 2ed1eedfcf * Fix bug#19273. 2022-03-31 13:42:28 +08:00
朱金勇 29abda11d5 Merge branch 'sprint/sunhao/bug18424' into 'master'
* bug #18424, optimize d-n-d UI for kanban, finish drag action when mouse leave document.

See merge request easycorp/zentaopms!2655
2022-03-31 03:23:38 +00:00
孙广明 e2c29e7854 Merge branch 'sprint/master_zhouxudong_18270' into 'master'
Sprint/master zhouxudong 18270

See merge request easycorp/zentaopms!2654
2022-03-31 03:08:33 +00:00
孙广明 5072b8929b Merge branch 'sprint/master_zhouxudong_18002' into 'master'
Sprint/master zhouxudong 18002

See merge request easycorp/zentaopms!2659
2022-03-31 02:37:33 +00:00
zhouxudong fb5a792fee * Fix bug #18002. 2022-03-31 10:05:31 +08:00
tianshujie 16df973236 * Fix bug #16636. 2022-03-31 09:28:28 +08:00
Hao Sun 123aec72c4 * bug #18424, optimize d-n-d UI for kanban, finish drag action when mouse leave document. 2022-03-31 08:42:36 +08:00
李玉春 af5eb87896 Merge branch 'sprint/master_zhouxudong_19300' into 'master'
Fix bug #19300.

See merge request easycorp/zentaopms!2641
2022-03-31 00:33:34 +00:00
xieqiyu 79d9664263 * Fix bug#18002. 2022-03-30 20:48:33 +08:00
xieqiyu af7f9bd8e3 * Fix bug#18270. 2022-03-30 20:22:17 +08:00
孙广明 36244ef5a2 Merge branch 'fixbugs_zhouxin_20813' into 'master'
* Fix bug #20813.

See merge request easycorp/zentaopms!2646
2022-03-30 09:14:08 +00:00
王怡栋 08e3b0e29d Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
#   module/execution/model.php
2022-03-30 08:01:18 +00:00
王怡栋 6c078665da Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2636
2022-03-30 08:00:01 +00:00
tianshujie a93dcb0ec7 * Modify the link in the executive board. 2022-03-30 15:55:45 +08:00
zhouxudong 90db981a65 Fix bug #19300. 2022-03-30 15:33:03 +08:00
tianshujie 4f4dfd990e * Optimize code logic. 2022-03-30 15:22:27 +08:00
tanghucheng 19e6390ed7 * Fix bug #20890. 2022-03-30 15:16:52 +08:00
zhouxudong c86e39c093 * Fix bug #18002 #19684. 2022-03-30 14:26:24 +08:00
孙广明 2b1b3b1733 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #20939.

See merge request easycorp/zentaopms!2619
2022-03-30 06:03:01 +00:00
tianshujie be96ca9323 * Fix bug #16060. 2022-03-30 13:42:39 +08:00
zhouxin 2280c483ad * Fix bug #20813. 2022-03-30 05:30:10 +00:00
孙广明 3a808fc514 Merge branch 'fixbugs_zhouxin_17322' into 'master'
Fixbugs zhouxin 17322

See merge request easycorp/zentaopms!2631
2022-03-30 05:12:36 +00:00
zhouxin a8d3ff2801 * Fix bug #17322. 2022-03-30 05:11:32 +00:00
zhouxudong c7e76c1176 * Fix bug #18270. 2022-03-30 13:05:59 +08:00
liyuchun 1aa30343a4 * Adjust style. 2022-03-30 11:38:04 +08:00
zhouxin 5cfff22e5a * Fix bug #21131. 2022-03-30 03:27:30 +00:00
zhouxin 1d21f7f62d * Fix bug #17322. 2022-03-30 03:23:48 +00:00
李玉春 c83e0de8c7 Merge branch 'master_xieqiyu_21283' into 'master'
* Fix bug#21283.

See merge request easycorp/zentaopms!2630
2022-03-30 03:18:12 +00:00
xieqiyu f418c9b954 * Fix bug#21283. 2022-03-30 11:10:49 +08:00
tianshujie 317ff297b1 * Fix Kanban related issues. 2022-03-30 11:02:29 +08:00
tianshujie 0e3779ca1b * Fix Kanban related issues. 2022-03-30 10:45:01 +08:00
liyuchun ca5ef459da * Fix bug #16579. 2022-03-30 10:36:12 +08:00
tianshujie 63e915a555 * Modify the code judgment logic. 2022-03-30 10:10:19 +08:00
tianshujie b638bd1c83 * Fix bug #21282. 2022-03-30 09:40:23 +08:00
zhouxudong 6b9eddc355 * Fix bug #18002. 2022-03-30 09:35:59 +08:00
zhouxudong ecf749b7da * Fix bug #18002. 2022-03-29 16:59:33 +08:00
zhouxudong 3e70b88210 * Fix bug #18270. 2022-03-29 14:49:01 +08:00
tianshujie 7885b87ef3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug16101 2022-03-29 14:30:55 +08:00
李玉春 4d28e9772d Merge branch 'devops24_21092' into 'master'
Fix bug#21092

See merge request easycorp/zentaopms!2600
2022-03-29 06:19:09 +00:00
zenggang 028833b838 * Fix bug#21092,11398 2022-03-29 06:16:14 +00:00
tianshujie a0c4457a95 * Fix bug #16101. 2022-03-29 13:59:16 +08:00