Commit Graph
4155 Commits
Author SHA1 Message Date
tianshujie 105ab0aeeb * Fix bug #24365. 2022-06-29 13:39:26 +08:00
zhouxudong 7e600bf701 * Fix bug $24398. 2022-06-28 09:26:52 +00:00
孙广明 3cac1a020c * Refactor action getDynamic. 2022-06-28 15:02:19 +08:00
王怡栋 4d95909d6e Merge branch 'sprint/208_liumengyi_58558' into 'master'
* Finish task #58558, #58559.

See merge request easycorp/zentaopms!4186
2022-06-28 06:22:42 +00:00
liumengyi 2379f0e4a4 * Finish task #58558, #58559. 2022-06-28 13:22:23 +08:00
hufangzhou 91bc9e3327 * Finish task #58569. 2022-06-28 13:05:48 +08:00
王怡栋 2875e33357 Merge branch 'sprint/208_liumengyi_58553' into 'master'
* Finish task #58561.

See merge request easycorp/zentaopms!4179
2022-06-28 03:52:02 +00:00
王怡栋 742d791e63 Merge branch 'sprint/master_zhouxudong_24410' into 'master'
* Fix bug #24410.

See merge request easycorp/zentaopms!4173
2022-06-28 03:28:51 +00:00
王怡栋 1c45032e88 Merge branch 'sprint/208_tianshujie_58560' into 'master'
* Finish task #58560.

See merge request easycorp/zentaopms!4174
2022-06-28 03:28:15 +00:00
tianshujie 3a380aee1d * Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560. 2022-06-28 11:23:20 +08:00
liumengyi 3dda133a92 * Finish task #58561. 2022-06-28 11:08:30 +08:00
zhouxudong 966b965692 * Fix bug #24410. 2022-06-28 02:12:30 +00:00
zhouxudong eaa39c7f0f * Finish task #58576 #58577. 2022-06-27 09:14:37 +00:00
tianshujie 26f37ec09c * Finish task #58560. 2022-06-27 15:38:33 +08:00
zhouxudong 446ec44f29 * Finish task #58576 #58577. 2022-06-27 07:36:13 +00:00
hufangzhou eebcfaad58 * Adjust the spacing of dynamic block and dynamic page. 2022-06-24 13:33:11 +08:00
zhouxudong 7fce4137c5 * Fix bug #24176. 2022-06-23 07:46:34 +00:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
hufangzhou ac69cd1afb * Finish task #57883. 2022-06-22 10:39:55 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
孙广明 34ddc497ba Merge branch 'zentaopms_207' 2022-06-22 08:33:17 +08:00
hufangzhou adad8ea3ae * Finish task #57882, #57874, #57873, #57855. 2022-06-21 17:30:36 +08:00
孙广明 5f26b603e7 * Code for bug #24007. 2022-06-21 15:22:12 +08:00
孙广明 642b518397 Merge branch 'codeReview' into 'master'
codeReview

See merge request easycorp/zentaopms!4004
2022-06-17 07:11:23 +00:00
sunjun fec9f4f1dd codeReview 2022-06-17 05:05:44 +00:00
Hao Sun 834689d226 * bug #23877, fix user picker not work as expected. 2022-06-17 04:04:28 +00:00
tianshujie a974f333d2 * Modify Edit logic for switching program. 2022-06-17 11:46:43 +08:00
tianshujie a2421b85bb * Modify Edit logic for switching program. 2022-06-17 11:37:40 +08:00
xieqiyu d0ac2813ec * Fix bug#23725. 2022-06-17 09:55:30 +08:00
王怡栋 8eb32c3062 Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23832.

See merge request easycorp/zentaopms!3979
2022-06-16 08:59:06 +00:00
孙广明 dfb9cddc6a Merge branch 'fixissue_planIcon' into 'master'
fixissue_planIcon

See merge request easycorp/zentaopms!3983
2022-06-16 08:06:49 +00:00
sunjun 8b4d326b90 fixissue_planIcon 2022-06-16 07:57:40 +00:00
wangyidong 048c5e362e * adjust for project batchedit menu. 2022-06-16 15:51:06 +08:00
tanghucheng ab9657abf9 * Fix bug #23832. 2022-06-16 13:49:10 +08:00
tianshujie b1f29eed4e * Fix bug #23815. 2022-06-16 13:30:59 +08:00
tianshujie 65c9254f7c * Resolve issue #677. 2022-06-16 11:22:15 +08:00
zhouxudong 3b01055e5f * Fix bug #23672. 2022-06-15 09:00:16 +00:00
mayue ee058f67f1 * Finish task #57393. 2022-06-15 15:09:05 +08:00
孙广明 6656dd71a5 Merge branch 'sprint_204_57093' into 'master'
Sprint 204 57093

See merge request easycorp/zentaopms!3919
2022-06-15 03:09:10 +00:00
sunjun a4b45ab9ff sprint_204_57093 2022-06-15 03:03:28 +00:00
sunjun ad72c54ce8 sprint_204_57093 2022-06-15 02:56:33 +00:00
sunjun a3f6e18f93 sprint_204_57093 2022-06-15 01:48:14 +00:00
zhujinyong 87f50aa3be Merge branch 'sprint/sunhao/task56391' 2022-06-14 17:12:21 +08:00
sunjun 0a485ebec9 sprint_204_57093 2022-06-14 08:56:26 +00:00
Hao Sun 86b1c3f82d * support for update picker options in select project member. 2022-06-14 08:33:12 +00:00
王怡栋 71fb547445 Merge branch 'master_xieqiyu_56922' into 'master'
* Finish task#56922.

See merge request easycorp/zentaopms!3910
2022-06-14 07:19:42 +00:00
xieqiyu 38dad8467f * Finish task#56922. 2022-06-14 15:00:08 +08:00
孙广明 dbb1ccc413 Merge branch 'sprint/203_zg_56558' into 'master'
* Finish task#56558

See merge request easycorp/zentaopms!3892
2022-06-14 06:58:39 +00:00
sunjun 74726de8c1 sprint_204_57093 2022-06-14 06:48:24 +00:00