Commit Graph
313 Commits
Author SHA1 Message Date
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
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
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 534bae67fa * Adjust code. 2023-02-23 15:36:05 +08:00
caoyanyi 28d71e5202 * Adjust code. 2023-02-23 15:29:31 +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
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
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
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