Commit Graph
468 Commits
Author SHA1 Message Date
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
王怡栋 1a671984ef Merge branch 'sprint/cyy_83742' into 'sprint/285'
Sprint/cyy 83742

See merge request easycorp/zentaopms!6881
2023-02-08 06:53:30 +00: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
tianshujie aeea82dae9 * Code for finish task #83724. 2023-02-08 14:46:13 +08:00
caoyanyi 32623d2560 * Optimize admin page style. 2023-02-08 14:34:57 +08:00
tianshujie d5cfe17980 * Code for finish task #83743. 2023-02-08 14:11:23 +08:00
tianshujie dddee69dc6 * Code for finish task #83725. 2023-02-08 11:12:49 +08:00
guofeilong 8700d05e87 * Code for css refactors in admin 2023-02-08 11:04:45 +08:00
tianshujie 592550fa6a * Code for finish task #83723. 2023-02-08 10:54:31 +08:00
guofeilong 8829a07ffa Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#88327_refactors 2023-02-08 10:46:15 +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
guofeilong fb9f725975 * Code for update admin.html 2023-02-07 16:54:50 +08:00
guofeilong fff2b4a56f * Code for css in admin.html 2023-02-07 16:33:10 +08:00
tianshujie 52568a67be * Code for finish task #83722. 2023-02-07 16:29:02 +08:00
tianshujie c1e3234178 * Code for finish task #83721. 2023-02-07 11:34:31 +08:00
tianshujie 15613aa673 * Code for finish task #83721. 2023-02-07 11:31:11 +08:00
tianshujie b570b46537 Merge branch 'sprint/285_navigation' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation 2023-02-07 11:04:17 +08:00
tianshujie 21d915190f * Code for finish task #83721. 2023-02-07 11:03:51 +08:00
guofeilong 3893de574c * Code for add class for task #83732 2023-02-07 10:50:44 +08:00
tianshujie 5db38be8de * Code for finish task #83721. 2023-02-07 09:52:21 +08:00
tianshujie 2b265f6157 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation 2023-02-07 09:01:49 +08:00
tianshujie 7b6d5a1651 * Code for finish task #83721. 2023-02-07 08:26:37 +08:00
guofeilong c14a0f505a * Code for add lang in admin 2023-02-06 17:14:18 +08:00
guofeilong 07960c45a0 * Code for admin refactors 2023-02-06 17:10:28 +08:00
tianshujie 55bc9f98b0 * Code for finish task #83722. 2023-02-06 16:53:45 +08:00
guofeilong 36bd3f3384 * Code for task #83731 2023-02-06 16:52:51 +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
guofeilong 7faf11867e * Code for bug #31933 2023-02-06 08:39:25 +08:00
guofeilong f1124e5cde * Code for bug #31938 2023-02-06 08:27:17 +08:00
guofeilong f71582f9f2 * Code for bug #31907 2023-02-03 16:49:29 +08:00
guofeilong ec8e0acb79 * Code for css in admin.html 2023-02-03 16:37:16 +08:00
wangyidong d4f96da08f * code for story 41755. 2023-02-03 13:57:36 +08:00
caoyanyi af95070453 * Add desc tips. 2023-02-03 12:29:26 +08:00
caoyanyi a23689699a * Adjust code. 2023-02-03 12:22:57 +08:00
caoyanyi 4896324869 * Optimize plugin desc style. 2023-02-03 12:08:57 +08:00
caoyanyi 9e3ba4bcb7 * Fix bug #31893. 2023-02-03 11:27:50 +08:00
caoyanyi f5c2c5f6fb * Fix bug #31891. 2023-02-03 11:06:04 +08:00
guofeilong 9f4b496c24 * Code for css in admin. 2023-02-03 09:59:05 +08:00
caoyanyi 8c13b67e83 * Optimize page style. 2023-02-02 16:58:37 +08:00
guofeilong cb33c5b173 * code for theme css admin 2023-02-02 14:36:42 +08:00
caoyanyi b9b1906c61 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-02 11:33:25 +08:00
caoyanyi e8f4b52e10 * Modify font color. 2023-02-02 11:33:02 +08:00
wangyidong 911d7de31a * adjust for admin unit testing. 2023-02-02 10:54:35 +08:00
caoyanyi 47e7fbc765 * Optimize page style. 2023-02-02 10:47:39 +08:00
caoyanyi 702cb679fb * Modify extension list. 2023-02-02 09:47:24 +08:00