Commit Graph
761 Commits
Author SHA1 Message Date
guofeilong e11aa068a3 * code for style in offical-content 2023-01-31 10:54:49 +08:00
guofeilong 0ab09e26c2 * code for task #83433 2023-01-31 10:46:16 +08:00
guofeilong ffe1ccdbe8 * code for lang 2023-01-31 10:25:38 +08:00
guofeilong 0959b76706 * code for css in plug 2023-01-31 09:14:53 +08:00
王怡栋 d8ed3dbca6 Merge branch 'sprint/285_navigation' into 'sprint/285'
* Finish task #83329.

See merge request easycorp/zentaopms!6804
2023-01-31 00:49:07 +00:00
guofeilong e7468f1699 * code for css in admin.html 2023-01-31 08:27:03 +08:00
tianshujie 8b5f786bd2 * Finish task #83329. 2023-01-30 17:23:10 +08:00
guofeilong 6ce4ae36ec Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-01-30 17:20:05 +08:00
caoyanyi 02f6b95c20 * Add extension list. 2023-01-30 17:11:28 +08:00
guofeilong 6df1f2daa6 * code for task_#83327 2023-01-30 16:37:24 +08:00
guofeilong 44b526f9fc * code for task #83327 2023-01-30 14:57:46 +08:00
Lufei 80d2e0f6c0 * Add check ext-gd extension. 2022-12-01 12:16:57 +08:00
朱金勇 9254620aa8 Merge branch 'fix_api_scheme' into 'master'
* Fix baseUrl scheme error for api createDemoData.

See merge request easycorp/zentaopms!6407
2022-11-30 00:20:44 +00:00
Lufei 12e1539301 * Fix baseUrl scheme error for api createDemoData. 2022-11-29 18:28:13 +08:00
Lufei cc8254f1a0 - Remove useless output. 2022-11-29 16:46:52 +08:00
wangyuting aa08e084e1 * Optimize set module page css. 2022-11-23 07:24:40 +00:00
wangyuting 748335e401 * Finish task #77136. 2022-11-22 02:13:02 +00:00
Lufei 49f6118bb2 - Remove useless config items. 2022-11-17 14:01:46 +08:00
wangyuting 3c36bfbb70 * Fix bug #29593. 2022-11-11 01:38:47 +00:00
wangyuting2 df375beaa5 * Fix bug #29286. 2022-11-04 06:55:16 +00:00
wangyuting2 0cefde5d28 * Optimize code for review code. 2022-11-04 06:35:21 +00:00
wangyuting2 b4f6b346b8 * Fix bug for review code. 2022-11-03 07:16:01 +00:00
wangyuting2 3a204c4a37 * Adjust otherOa to otherOA. 2022-11-03 07:04:47 +00:00
wangyuting2 4d63abcce5 * Fix caselib bug. 2022-11-02 07:18:06 +00:00
wangyuting2 a873368635 * Adjust lang. 2022-11-02 06:17:35 +00:00
wangyuting2 dc4716f951 * Finish task #73845 ~ #73848. 2022-11-02 06:05:18 +00:00
wangyuting2 d54ca95ff6 * Finish task #73838 ~ #73844. 2022-11-02 01:15:40 +00:00
wangyuting2 95a2e3da68 * Finish task #73828. 2022-10-31 06:08:56 +00:00
wangyuting2 7c4c04938b * Finish task #74156. 2022-10-31 05:04:57 +00:00
wangyuting2 b7ebe4ee2b * Optimize code. 2022-10-28 08:05:21 +00:00
wangyuting2 e72e9c7a74 * Optimize code. 2022-10-26 07:13:57 +00:00
wangyuting2 f8f329ec94 * Finish task #73470. 2022-10-26 07:01:57 +00:00
wangyidong 760c73bffa * fix bug #27001. 2022-09-01 10:20:18 +08:00
wangyidong 8d56ef8891 * Compatible for php8.1. 2022-08-29 11:19:31 +08:00
胡方舟 2027a69923 Merge branch 'sprint/228' into 'master'
Sprint/228

See merge request easycorp/zentaopms!5015
2022-08-18 07:53:30 +00:00
liumengyi 62d465d047 * Finish task #65551. 2022-08-18 11:22:16 +08:00
liumengyi a998967592 * Finish task #65551. 2022-08-18 08:21:33 +08:00
liumengyi 6dc929d1db * Fix bug #25319. 2022-08-17 10:58:25 +08:00
liumengyi 33fa12239e * Fix bug #25319. 2022-08-17 10:56:09 +08:00
wangyidong 0d6be2f360 * fix for sql error when change table engine. 2022-08-15 17:56:30 +08:00
wangyidong 811c1d2ad6 * adjust for change table engine. 2022-08-15 13:04:24 +08:00
wangyidong a7da22c833 Merge branch 'sprint/224_hufangzhou_doc' 2022-08-12 16:42:20 +08:00
wangyidong 9a3513a15c * change for change table engine. 2022-08-12 16:11:35 +08:00
liumengyi c376a0b74c * Optimize language item. 2022-08-10 15:44:36 +08:00
liumengyi 880f39ddf0 * Fix bug #25319. 2022-08-10 13:48:25 +08:00
liumengyi d80080b67b * Fix bug #25319. 2022-08-10 13:39:35 +08:00
liumengyi e8d7949d25 * Fix bug #25806. 2022-07-28 15:16:06 +08:00
zhouxudong 26babb4762 * Fix bug #25105. 2022-07-14 01:58:45 +00:00
zhouxudong d2fe52d3b2 * Finish task #60394 #60392 #60389. 2022-07-11 06:55:36 +00:00
zhouxudong b5475f51b2 * Finish task #60394 #60392 #60389. 2022-07-11 03:28:17 +00:00