 caoyanyi
|
2f3aae9281
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-23 16:05:42 +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 |
|
|
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 |
|
|
tianshujie
|
9358865db4
|
* Modify the filter label for the feedback and ticket list.
|
2023-02-23 10:12:48 +08:00 |
|
|
caoyanyi
|
e7c8ceed8d
|
* Modify dynamic language.
|
2023-02-23 10:10:11 +08:00 |
|
|
hufangzhou
|
42ffe61dc4
|
* Fix the bug of has product waterfall project.
|
2023-02-23 01:55:24 +00:00 |
|
|
孙广明
|
0d0d6c15c1
|
Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Modify language item, and fix bug #32353.
See merge request easycorp/zentaopms!7043
|
2023-02-23 01:47:08 +00:00 |
|
|
caoyanyi
|
10da3ef802
|
* Modify language defined.
|
2023-02-23 09:32:56 +08:00 |
|
|
Yagami
|
840c89f2e3
|
* Fix bug #32266.
|
2023-02-23 09:29:33 +08:00 |
|
|
Yagami
|
d4e4b91625
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-23 09:26:43 +08:00 |
|
|
Yagami
|
02559581d0
|
* Fix bug #32267.
|
2023-02-23 09:26:17 +08:00 |
|
|
liumengyi
|
510d2e7644
|
* Fix bug #32353.
|
2023-02-23 01:23:17 +00:00 |
|
|
wangyidong
|
35083408c9
|
* remove useless code.
|
2023-02-23 09:18:49 +08:00 |
|
|
hufangzhou
|
166e496346
|
* Fix the issue 'Refactor this file to either declare symbols or cause side effects, but not both.'.
|
2023-02-23 01:13:42 +00:00 |
|
|
caoyanyi
|
0c167c57fd
|
* Add language.
|
2023-02-23 09:05:11 +08:00 |
|
|
hufangzhou
|
c2a9a39b10
|
* Remove the uninitialized value.
|
2023-02-23 01:01:22 +00:00 |
|
|
caoyanyi
|
37ee577a4f
|
* Add language.
|
2023-02-23 09:00:42 +08:00 |
|
|
liumengyi
|
776df103cf
|
* Modify language item.
|
2023-02-23 00:51:21 +00:00 |
|
|
caoyanyi
|
7be2ac20a3
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into 289_language
|
2023-02-23 08:39:36 +08:00 |
|
|
caoyanyi
|
6caaf4c316
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-23 08:32:25 +08:00 |
|
|
孙广明
|
dd10524b68
|
Merge branch 'sprint/hufangzhou_issue_755' into 'master'
* Resolve issue #755.
See merge request easycorp/zentaopms!7042
|
2023-02-23 00:31:00 +00:00 |
|
|
hufangzhou
|
cd44e32af6
|
* Resolve issue #755.
|
2023-02-23 00:19:44 +00:00 |
|
|
caoyanyi
|
305453880d
|
* Modify my module language.
|
2023-02-22 17:19:34 +08:00 |
|
|
王怡栋
|
3c62d387a3
|
Merge branch 'dev/gfl_admin_view_refactors' into 'master'
* Code for admin view refactors.
See merge request easycorp/zentaopms!7041
|
2023-02-22 09:18:07 +00:00 |
|
|
guofeilong
|
a08e498530
|
* Code for admin view refactors.
|
2023-02-22 17:17:01 +08:00 |
|