Commit Graph
30586 Commits
Author SHA1 Message Date
zhouxin bb47bfa04c * Fix bug #21333. 2022-03-31 06:02:31 +00: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
sunjun 83507debe8 *Fixbug #19687 2022-03-30 20:15:16 +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
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
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
Zongjun Lan 195b13325e * fix bug #20811 2022-03-30 15:29:40 +08:00
sunjun 6fa5c475a8 *Fixbug #19687 2022-03-30 15:27:20 +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
李玉春 43f8dd4638 Merge branch 'sunhuawei_fixbug_21183' into 'master'
*Fix bug#21183.

See merge request easycorp/zentaopms!2634
2022-03-30 07:15:35 +00:00
tianshujie b452680fb3 * Fix bug #14841. 2022-03-30 14:48:34 +08:00
孙华伟 b01120b6a3 *Fix bug#21183. 2022-03-30 14:42:47 +08:00
xieqiyu 039f7f037d * Fix bug of check iframe. 2022-03-30 14:11:28 +08:00
李玉春 d0d33aa277 Merge branch 'devops24_51117' into 'master'
Finish task#51117

See merge request easycorp/zentaopms!2629
2022-03-30 06:07:52 +00: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
caoyanyi c2bc48fc38 * Fix bug #6971. 2022-03-30 13:29:38 +08: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
liyuchun 1aa30343a4 * Adjust style. 2022-03-30 11:38:04 +08:00
sunjun 5812bb99cb *Fixbug #19687 2022-03-30 11:35:15 +08:00
zhouxin cd5ac50b6f * Fix bug #17322. 2022-03-30 03:30:02 +00: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
tianshujie 7c97c4ad63 * Fix bug #21266. 2022-03-30 11:22:06 +08: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
tianshujie c24d418115 * Fix bug #17400. 2022-03-30 11:11:52 +08:00
xieqiyu f418c9b954 * Fix bug#21283. 2022-03-30 11:10:49 +08:00
李玉春 9b82ef6e78 Merge branch 'sprint/tianshujie_bug21282' into 'master'
* Fix bug #21282.

See merge request easycorp/zentaopms!2628
2022-03-30 03:04:20 +00: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
zenggang 5ceeb72655 * Finish task#51117 2022-03-30 02:43:34 +00:00
liyuchun ca5ef459da * Fix bug #16579. 2022-03-30 10:36:12 +08:00