Commit Graph
761 Commits
Author SHA1 Message Date
guofeilong c86bc8f8a5 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-02-02 08:29:30 +08:00
guofeilong 96aa9e19b1 * handle conflict 2023-02-01 17:21:33 +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 2ef5fe6d4a * Add language. 2023-02-01 16:58:39 +08:00
guofeilong 1010f30ae3 * code for disabled in setting-box 2023-02-01 16:55:29 +08:00
caoyanyi 5db8511efc * Adjust code. 2023-02-01 16:35:28 +08:00
guofeilong 5524568d34 * code for add pd-left to icon 2023-02-01 16:19:46 +08:00
guofeilong 7b516288a6 * code for change icon: font-size 2023-02-01 16:18:28 +08:00
guofeilong 547d866734 * code for css in without Internet 2023-02-01 16:10:27 +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
caoyanyi 78290d812f * Optimize class style. 2023-02-01 14:50:02 +08:00
guofeilong 0400058454 * code for add css 2023-02-01 14:43:39 +08:00
caoyanyi 9f7d184aaa * Modify system block style. 2023-02-01 14:22:47 +08:00
guofeilong 8daa3273d0 * code for css in setting-box 2023-02-01 14:05:23 +08:00
caoyanyi bbb4c36827 * Optimiza page style. 2023-02-01 14:01:05 +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
guofeilong 3e386ba9c8 * code for svg and handle conflict 2023-02-01 13:50:27 +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
wangyidong 8ec471f950 * code for task #83439. 2023-02-01 11:20:57 +08:00
caoyanyi 9b699b54ec * Optimize page style. 2023-02-01 11:04:06 +08:00
caoyanyi 5388335a9b Merge branch 'dev/gfl_task_#83327' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-02-01 10:36:47 +08:00
caoyanyi d11b3f17ed * Modify class image. 2023-02-01 10:34:45 +08:00
guofeilong ca088f2e2c * code for css in settings dom 2023-02-01 10:33:56 +08:00
caoyanyi 3da6eff6c8 Merge branch 'dev/gfl_task_#83327' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-02-01 10:27:47 +08:00
caoyanyi e43e70f2c1 Merge branch 'sprint/285' into dev/gfl_task_#83327 2023-02-01 10:27:37 +08:00
caoyanyi 1e571955f9 * Adjust code. 2023-02-01 10:27:10 +08:00
guofeilong cca3b53827 * code for refactor in class dom 2023-02-01 10:25:53 +08:00
guofeilong 61830b5092 * code for css in admin 2023-02-01 10:23:48 +08:00
caoyanyi 3e0af988e2 Merge branch 'sprint/285' into dev/gfl_task_#83327 2023-02-01 10:20:17 +08:00
caoyanyi 65e097b00e * Add setting block. 2023-02-01 10:18:00 +08:00
guofeilong b8cc73ea73 * code for dom more 2023-02-01 10:13:24 +08:00
guofeilong 338ddc04d1 * code ofr css in admin 2023-02-01 10:00:43 +08:00
guofeilong 9cda91e65d * code for css in admin 2023-02-01 09:17:22 +08:00
guofeilong cdef2f2a88 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-01-31 17:20:39 +08:00
guofeilong d502d06618 * code for css in admin/index.html 2023-01-31 17:20:22 +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
caoyanyi 746bb0da84 * Modify language check. 2023-01-31 16:14:18 +08:00
guofeilong ed6256fac0 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-01-31 16:13:24 +08:00
caoyanyi 85ee9918c0 * Modify website check. 2023-01-31 15:25:46 +08:00
guofeilong 73ff7ad444 * code for add style in clientList 2023-01-31 14:50:09 +08:00
caoyanyi 062200535c * Modify page style. 2023-01-31 13:54:21 +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