Commit Graph
542 Commits
Author SHA1 Message Date
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 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
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
hufangzhou cc4b6d5310 * Adjust the lang. 2023-02-14 15:35:45 +08:00
tianshujie 9df139a83a * Fixed an error in the lite Edition. 2023-02-14 14:37:24 +08:00
tianshujie 483608b3f7 * Fixed incorrect order of tertiary navigation links. 2023-02-14 14:31:29 +08:00
wangyidong 26f1849bbc * code for task #83739. 2023-02-13 16:52:02 +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
tianshujie dae8b91fe1 * Modify the ash logic. 2023-02-10 14:33:22 +08:00
caoyanyi 3ac7376dc4 * Optimize page style. 2023-02-10 14:05:00 +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
王怡栋 6c06df5f1e Merge branch 'sprint/285_navigation' into 'sprint/285'
Sprint/285 navigation

See merge request easycorp/zentaopms!6911
2023-02-10 03:30:23 +00:00
王怡栋 901a64e246 Merge branch 'sprint/285_tsj_issue' into 'sprint/285'
* Resolve issue #744.

See merge request easycorp/zentaopms!6908
2023-02-10 03:29:34 +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
caoyanyi 9ea480e4b8 * Add sub menu active. 2023-02-10 10:18:38 +08:00
wangyidong cb153273d0 * adjust for admin set menu. 2023-02-10 10:00:37 +08:00
tianshujie 1c61123375 * Dynamically determine the link to the mail navigation. 2023-02-10 09:57:28 +08:00
tianshujie f49368e220 * Add links to navigation. 2023-02-10 09:29:00 +08:00
tianshujie 2304fcd1bc * Do not print related links without permissions. 2023-02-10 09:28:16 +08:00
tianshujie 58f3310e03 * Reorder secondary navigation. 2023-02-10 09:27:40 +08:00
caoyanyi eaf6e693d7 * Add language. 2023-02-10 08:41:34 +08:00
guofeilong a641684b0a * Code for css in setting-dec refactors. 2023-02-10 08:33:00 +08:00
caoyanyi a55805c92f * Code for issue #745. 2023-02-09 16:57:05 +08:00
tianshujie 2cd3d404a1 * Resolve issue #744. 2023-02-09 16:48:53 +08:00
wangyidong 1ff0629556 * adjust for admin index page. 2023-02-09 16:29:00 +08:00
王怡栋 c316ca23ea Merge branch 'sprint/285_tsj' into 'sprint/285'
Sprint/285 tsj

See merge request easycorp/zentaopms!6906
2023-02-09 06:59:05 +00: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 be37300935 * Code for finish task #83741. 2023-02-09 14:19:15 +08:00
tianshujie 78506e6ad4 * Add navigation highlighting. 2023-02-09 13:27:31 +08:00