Commit Graph
113 Commits
Author SHA1 Message Date
wangyidong 1a352410a6 * code for task #85503. 2023-03-01 08:49:44 +08:00
tianshujie 8208608430 * Compatible with earlier versions of php. 2023-02-17 17:32:46 +08:00
tianshujie 0e7556ab18 * Compatible with php version. 2023-02-17 11:22:49 +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 483608b3f7 * Fixed incorrect order of tertiary navigation links. 2023-02-14 14:31:29 +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
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 1c61123375 * Dynamically determine the link to the mail navigation. 2023-02-10 09:57:28 +08:00
tianshujie 58f3310e03 * Reorder secondary navigation. 2023-02-10 09:27:40 +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 bc73b6d379 * Code for finish task #83727. 2023-02-09 09:59:56 +08:00
wangyidong 7169cd0397 * adjust for video image. 2023-02-08 17:00:04 +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 88ad600143 * Adjust code. 2023-02-08 15:53:04 +08:00
caoyanyi 43866fe1c9 * Adjust code. 2023-02-08 15:29:53 +08:00
tianshujie 759b734665 * Code for finish task #83726. 2023-02-08 15:09:09 +08:00
guofeilong 093a84f9ee Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_getDate 2023-02-08 15:07:05 +08:00
guofeilong ffb6b0a0c3 * Code for genDateUsed 2023-02-08 14:57:43 +08:00
tianshujie aeea82dae9 * Code for finish task #83724. 2023-02-08 14:46:13 +08:00
tianshujie d5cfe17980 * Code for finish task #83743. 2023-02-08 14:11:23 +08:00
tianshujie 592550fa6a * Code for finish task #83723. 2023-02-08 10:54:31 +08:00
tianshujie 82fe380a4c * Refactor. 2023-02-08 10:03:41 +08:00
tianshujie 42b65e5986 * Code for finish task #83722. 2023-02-08 09:33:14 +08:00
tianshujie 14eaa4428c * Code for finish task #83722. 2023-02-08 09:06:19 +08:00
tianshujie 1cc9d33efc * Code for finish task #83722. 2023-02-07 16:55:04 +08:00
tianshujie 52568a67be * Code for finish task #83722. 2023-02-07 16:29:02 +08:00
tianshujie 21d915190f * Code for finish task #83721. 2023-02-07 11:03:51 +08:00
tianshujie 5db38be8de * Code for finish task #83721. 2023-02-07 09:52:21 +08:00
tianshujie 55bc9f98b0 * Code for finish task #83722. 2023-02-06 16:53:45 +08:00
tianshujie 73c669b247 * Code for finish task #83722. 2023-02-06 16:11:57 +08:00
tianshujie adc0616341 * Code for finish task #83721,83722. 2023-02-06 15:41:55 +08:00
caoyanyi 4896324869 * Optimize plugin desc style. 2023-02-03 12:08:57 +08:00
caoyanyi f5c2c5f6fb * Fix bug #31891. 2023-02-03 11:06:04 +08:00
guofeilong cb33c5b173 * code for theme css admin 2023-02-02 14:36:42 +08:00
wangyidong 911d7de31a * adjust for admin unit testing. 2023-02-02 10:54:35 +08:00
caoyanyi 702cb679fb * Modify extension list. 2023-02-02 09:47:24 +08:00
caoyanyi 43a8635da4 * Modify system menu style. 2023-02-02 09:26:51 +08:00
wangyidong 95dcbf524e * code for task #83434. 2023-02-01 17:21:14 +08:00
wangyidong 85bcf30edf Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-01 17:07:24 +08:00
wangyidong 96e8ac519d * code for task #83438. 2023-02-01 17:05:41 +08:00
caoyanyi 5db8511efc * Adjust code. 2023-02-01 16:35:28 +08:00
caoyanyi bfb0c22484 * Optimize page style. 2023-02-01 16:00:45 +08:00
caoyanyi 5993940b86 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-02-01 14:00:59 +08:00
caoyanyi 88c564634e * Optimize class style. 2023-02-01 13:40:08 +08:00
wangyidong e91e8312b5 * fix bug. 2023-02-01 13:20:49 +08:00
wangyidong 8c9699a98d Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-01 11:25:02 +08:00