 caoyanyi
|
ac2891ac41
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-28 13:53:09 +08:00 |
|
|
tianshujie
|
c82f1a02a7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_ui
|
2023-02-28 13:13:13 +08:00 |
|
|
caoyanyi
|
ef0c77d611
|
* Modify tutorial tip.
|
2023-02-28 12:28:15 +08:00 |
|
|
tianshujie
|
f6a573a51f
|
* Code for fix bug #32458.
|
2023-02-28 10:32:13 +08:00 |
|
|
caoyanyi
|
8d6459f66f
|
* Modify branch name.
|
2023-02-28 09:57:03 +08:00 |
|
|
tianshujie
|
5fe4075ef1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-28 08:26:03 +08:00 |
|
|
tianshujie
|
28b40db1de
|
* Modify helper url for admin block.
|
2023-02-27 16:48:56 +08:00 |
|
|
tianshujie
|
1fb329fd8d
|
* Optimize the display of grey blocksOptimize the display of grey blocks.
|
2023-02-27 16:42:54 +08:00 |
|
|
wangyidong
|
11507ffff2
|
* fix bug #32277.
|
2023-02-27 16:16:04 +08:00 |
|
|
caoyanyi
|
f2441f7197
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-27 15:28:14 +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 |
|
|
hufangzhou
|
f41f2cfb9b
|
* Add the lang item.
|
2023-02-27 06:57:19 +00:00 |
|
|
liumengyi
|
a23d205435
|
* Modify menu name.
|
2023-02-27 06:24:08 +00:00 |
|
|
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 |
|
|
guofeilong
|
c1153374fa
|
* Code for css refactors in admin.
|
2023-02-23 14:11:18 +08:00 |
|
|
tianshujie
|
a11b0a52a2
|
* Modify menu order for admin module.
|
2023-02-23 13:38:52 +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 |
|
|
guofeilong
|
a08e498530
|
* Code for admin view refactors.
|
2023-02-22 17:17:01 +08:00 |
|
|
guofeilong
|
966511dc89
|
* Code for admin view refactors.
|
2023-02-22 17:08:49 +08:00 |
|
|
tianshujie
|
12cdb2f6d7
|
* Modify menu param.
|
2023-02-22 16:11:21 +08:00 |
|
|
王怡栋
|
8b53329ebb
|
Merge branch 'cyy_optimize' into 'master'
* Code for issue #762.
See merge request easycorp/zentaopms!7030
|
2023-02-22 07:51:35 +00:00 |
|
|
guofeilong
|
746860335b
|
* admin: view refactors.
|
2023-02-22 15:39:38 +08:00 |
|
|
caoyanyi
|
7c257b5e1e
|
* Code for issue #762.
|
2023-02-22 15:16:48 +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 |
|
|
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 |
|
|
tianshujie
|
8d2abc483d
|
* Fixed print navigation issues.
|
2023-02-21 16: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 |
|
|
孙广明
|
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 |
|
|
tianshujie
|
71c60b8332
|
* Code for finish task #85047.
|
2023-02-21 09:30:09 +08: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 |
|
|
tianshujie
|
d6266bc607
|
* Code for finish task #85047.
|
2023-02-20 14:47:10 +08:00 |
|
|
caoyanyi
|
b0aef0569a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-20 08:13:40 +08:00 |
|
|
tianshujie
|
8208608430
|
* Compatible with earlier versions of php.
|
2023-02-17 17:32:46 +08:00 |
|
|
tianshujie
|
cb3a0faa9c
|
* Added mandatory execution items config.
|
2023-02-17 14:02:01 +08:00 |
|
|
tianshujie
|
0e7556ab18
|
* Compatible with php version.
|
2023-02-17 11:22:49 +08:00 |
|
|
caoyanyi
|
fc6d8cd821
|
* Remove lite mode nav menu.
|
2023-02-17 10:21:10 +08:00 |
|
|
tianshujie
|
2925520efd
|
* Modify field name.
|
2023-02-16 15:53:11 +08:00 |
|
|
tianshujie
|
d657ae898a
|
* Restore.
|
2023-02-16 15:50:31 +08:00 |
|
|
tianshujie
|
9b4772b07d
|
* Fix bug #32215.
|
2023-02-16 15:44:35 +08:00 |
|
|
tianshujie
|
f39f2d27ed
|
* Code for fix bug #32206.
|
2023-02-16 15:27:43 +08:00 |
|
|
caoyanyi
|
f4153b2629
|
* Fix bug #32218,32219.
|
2023-02-16 14:59:17 +08:00 |
|
|
caoyanyi
|
b478779676
|
* Fix bug #32184,32192,32193.
|
2023-02-16 11:09:18 +08:00 |
|
|
tianshujie
|
2a388d06a7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-16 09:00:16 +08:00 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
|
tianshujie
|
a4b92cc43b
|
* Modify the plug-in description.
|
2023-02-15 10:20:39 +08:00 |
|
|
tianshujie
|
b2fef4f696
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-15 08:19:27 +08:00 |
|
|
wangyidong
|
f90041ca48
|
* code for task #83736.
|
2023-02-14 15:55:20 +08:00 |
|