 guofeilong
|
bb44e8030a
|
* Code for js refactors in langitem .
|
2023-02-22 09:54:14 +08:00 |
|
|
王怡栋
|
7245733439
|
Merge branch '289_featureBar' into 'zentaopms_289'
289 feature bar
See merge request easycorp/zentaopms!7020
|
2023-02-22 01:37:39 +00:00 |
|
|
caoyanyi
|
85c84a3f34
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into 289_featureBar
|
2023-02-22 08:26:58 +08:00 |
|
|
caoyanyi
|
7df9719cf3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-22 08:24:22 +08:00 |
|
|
孙广明
|
311f4a7da6
|
Merge branch 'sprint/hufangzhou_task_85037' into 'master'
* Finish task #85037.
See merge request easycorp/zentaopms!7017
|
2023-02-22 00:20:38 +00:00 |
|
|
tianshujie
|
1bf09c95ed
|
* Modify the filter label of the job Module.
|
2023-02-21 17:10:52 +08:00 |
|
|
tianshujie
|
aeb2ae52f8
|
* Modify the filter label of the mr Module.
|
2023-02-21 16:49:09 +08:00 |
|
|
hufangzhou
|
02b8e6f723
|
* Finish task #85037.
|
2023-02-21 08:46:43 +00:00 |
|
|
王怡栋
|
8c7788aa03
|
Merge branch 'dev/gfl_admin_refactors' into 'master'
Dev/gfl admin refactors
See merge request easycorp/zentaopms!7016
|
2023-02-21 08:42:47 +00:00 |
|
|
guofeilong
|
bdd52bcd1d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_admin_refactors
|
2023-02-21 16:36:15 +08:00 |
|
|
孙广明
|
3685a40ca7
|
Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug
See merge request easycorp/zentaopms!7015
|
2023-02-21 08:21:13 +00:00 |
|
|
tianshujie
|
8d2abc483d
|
* Fixed print navigation issues.
|
2023-02-21 16:14:27 +08:00 |
|
|
tianshujie
|
8bf7fa466c
|
* Fix error of authority group.
|
2023-02-21 16:05:38 +08:00 |
|
|
zhujinyong
|
6b241f1d06
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-21 15:56:50 +08:00 |
|
|
zhujinyong
|
39b2773e77
|
* Fix bug #32332.
|
2023-02-21 15:55:33 +08:00 |
|
|
孙广明
|
f3c2629d48
|
Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Fix bug of sql.
See merge request easycorp/zentaopms!7014
|
2023-02-21 07:37:41 +00:00 |
|
|
liumengyi
|
ffedd1ac6d
|
* Fix bug of sql.
|
2023-02-21 07:36:49 +00:00 |
|
|
wangyidong
|
64a84d59c9
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 15:32:54 +08:00 |
|
|
wangyidong
|
9ef211ef57
|
* code for task #84544.
|
2023-02-21 15:32:37 +08:00 |
|
|
孙广明
|
7439b5a6a4
|
Merge branch 'sprint/hufangzhou_task_85051' into 'master'
* Fix bug for create execution.
See merge request easycorp/zentaopms!7013
|
2023-02-21 07:23:19 +00:00 |
|
|
孙广明
|
a789a412cb
|
更新module/execution/js/common.js
|
2023-02-21 07:23:03 +00:00 |
|
|
hufangzhou
|
10e9d3a6a8
|
* Fix bug for create execution.
|
2023-02-21 07:14:49 +00:00 |
|
|
guofeilong
|
f8987c102d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_admin_refactors
|
2023-02-21 15:02:46 +08:00 |
|
|
tianshujie
|
4ee0aabe5f
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into 289_featureBar
|
2023-02-21 14:14:27 +08:00 |
|
|
tianshujie
|
5b2cafa380
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 14:13:51 +08:00 |
|
|
guofeilong
|
d3e27b3389
|
* Code for module admin refactors.
|
2023-02-21 14:00:48 +08:00 |
|
|
孙广明
|
e05d8b2eff
|
Merge branch 'sprint/hufangzhou_task_85050' into 'master'
* Finish task #85050.
See merge request easycorp/zentaopms!7012
|
2023-02-21 05:54:46 +00:00 |
|
|
hufangzhou
|
b997124e9c
|
* Finish task #85050.
|
2023-02-21 05:52:28 +00:00 |
|
|
孙广明
|
e91cb4b2b6
|
Merge branch 'sprint/hufangzhou_task_85051' into 'master'
* Finish task #85051.
See merge request easycorp/zentaopms!7011
|
2023-02-21 05:51:52 +00:00 |
|
|
孙广明
|
6c1ed365ab
|
Merge branch 'sprint/292_liumengyi_85038' into 'master'
* Finish task #85038, #85039, #85040.
See merge request easycorp/zentaopms!7010
|
2023-02-21 05:50:04 +00:00 |
|
|
孙广明
|
777b20ebdc
|
Merge branch 'sprint/tsj_task' into 'master'
Sprint/tsj task
See merge request easycorp/zentaopms!7009
|
2023-02-21 05:47:26 +00:00 |
|
|
孙广明
|
0745b389af
|
Merge branch 'sprint/hufangzhou_85049' into 'master'
* Code for task #85049.
See merge request easycorp/zentaopms!7008
|
2023-02-21 05:38:06 +00:00 |
|
|
tianshujie
|
29e3eec34c
|
* Add case for custom module.
|
2023-02-21 13:36:28 +08:00 |
|
|
hufangzhou
|
dc40747000
|
* Finish task #85051.
|
2023-02-21 05:14:28 +00:00 |
|
|
tianshujie
|
517fb3c796
|
* Code for finish task #85046.
|
2023-02-21 13:13:13 +08:00 |
|
|
caoyanyi
|
86aa7086c4
|
* Modify feature bar get.
|
2023-02-21 11:00:50 +08:00 |
|
|
liumengyi
|
a9f19a5a80
|
* Finish task #85040.
|
2023-02-21 02:58:05 +00:00 |
|
|
朱金勇
|
b775a45b3a
|
Merge branch 'php53' into 'master'
* Compatible PHP5.3.
See merge request easycorp/zentaopms!7007
|
2023-02-21 02:47:14 +00:00 |
|
|
wangyidong
|
546cc63fb2
|
* code for task #84544.
|
2023-02-21 10:46:32 +08:00 |
|
|
liumengyi
|
3fc6835bea
|
* Fix bug of task #85038.
|
2023-02-21 02:44:47 +00:00 |
|
|
zhujinyong
|
6ae6909717
|
* Fix merge bug.
|
2023-02-21 10:28:55 +08:00 |
|
|
zhujinyong
|
5551177931
|
+ Add error of different type.
|
2023-02-21 10:24:00 +08:00 |
|
|
tianshujie
|
71151c93df
|
* Delete useless language items.
|
2023-02-21 10:16:35 +08:00 |
|
|
wangyidong
|
cdbbf26ff3
|
* code for task #84544.
|
2023-02-21 10:06:39 +08:00 |
|
|
guofeilong
|
35569ad22c
|
* Code refactors in module todo lang.
|
2023-02-21 10:03:34 +08:00 |
|
|
hufangzhou
|
f3800e9e38
|
* Code for task #85049.
|
2023-02-21 01:38:01 +00:00 |
|
|
wangyidong
|
36150659f7
|
* adjst code.
|
2023-02-21 09:35:47 +08:00 |
|
|
caoyanyi
|
9924325170
|
Merge branch 'zentaopms_289' into 289_featureBar
|
2023-02-21 09:30:34 +08:00 |
|
|
tianshujie
|
71c60b8332
|
* Code for finish task #85047.
|
2023-02-21 09:30:09 +08:00 |
|
|
guofeilong
|
b51cb2325f
|
* Code for module tido lang refactors .
|
2023-02-21 09:26:31 +08:00 |
|