 tianshujie
|
aeb2ae52f8
|
* Modify the filter label of the mr Module.
|
2023-02-21 16:49:09 +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 |
|
|
孙广明
|
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 |
|
|
Lufei
|
63a8a97c59
|
* Compatible PHP5.3.
|
2023-02-21 09:15:53 +08:00 |
|
|
caoyanyi
|
7e038c27d1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 09:07:24 +08:00 |
|
|
liumengyi
|
b4e201d95f
|
Merge branch 'sprint/292_liumengyi_85038' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/292_liumengyi_85038
|
2023-02-21 01:06:39 +00:00 |
|
|
王怡栋
|
f22e5681af
|
Merge branch 'cyy_bug' into 'master'
* Modify date diff result.
See merge request easycorp/zentaopms!7006
|
2023-02-21 01:06:04 +00:00 |
|
|
liumengyi
|
95e3978fb0
|
* Finish task #85038, #85039.
|
2023-02-21 01:05:24 +00:00 |
|
|
caoyanyi
|
653c393eb1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 09:01:07 +08:00 |
|
|
Yagami
|
a61a5f99ba
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-21 09:00:03 +08:00 |
|
|
Yagami
|
dc9eb5a1a4
|
* Finish task #85048.
|
2023-02-21 08:59:26 +08:00 |
|
|
caoyanyi
|
f2bd44df29
|
* Modify date diff result.
|
2023-02-21 08:58:32 +08:00 |
|
|
王怡栋
|
1af0838d38
|
Merge branch 'sprint/hufangzhou_bug' into 'master'
* Fix bug for project-execution feature bar active.
See merge request easycorp/zentaopms!7005
|
2023-02-21 00:57:40 +00:00 |
|
|
wangyidong
|
a38a99e7b7
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 08:49:36 +08:00 |
|
|
wangyidong
|
e88b8e6160
|
* adjust code.
|
2023-02-21 08:48:09 +08:00 |
|
|
liumengyi
|
00d7d83484
|
* Finish task #85038, #85039.
|
2023-02-21 00:36:33 +00:00 |
|
|
hufangzhou
|
d4701a82f3
|
* Fix bug for project-execution feature bar active.
|
2023-02-20 09:14:32 +00:00 |
|
|
王怡栋
|
df38f27ead
|
Merge branch 'dev/gfl_theme.css_refactors' into 'master'
Dev/gfl theme.css refactors
See merge request easycorp/zentaopms!7004
|
2023-02-20 08:54:59 +00:00 |
|
|
guofeilong
|
6140c65fcc
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_theme.css_refactors
|
2023-02-20 16:49:32 +08:00 |
|
|
guofeilong
|
9ec918094b
|
* Code for theme css refactors.
|
2023-02-20 16:45:03 +08:00 |
|
|
Hao Sun
|
baa4175164
|
* remove debug code for rendering sparkline
|
2023-02-20 16:32:51 +08:00 |
|
|
Hao Sun
|
5d6c6a8b51
|
* optimize usage of dtable
|
2023-02-20 16:32:17 +08:00 |
|
|
孙广明
|
a2dd5323ca
|
Merge branch 'sprint/hufangzhou_task_85049' into 'master'
* Finish task #85049.
See merge request easycorp/zentaopms!7003
|
2023-02-20 08:26:46 +00:00 |
|
|
caoyanyi
|
37810935a8
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-20 15:44:27 +08:00 |
|
|
caoyanyi
|
51855da582
|
* Modify menu tree data.
|
2023-02-20 15:44:08 +08:00 |
|
|
王怡栋
|
27bebb66a8
|
Merge branch 'ticket_389' into 'master'
* Resolved feedback 2099
See merge request easycorp/zentaopms!6998
|
2023-02-20 07:25:51 +00:00 |
|