Commit Graph
249 Commits
Author SHA1 Message Date
guofeilong e23d18108b * Code for change lang in admin. 2023-03-01 17:22:08 +08:00
liumengyi 57c46206e9 * Fix bug #32525. 2023-03-01 03:01:40 +00:00
tianshujie f0ff736880 * Code for fix bug #32473. 2023-02-28 13:55:12 +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 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
孙广明 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
tianshujie a11b0a52a2 * Modify menu order for admin module. 2023-02-23 13:38:52 +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
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
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
tianshujie cb3a0faa9c * Added mandatory execution items config. 2023-02-17 14:02:01 +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
hufangzhou cc4b6d5310 * Adjust the lang. 2023-02-14 15:35:45 +08:00
tianshujie 483608b3f7 * Fixed incorrect order of tertiary navigation links. 2023-02-14 14:31:29 +08:00
wangyidong 6b0a919b6f * code for task #83737. 2023-02-13 15:23:46 +08:00
tianshujie da0ebacef2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-13 08:27:05 +08:00
wangyidong ff66b39a2a * code for task #83736. 2023-02-10 17:37:50 +08:00
王怡栋 ad7430857e Merge branch 'sprint/cyy_bug' into 'sprint/285'
Sprint/cyy bug

See merge request easycorp/zentaopms!6913
2023-02-10 03:31:25 +00:00
tianshujie 0e76cbe2d0 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation 2023-02-10 10:55:21 +08:00
wangyidong cb153273d0 * adjust for admin set menu. 2023-02-10 10:00:37 +08:00
tianshujie f49368e220 * Add links to navigation. 2023-02-10 09:29:00 +08:00
caoyanyi eaf6e693d7 * Add language. 2023-02-10 08:41:34 +08:00
wangyidong 1ff0629556 * adjust for admin index page. 2023-02-09 16:29:00 +08:00
tianshujie 9506850831 * Modify the parameters of the database navigation link. 2023-02-09 14:50:18 +08:00
tianshujie 173b9ad1d2 * Modify the style of the secondary development page. 2023-02-09 14:43:06 +08:00
tianshujie bd95b1eb84 * Code for finish task #83733. 2023-02-09 11:54:01 +08:00
tianshujie 081c55f5ab Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj 2023-02-09 10:54:28 +08:00
tianshujie 9769b60fe7 * The open,biz version removes the document template block. 2023-02-09 09:25:39 +08:00
caoyanyi c365db5074 * Code for task #83735. 2023-02-08 16:50:47 +08:00
wangyidong 43f31bbe44 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-08 16:27:17 +08:00
wangyidong bc833a572e * adjust for task #83746. 2023-02-08 16:06:45 +08:00
caoyanyi 43866fe1c9 * Adjust code. 2023-02-08 15:29:53 +08:00
王怡栋 ea9ac74ab3 Merge branch 'sprint/285_tsj_83723' into 'sprint/285'
Sprint/285 tsj 83723

See merge request easycorp/zentaopms!6885
2023-02-08 06:52:12 +00:00