 王怡栋
|
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 |
|
|
wangyidong
|
4e3fe4dc9f
|
* code for feature bar.
|
2023-02-23 14:42:06 +08:00 |
|
|
caoyanyi
|
f328bdb5f1
|
* Split original lang get method.
|
2023-02-23 14:34:31 +08:00 |
|
|
caoyanyi
|
e38e141d03
|
* Modify lite menu.
|
2023-02-23 13:55:37 +08:00 |
|
|
wangyidong
|
42aefd500a
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-22 12:29:02 +08:00 |
|
|
wangyidong
|
a691c99853
|
* code for task #84529.
|
2023-02-22 11:35:22 +08:00 |
|
|
guofeilong
|
bb44e8030a
|
* Code for js refactors in langitem .
|
2023-02-22 09:54:14 +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 |
|
|
caoyanyi
|
86aa7086c4
|
* Modify feature bar get.
|
2023-02-21 11:00:50 +08: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 |
|
|
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 |
|
|
guofeilong
|
3fa73c15c1
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289_gfl
|
2023-02-20 15:16:02 +08:00 |
|
|
guofeilong
|
de9c7e44f4
|
* Code for js in module langitem .
|
2023-02-20 15:15:52 +08:00 |
|
|
tianshujie
|
d6266bc607
|
* Code for finish task #85047.
|
2023-02-20 14:47:10 +08:00 |
|
|
caoyanyi
|
afe06808da
|
* Add menu tree.
|
2023-02-20 14:09:25 +08:00 |
|
|
guofeilong
|
cbf26f0ef1
|
* Code for langItem module refactors .
|
2023-02-20 13:46:27 +08:00 |
|
|
guofeilong
|
d229986cff
|
* Code for add js to module dev/langItem .
|
2023-02-20 11:14:40 +08:00 |
|
|
guofeilong
|
6da9c01104
|
* Code for add js to module/langItem .
|
2023-02-20 10:00:43 +08:00 |
|
|
caoyanyi
|
9eb9981ae7
|
* Add function for left menu tree.
|
2023-02-17 14:08:57 +08:00 |
|
|
caoyanyi
|
fc6d8cd821
|
* Remove lite mode nav menu.
|
2023-02-17 10:21:10 +08:00 |
|
|
caoyanyi
|
c8374b1e14
|
Merge branch 'master' into zentaopms_289
|
2023-02-17 10:11:16 +08:00 |
|
|
caoyanyi
|
bcc4650580
|
* Modify database lang get.
|
2023-02-17 09:55:07 +08:00 |
|
|
guofeilong
|
17c3ddbd21
|
* Code for add lang to langItem .
|
2023-02-17 08:33:51 +08:00 |
|
|
guofeilong
|
0e840ae40f
|
* Code for change arr to navTypes
|
2023-02-16 16:48:15 +08:00 |
|
|
guofeilong
|
f66dadec57
|
* Code for fix conflict .
|
2023-02-16 16:42:52 +08:00 |
|
|
wangyidong
|
7c927412cc
|
* adjust code for langitem page.
|
2023-02-16 16:25:22 +08:00 |
|
|
wangyidong
|
1b70d6e8a4
|
* code for task #84532.
|
2023-02-16 13:55:23 +08:00 |
|
|
guofeilong
|
5fee6b383b
|
* Code for handle Conflict.
|
2023-02-16 13:46:18 +08:00 |
|
|
guofeilong
|
ca3508d1df
|
* Code for add menuTree to langItem
|
2023-02-16 13:40:16 +08:00 |
|
|
wangyidong
|
bb1cc9d480
|
* code for task #84532.
|
2023-02-16 11:14:58 +08:00 |
|
|
caoyanyi
|
872950ac31
|
* Modify feature bar list.
|
2023-02-16 10:31:17 +08:00 |
|
|
caoyanyi
|
d46ea686b7
|
* Modify default lang get.
|
2023-02-16 09:49:45 +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 |
|
|
tianshujie
|
4d2a846c9e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-16 08:59:34 +08:00 |
|
|
guofeilong
|
b2a664edf2
|
* Code for langitems js refactors.
|
2023-02-16 08:41:08 +08:00 |
|
|
guofeilong
|
8afb07632a
|
* Code for langItem refactors.
|
2023-02-16 08:11:21 +08:00 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
|
guofeilong
|
97f3cc45f1
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289_gfl
|
2023-02-15 15:55:36 +08:00 |
|
|
wangyidong
|
734a64958c
|
* code for custom menu lang.
|
2023-02-15 15:51:02 +08:00 |
|
|
caoyanyi
|
3bf16c880e
|
* Optimize main and ext files get, and add get default lang function.
|
2023-02-15 11:22:42 +08:00 |
|
|
guofeilong
|
ff9c2419b2
|
* Code for task#84531
|
2023-02-15 11:08:42 +08:00 |
|
|
caoyanyi
|
0d5f437607
|
* Adjust code.
|
2023-02-15 10:23:54 +08:00 |
|
|
guofeilong
|
87b3c95ceb
|
* Langitem: code for task #84531
|
2023-02-15 10:00:27 +08:00 |
|
|
caoyanyi
|
dff2e8a00c
|
* Add search tab.
|
2023-02-14 14:01:16 +08:00 |
|
|
guofeilong
|
31b8e72a3f
|
* Code for css in langitem.
|
2023-02-14 11:48:07 +08:00 |
|
|
guofeilong
|
f25bcb9edc
|
- Code for dev/control.php refactors.
|
2023-02-14 08:39:58 +08:00 |
|