Commit Graph
207 Commits
Author SHA1 Message Date
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
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 dddee69dc6 * Code for finish task #83725. 2023-02-08 11:12:49 +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 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
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 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 2b265f6157 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation 2023-02-07 09:01:49 +08:00
guofeilong c14a0f505a * Code for add lang in admin 2023-02-06 17:14:18 +08:00
guofeilong 36bd3f3384 * Code for task #83731 2023-02-06 16:52:51 +08:00
tianshujie adc0616341 * Code for finish task #83721,83722. 2023-02-06 15:41:55 +08:00
wangyidong d4f96da08f * code for story 41755. 2023-02-03 13:57:36 +08:00
wangyidong 911d7de31a * adjust for admin unit testing. 2023-02-02 10:54:35 +08:00
wangyidong 3dacf0c938 * code for admin menu. 2023-02-02 09:18:49 +08:00
caoyanyi 2ef5fe6d4a * Add language. 2023-02-01 16:58:39 +08:00
caoyanyi 7595e90004 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-01 16:01:23 +08:00
caoyanyi bfb0c22484 * Optimize page style. 2023-02-01 16:00:45 +08:00
wangyidong de17879c59 * code for task #83436. 2023-02-01 15:37:07 +08:00
wangyidong 84905c803d * code for task #83428. 2023-02-01 15:05:58 +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
wangyidong 8ec471f950 * code for task #83439. 2023-02-01 11:20:57 +08:00
caoyanyi 65e097b00e * Add setting block. 2023-02-01 10:18:00 +08:00
wangyidong 35fa42992c Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-01-31 16:19:10 +08:00
wangyidong 7af8d535f1 * code for task #83439. 2023-01-31 16:15:00 +08:00
guofeilong e99e2adad0 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-01-31 10:59:18 +08:00
guofeilong ffe1ccdbe8 * code for lang 2023-01-31 10:25:38 +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
tianshujie 8b5f786bd2 * Finish task #83329. 2023-01-30 17:23:10 +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
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 3a204c4a37 * Adjust otherOa to otherOA. 2022-11-03 07:04:47 +00:00
wangyuting2 a873368635 * Adjust lang. 2022-11-02 06:17:35 +00:00
wangyuting2 7c4c04938b * Finish task #74156. 2022-10-31 05:04:57 +00:00