Commit Graph
51764 Commits
Author SHA1 Message Date
caoyanyi ab4df6f0c8 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 14:57:06 +08:00
caoyanyi a39c45baf7 * Add test case. 2023-02-24 14:56:53 +08:00
tianshujie 2e6adce5d0 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 14:50:42 +08:00
tianshujie 7c241f25b3 * Add case for dev module. 2023-02-24 14:50:22 +08:00
caoyanyi cf2ba6e9c4 * Add test case. 2023-02-24 14:49:35 +08:00
caoyanyi 5b05f1b369 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 14:16:56 +08:00
caoyanyi b3e9d521ac * Add test case. 2023-02-24 14:16:48 +08:00
guofeilong 3dc2d00323 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 13:57:24 +08:00
guofeilong 4c233276ec * Adjust code for langitem.js. 2023-02-24 13:57:21 +08:00
caoyanyi 24db9c976c Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 13:51:17 +08:00
caoyanyi a02f816f1d * Add get link title test case. 2023-02-24 13:50:51 +08:00
guofeilong c62dbb7792 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 13:47:19 +08:00
caoyanyi 220a047bc3 * Adjust code. 2023-02-24 13:43:29 +08:00
caoyanyi b3e9eb48b0 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 13:42:40 +08:00
caoyanyi c2e74ec237 * Modify file name. 2023-02-24 13:42:19 +08: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
王怡栋 761cb5c905 Merge branch 'zentaopms_289_gfl_langitem_refactors' into 'zentaopms_289'
Zentaopms 289 gfl langitem refactors

See merge request easycorp/zentaopms!7064
2023-02-24 05:39:47 +00:00
guofeilong 016fe0bae0 * ZUI: css theme refactors . 2023-02-24 13:39:41 +08:00
guofeilong ec11839343 Adjust code for langitem. 2023-02-24 13:36:27 +08:00
caoyanyi 1933a32830 * Modify get modules test case. 2023-02-24 13:32:34 +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
guofeilong e746196b90 * Adjust code for langitem . 2023-02-24 13:12:12 +08: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
caoyanyi 3bb618093c * Add case of dev module. 2023-02-24 10:41:31 +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
caoyanyi 0729762ffa * Modify default lang data. 2023-02-24 10:07:35 +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
caoyanyi a65210515c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 09:14:45 +08:00
caoyanyi 83a64cb3cf * Update home button text. 2023-02-24 09:02:48 +08:00
caoyanyi b6830e3d1a * Modify menu alias. 2023-02-24 08:54:07 +08: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
wangyidong aee71d2228 * adjust for common lang. 2023-02-24 08:44:20 +08:00
liumengyi fcd23c20c7 * Add unit test. 2023-02-23 09:22:24 +00:00
caoyanyi 09cb62b6eb Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-23 17:20:31 +08:00
caoyanyi 1be6a534a8 * Modify home btn title. 2023-02-23 17:20:17 +08:00