Commit Graph
30623 Commits
Author SHA1 Message Date
liyuchun b7d3bea247 * Fix bug #21061. 2022-04-01 10:31:38 +08:00
liyuchun 4240b563c9 * Fix bug #21061. 2022-04-01 10:27:27 +08:00
liyuchun 77caa6c8c5 * Fix bug #13324. 2022-03-31 13:43:35 +08:00
朱金勇 fb49f8ebbd Merge branch 'sgm_fixbug' into 'master'
* Fix my - preference bug.

See merge request easycorp/zentaopms!2663
2022-03-31 03:32:34 +00:00
孙广明 ce422e102f * Fix my - preference bug. 2022-03-31 11:31:38 +08:00
李玉春 510496e156 Merge branch 'devops24_21097' into 'master'
Fix bug#21097,21096

See merge request easycorp/zentaopms!2657
2022-03-31 03:28:15 +00:00
zenggang 3d5c425501 * Adjust code 2022-03-31 03:26:57 +00: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
孙广明 3d2de17fff Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #11348.

See merge request easycorp/zentaopms!2648
2022-03-31 03:08:50 +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
孙广明 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
zhouxudong 8efcc37f4b * Fix bug #18083. 2022-03-31 11:02:59 +08:00
王怡栋 325d7c99e5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-31 10:44:20 +08:00
王怡栋 6e608e2911 * adjust code for update kanban. 2022-03-31 10:43:09 +08:00
王怡栋 d02b555d87 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20165

See merge request easycorp/zentaopms!2647
2022-03-31 02:41:12 +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
孙广明 4487902db3 Merge branch 'sprint/master_zhouxudong_18744' into 'master'
Sprint/master zhouxudong 18744

See merge request easycorp/zentaopms!2656
2022-03-31 02:36:13 +00:00
zhouxudong 16e62835ae * Fix bug #18002. 2022-03-31 10:06:58 +08:00
zhouxudong fb5a792fee * Fix bug #18002. 2022-03-31 10:05:31 +08:00
zenggang 40f9a85a6f * Fix bug#21097,21096 2022-03-31 01:35:50 +00:00
zhouxudong 3e49aee5dc * Fix bug #18744. 2022-03-31 08:59:04 +08:00
zhouxudong 1b4441e546 * Fix bug #18744. 2022-03-31 08:55:14 +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
李玉春 9d2ac6ff70 Merge branch 'fixbug_sunjun_20372' into 'master'
*Fixbug #20372

See merge request easycorp/zentaopms!2652
2022-03-31 00:33:19 +00:00
李玉春 7dbf565a76 Merge branch 'fixbug_sunjun_19687' into 'master'
Fixbug sunjun 19687

See merge request easycorp/zentaopms!2644
2022-03-31 00:24:37 +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
sunjun 83507debe8 *Fixbug #19687 2022-03-30 20:15:16 +08:00
zhouxudong b2ade4c3d7 * Fix bug #18744 #18763. 2022-03-30 17:30:37 +08:00
xieqiyu 0983c30e8d * Fix bug#18083. 2022-03-30 17:26:17 +08:00
孙广明 7af812ca3e Merge branch 'fixbugs_zhouxin_16317' into 'master'
* Fix bug #16317.

See merge request easycorp/zentaopms!2649
2022-03-30 09:24:07 +00:00
zhouxudong 33629b5183 * Fix bug #18744. 2022-03-30 17:21:42 +08:00
zhouxin 082e7cd081 Delete a blank line. 2022-03-30 09:17:23 +00:00
孙广明 2907e3171d Merge branch 'fixbugs_zhouxin_15286' into 'master'
* Fix bug #15286.

See merge request easycorp/zentaopms!2645
2022-03-30 09:15:38 +00: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
sunjun 2dc2a6448f *Fixbug #20372 2022-03-30 17:13:30 +08:00
李玉春 a680dd14e7 Merge branch 'cyy_fixbug' into 'master'
* Fix bug #6971.

See merge request easycorp/zentaopms!2638
2022-03-30 09:12:48 +00:00
zhujinyong b48c3c68b4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-30 17:08:31 +08:00
zhujinyong a91d090845 + Add options api. 2022-03-30 17:08:03 +08:00
zhouxin b29d13ddd7 * Fix bug #16317. 2022-03-30 09:01:55 +00:00
liyuchun 74d2ed5ea6 * Fix bug #11348. 2022-03-30 17:01:15 +08:00
Zongjun Lan df1dc3dd9b * fix bug #20165 2022-03-30 16:51:14 +08:00
zhouxin 88982a5e0e * Fix bug #15286. 2022-03-30 08:29:20 +00:00
王怡栋 08e3b0e29d Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
#   module/execution/model.php
2022-03-30 08:01:18 +00:00
王怡栋 2d60ea869b Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20811

See merge request easycorp/zentaopms!2640
2022-03-30 08:00:25 +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
mayue 1c05b13892 * Fix bug #16456. 2022-03-30 15:47:04 +08:00
zhouxudong 90db981a65 Fix bug #19300. 2022-03-30 15:33:03 +08:00