Commit Graph
51636 Commits
Author SHA1 Message Date
孙广明 6f3003e055 Merge branch 'wxp_bug32166' into 'master'
* Fix bug #32166.

See merge request easycorp/zentaopms!7056
2023-02-27 00:33:19 +00:00
朱金勇 bbdcb95808 Merge branch 'cron' into 'master'
- Remove useless code.

See merge request easycorp/zentaopms!7069
2023-02-26 13:05:34 +00:00
hufangzhou 655e8f470b * Update the prepareupdate script file. 2023-02-26 11:22:12 +00:00
Lufei feefe21b3f - Remove useless code. 2023-02-25 15:10:56 +08:00
Yagami a7db149f73 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-24 16:32:12 +08:00
Yagami 9eaf0920e8 * Remove unused code. 2023-02-24 16:31:32 +08:00
孙广明 2fdd4f704a Merge branch 'sprint/lmy_task' into 'master'
* Finish task #85455, #85456.

See merge request easycorp/zentaopms!7066
2023-02-24 07:20:22 +00:00
liumengyi 6cfeb9e928 * Modify unit test. 2023-02-24 06:52:43 +00:00
Yagami d0c8ef4430 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-24 14:52:19 +08:00
Yagami b151d1fb32 * Finish task #85459. 2023-02-24 14:50:37 +08:00
liumengyi f45c4ccdd4 * Finish task #85455, #85456. 2023-02-24 06:24:16 +00:00
王怡栋 b227ebdfcf Merge branch 'dev/gfl_theme_css_refactors' into 'master'
* ZUI: css theme refactors .

See merge request easycorp/zentaopms!7065
2023-02-24 05:41:54 +00:00
guofeilong 016fe0bae0 * ZUI: css theme refactors . 2023-02-24 13:39:41 +08:00
朱金勇 21523f68c9 Merge branch 'tsj_fixbug' into 'master'
* Remove other navigation for iterations under the Fusion Falls project.

See merge request easycorp/zentaopms!7062
2023-02-24 05:20:35 +00:00
孙广明 370b7c0aca Merge branch 'sprint/lmy_task' into 'master'
* Change the drop-down box to a radio button.

See merge request easycorp/zentaopms!7063
2023-02-24 05:09:14 +00:00
liumengyi 137dcf1e9a * * Optimize code for create waterfallplus execution. 2023-02-24 05:06:14 +00:00
liumengyi eef6386ad9 * Optimize code for radio button. 2023-02-24 04:28:51 +00:00
liumengyi b9e400b4a0 * Change the drop-down box to a radio button. 2023-02-24 04:25:44 +00:00
tianshujie 70f07dde4a * Remove other navigation for iterations under the Fusion Falls project. 2023-02-24 11:32:51 +08:00
zhujinyong 7de18de447 * Fix bug: No 'more' menu. 2023-02-24 11:27:45 +08:00
孙广明 31ccf58fce Merge branch 'mayue_resolve_feedback#2132' into 'master'
* Resolve feedback #2132.

See merge request easycorp/zentaopms!7055
2023-02-24 03:22:40 +00:00
孙广明 fccd283453 Merge branch 'sprint/292_liumengyi_32202' into 'master'
* Fix bug #32202,#32281, and finish task #42089.

See merge request easycorp/zentaopms!7051
2023-02-24 03:22:19 +00:00
孙广明 986e4d1e36 Merge branch 'sprint/292_liumengyi_85434' into 'master'
* Finish task #85434.

See merge request easycorp/zentaopms!7052
2023-02-24 03:22:13 +00:00
孙广明 ba183f5733 Merge branch 'sprint/292_liumengyi_unittest' into 'master'
* Add unit test.

See merge request easycorp/zentaopms!7059
2023-02-24 03:21:53 +00:00
孙广明 e624b8c1e2 Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Add sql for process, and modify method to management method, fix bug #32421,#32424.

See merge request easycorp/zentaopms!7061
2023-02-24 03:21:47 +00:00
liumengyi 5f930c8264 * Fix bug #32424. 2023-02-24 02:59:35 +00:00
zhujinyong 94831920f5 * Fix bug: duplicate definition. 2023-02-24 10:56:52 +08:00
liumengyi ae5ad1bba8 * Fix bug #32421. 2023-02-24 02:31:15 +00:00
zhujinyong d0ab2da0d1 * Fix bug #32403. 2023-02-24 10:25:57 +08:00
liumengyi f2d6a76c93 * Modify method to management method. 2023-02-24 02:07:22 +00:00
liumengyi f784951e18 * Add sql for process. 2023-02-24 02:05:50 +00:00
王怡栋 9e73c11871 Merge branch 'zentaopms_wangyuting' into 'master'
* Fix bug #27133.

See merge request easycorp/zentaopms!7060
2023-02-24 00:52:49 +00:00
wangyuting2 7de68720de * Fix bug #27133. 2023-02-24 08:47:54 +08:00
liumengyi fcd23c20c7 * Add unit test. 2023-02-23 09:22:24 +00:00
liumengyi 40770178ff * Add uni test. 2023-02-23 09:11:13 +00:00
王怡栋 84624b757f Merge branch 'tsj_fixbug' into 'master'
* Fix bug #32208.

See merge request easycorp/zentaopms!7057
2023-02-23 08:45:54 +00:00
tianshujie a5d903b856 * Fix bug #32208. 2023-02-23 16:04:12 +08:00
wangxuepeng 45ac0f5699 * Fix bug #32166. 2023-02-23 07:56:02 +00:00
wangxuepeng 8564f6fe0e * Fix bug #32166. 2023-02-23 07:52:27 +00:00
wangxuepeng 7f420cd374 * Fix bug #32166. 2023-02-23 07:32:36 +00:00
liumengyi d52c3bd4d3 * Fix bug #32281. 2023-02-23 07:30:39 +00:00
王怡栋 65991d0a05 Merge branch 'dev/gfl_admin_css_refactors' into 'master'
* Code for css refactors in admin.

See merge request easycorp/zentaopms!7053
2023-02-23 07:19:31 +00:00
王怡栋 4ad622823f Merge branch 'cyy_dropdown' into 'master'
* Modify closed block style for execution drop down menu.

See merge request easycorp/zentaopms!7050
2023-02-23 07:19:18 +00:00
tianshujie b350a3aff4 * Fix bug #32412. 2023-02-23 14:52:18 +08:00
mayue 772ec30c37 * Resolve feedback #2132. 2023-02-23 06:46:06 +00:00
tianshujie d53ba15bc0 * Update icon for admin menu. 2023-02-23 14:36:07 +08:00
zhujinyong d66127270b * Fix bug #32303. 2023-02-23 14:33:16 +08:00
guofeilong c1153374fa * Code for css refactors in admin. 2023-02-23 14:11:18 +08:00
liumengyi a876a53bf2 * Finish task #42089. 2023-02-23 06:04:12 +00:00
tianshujie a11b0a52a2 * Modify menu order for admin module. 2023-02-23 13:38:52 +08:00