Commit Graph
270 Commits
Author SHA1 Message Date
caoyanyi ec2e0276de * Optimize api page style. 2023-04-03 17:11:27 +08:00
tianshujie 1cb2dc55d4 * Code for fix bug #33014. 2023-03-16 16:21:33 +08:00
liumengyi f643f3bd93 * Fix bug #32945. 2023-03-15 08:44:01 +00:00
liumengyi 637b0912a7 * Finish task #87013. 2023-03-13 07:07:13 +00:00
王怡栋 3438722a8c Merge branch 'master' into 'zentaopms_289'
# Conflicts:
#   db/update18.2.sql
2023-03-06 03:26:34 +00:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
tianshujie 3886a5f25b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-02 08:27:28 +08:00
guofeilong e23d18108b * Code for change lang in admin. 2023-03-01 17:22:08 +08:00
caoyanyi bec24aafa9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 11:52:44 +08:00
liumengyi 57c46206e9 * Fix bug #32525. 2023-03-01 03:01:40 +00:00
wangyidong 01bb8130dd Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 08:50:31 +08:00
wangyidong 1a352410a6 * code for task #85503. 2023-03-01 08:49:44 +08:00
caoyanyi 0eb7b70d48 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 17:07:32 +08:00
tianshujie f0ff736880 * Code for fix bug #32473. 2023-02-28 13:55:12 +08:00
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
tianshujie 5fe4075ef1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 08:26:03 +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 4912b2004e * Finish task #85630. 2023-02-27 06:54:39 +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
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
tianshujie 12cdb2f6d7 * Modify menu param. 2023-02-22 16:11:21 +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
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 cb3a0faa9c * Added mandatory execution items config. 2023-02-17 14:02:01 +08:00
caoyanyi fc6d8cd821 * Remove lite mode nav menu. 2023-02-17 10:21:10 +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
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 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