 caoyanyi
|
0729762ffa
|
* Modify default lang data.
|
2023-02-24 10:07:35 +08: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 |
|
|
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 |
|
|
王怡栋
|
84624b757f
|
Merge branch 'tsj_fixbug' into 'master'
* Fix bug #32208.
See merge request easycorp/zentaopms!7057
|
2023-02-23 08:45:54 +00:00 |
|
|
王怡栋
|
68e270c9e7
|
Merge branch 'zentaopms_289_gfl_langitem_refactors' into 'zentaopms_289'
Zentaopms 289 gfl langitem refactors
See merge request easycorp/zentaopms!7058
|
2023-02-23 08:45:01 +00:00 |
|
|
guofeilong
|
20cab7c06c
|
* Code refactors in langitem .
|
2023-02-23 16:40:17 +08:00 |
|
|
guofeilong
|
4690dea49a
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289_gfl_langitem_refactors
|
2023-02-23 16:38:14 +08:00 |
|
|
caoyanyi
|
455fa1d618
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-23 16:31:44 +08:00 |
|
|
caoyanyi
|
fcebbfcc57
|
* Modify tag name.
|
2023-02-23 16:31:25 +08:00 |
|
|
wangyidong
|
b448eea1c6
|
* adjust code for feature bar.
|
2023-02-23 16:21:22 +08:00 |
|
|
wangyidong
|
331d38825b
|
* code for feature bar.
|
2023-02-23 16:09:59 +08:00 |
|
|
guofeilong
|
34a985158f
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289_gfl_langitem_refactors
|
2023-02-23 16:08:35 +08:00 |
|
|
caoyanyi
|
2f3aae9281
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-23 16:05:42 +08:00 |
|
|
tianshujie
|
a5d903b856
|
* Fix bug #32208.
|
2023-02-23 16:04:12 +08:00 |
|
|
caoyanyi
|
534bae67fa
|
* Adjust code.
|
2023-02-23 15:36:05 +08:00 |
|
|
caoyanyi
|
28d71e5202
|
* Adjust code.
|
2023-02-23 15:29:31 +08: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 |
|
|
wangyidong
|
beafe27517
|
Merge branch '289_language' into zentaopms_289
|
2023-02-23 15:18:01 +08:00 |
|
|
王怡栋
|
3958735a24
|
Merge branch 'zentaopms_289' into '289_language'
# Conflicts:
# module/dev/model.php
|
2023-02-23 07:17:26 +00:00 |
|
|
caoyanyi
|
811d884802
|
* Hide admin menu.
|
2023-02-23 15:06:22 +08:00 |
|
|
tianshujie
|
b350a3aff4
|
* Fix bug #32412.
|
2023-02-23 14:52:18 +08:00 |
|
|
wangyidong
|
4e3fe4dc9f
|
* code for feature bar.
|
2023-02-23 14:42:06 +08:00 |
|
|
tianshujie
|
d53ba15bc0
|
* Update icon for admin menu.
|
2023-02-23 14:36:07 +08:00 |
|
|
caoyanyi
|
f328bdb5f1
|
* Split original lang get method.
|
2023-02-23 14:34:31 +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 |
|
|
guofeilong
|
602936271b
|
* Code refactors in module dev/js .
|
2023-02-23 14:03:26 +08:00 |
|
|
caoyanyi
|
e38e141d03
|
* Modify lite menu.
|
2023-02-23 13:55:37 +08:00 |
|
|
tianshujie
|
a11b0a52a2
|
* Modify menu order for admin module.
|
2023-02-23 13:38:52 +08:00 |
|
|
caoyanyi
|
8a0e17506f
|
* Modify closed block style for execution drop down menu.
|
2023-02-23 12:12:56 +08:00 |
|
|
孙广明
|
61bc2f5a3a
|
Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Fix bug #32183, #32400..
See merge request easycorp/zentaopms!7049
|
2023-02-23 04:02:22 +00:00 |
|
|
孙广明
|
f5ec563a83
|
Merge branch 'sprint/hufangzhou_bug_32397' into 'master'
* Fix bug #32397.
See merge request easycorp/zentaopms!7048
|
2023-02-23 04:02:04 +00:00 |
|
|
孙广明
|
d4ef7e25fd
|
Merge branch 'sprint/hufangzhou_bug' into 'master'
* Fix the bug of has product waterfall project.
See merge request easycorp/zentaopms!7046
|
2023-02-23 04:01:41 +00:00 |
|
|
孙广明
|
4a60b5e049
|
Merge branch 'sprint/hufangzhou_fixcode' into 'master'
* Remove the uninitialized value.
See merge request easycorp/zentaopms!7045
|
2023-02-23 04:01:21 +00:00 |
|
|
Yagami
|
09c6c38389
|
* Fix bug #32383.
|
2023-02-23 11:03:34 +08:00 |
|
|
liumengyi
|
c7be7a041e
|
* Fix bug #32400.
|
2023-02-23 02:53:21 +00:00 |
|
|
caoyanyi
|
0d847aaccc
|
* Modify lite language.
|
2023-02-23 10:51:07 +08:00 |
|
|
liumengyi
|
36e9f275c9
|
* Fix bug #32183.
|
2023-02-23 02:47:31 +00:00 |
|
|
hufangzhou
|
f92716a360
|
* Fix bug #32397.
|
2023-02-23 02:30:17 +00:00 |
|
|
Yagami
|
f836e0cd96
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-23 10:19:49 +08:00 |
|
|
Yagami
|
290487a68a
|
* Fix bug #32263.
|
2023-02-23 10:19:19 +08:00 |
|
|
caoyanyi
|
59527ae349
|
Merge branch '289_language' of https://gitlab.zcorp.cc/easycorp/zentaopms into 289_language
|
2023-02-23 10:13:11 +08:00 |
|
|
caoyanyi
|
22faecf1a4
|
* Remove unused language.
|
2023-02-23 10:12:50 +08:00 |
|