 liumengyi
|
415c19a5d4
|
* Optimize code.
|
2023-02-28 01:47:28 +00:00 |
|
|
孙广明
|
7c88a66ae9
|
Merge branch 'sprint/fixbug_liumengyi_32444' into 'master'
* Fix bug 32444 32445.
See merge request easycorp/zentaopms!7082
|
2023-02-27 08:51:29 +00:00 |
|
|
liumengyi
|
1d0e0aa68c
|
* Fix bug #32445.
|
2023-02-27 08:38:16 +00:00 |
|
|
liumengyi
|
8cad561792
|
* Fix bug #32444.
|
2023-02-27 08:37:57 +00:00 |
|
|
胡方舟
|
fa77c297e9
|
Merge branch 'Fix_zanode_lang' into 'master'
* Fix zanode lang file.
See merge request easycorp/zentaopms!7078
|
2023-02-27 08:23:16 +00:00 |
|
|
wangyidong
|
71f0edcb20
|
* add new priv for custom-hours.
|
2023-02-27 16:20:06 +08:00 |
|
|
wangyidong
|
11507ffff2
|
* fix bug #32277.
|
2023-02-27 16:16:04 +08:00 |
|
|
hufangzhou
|
6399f9dff7
|
* Format the output.
|
2023-02-27 07:41:38 +00:00 |
|
|
王怡栋
|
ef2b5b2461
|
Merge branch 'dev/gfl_85502' into 'master'
Dev/gfl 85502
See merge request easycorp/zentaopms!7080
|
2023-02-27 07:26:37 +00:00 |
|
|
guofeilong
|
60716280fd
|
* ZUI: zui/min.js refactors .
|
2023-02-27 15:21:20 +08:00 |
|
|
guofeilong
|
1f88b86fda
|
* Code for update zui/min.js .
|
2023-02-27 15:13:03 +08:00 |
|
|
zhaoke
|
1bf386225a
|
* Fix zanode lang file.
|
2023-02-27 15:09:26 +08:00 |
|
|
孙广明
|
167539f822
|
Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Modify menu name.
See merge request easycorp/zentaopms!7076
|
2023-02-27 06:59:14 +00:00 |
|
|
王怡栋
|
8b56c39297
|
Merge branch 'sprint/hufangzhou_package' into 'master'
Sprint/hufangzhou package
See merge request easycorp/zentaopms!7077
|
2023-02-27 06:58:39 +00:00 |
|
|
liumengyi
|
599150da94
|
* Fix bug #32442.
|
2023-02-27 06:58:37 +00:00 |
|
|
hufangzhou
|
f41f2cfb9b
|
* Add the lang item.
|
2023-02-27 06:57:19 +00:00 |
|
|
hufangzhou
|
42769d3425
|
* Add the new version.
|
2023-02-27 06:51:34 +00:00 |
|
|
liumengyi
|
a26a5c5860
|
* Fix sql error.
|
2023-02-27 06:41:48 +00:00 |
|
|
liugang
|
c9115f7a21
|
* Revert menus, privileges and pages of report.
|
2023-02-27 06:39:37 +00:00 |
|
|
王怡栋
|
dbdcdf93b4
|
Merge branch 'sprint/tsj_tip' into 'master'
* Modify method tip of stage create page.
See merge request easycorp/zentaopms!7075
|
2023-02-27 06:29:11 +00:00 |
|
|
liumengyi
|
a23d205435
|
* Modify menu name.
|
2023-02-27 06:24:08 +00:00 |
|
|
tianshujie
|
16903e6247
|
* Modify method tip of stage create page.
|
2023-02-27 14:14:48 +08:00 |
|
|
王怡栋
|
b5099018dc
|
Merge branch 'cyy_repo' into 'master'
* Remove unused code.
See merge request easycorp/zentaopms!7073
|
2023-02-27 05:42:59 +00:00 |
|
|
caoyanyi
|
7d81da6fa0
|
* Remove unused code.
|
2023-02-27 13:40:47 +08:00 |
|
|
孙广明
|
e838a4536e
|
Merge branch 'sprint/294_liumengyi_32433' into 'master'
* Fix bug #32433.
See merge request easycorp/zentaopms!7071
|
2023-02-27 05:35:05 +00:00 |
|
|
孙广明
|
0980ac3ac9
|
Merge branch 'lyk_ticket_419' into 'master'
* Resolve ticket #419.
See merge request easycorp/zentaopms!7072
|
2023-02-27 05:02:16 +00:00 |
|
|
liuyongkai
|
03163f1818
|
* Resolve ticket #419.
|
2023-02-27 12:55:13 +08:00 |
|
|
liumengyi
|
f2f4b430ef
|
* Fix bug #32433.
|
2023-02-27 02:32:15 +00:00 |
|
|
Yagami
|
6f8ec51731
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-27 08:38:37 +08:00 |
|
|
Yagami
|
d5c132ba12
|
* Remove unused code.
|
2023-02-27 08:38:27 +08:00 |
|
|
孙广明
|
aba0de11ac
|
Merge branch 'sprint/hufangzhou_executionUnit' into 'master'
* Add execution module unit testcase.
See merge request easycorp/zentaopms!7067
|
2023-02-27 00:34:11 +00:00 |
|
|
孙广明
|
d0ba7435e1
|
Merge branch 'sprint/hufangzhou_programplanUnitCase' into 'master'
* Add the programplan unit testcase.
See merge request easycorp/zentaopms!7068
|
2023-02-27 00:33:51 +00:00 |
|
|
孙广明
|
f085c04b45
|
Merge branch 'hufangzhou_actionUnit' into 'master'
* Add the action unit testcase.
See merge request easycorp/zentaopms!7070
|
2023-02-27 00:33:36 +00:00 |
|
|
孙广明
|
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 |
|
|
hufangzhou
|
8ba3a4848a
|
* Add the action unit testcase.
|
2023-02-25 08:20:59 +00:00 |
|
|
Lufei
|
feefe21b3f
|
- Remove useless code.
|
2023-02-25 15:10:56 +08:00 |
|
|
hufangzhou
|
64bb25430b
|
* Add the programplan unit testcase.
|
2023-02-25 03:19:49 +00:00 |
|
|
Yagami
|
a7db149f73
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-24 16:32:12 +08:00 |
|
|
hufangzhou
|
2f9ca77ab8
|
* Add the comment.
|
2023-02-24 08:32:09 +00:00 |
|
|
Yagami
|
9eaf0920e8
|
* Remove unused code.
|
2023-02-24 16:31:32 +08:00 |
|
|
hufangzhou
|
340ae715e6
|
* Add execution module unit testcase.
|
2023-02-24 08:27:55 +00: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 |
|