Commit Graph
61 Commits
Author SHA1 Message Date
liumengyi 637b0912a7 * Finish task #87013. 2023-03-13 07:07:13 +00:00
王怡栋 3438722a8c Merge branch 'master' into 'zentaopms_289'
# Conflicts:
#   db/update18.2.sql
2023-03-06 03:26:34 +00:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
wangyidong 01bb8130dd Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 08:50:31 +08:00
wangyidong 1a352410a6 * code for task #85503. 2023-03-01 08:49:44 +08:00
caoyanyi ef0c77d611 * Modify tutorial tip. 2023-02-28 12:28:15 +08:00
tianshujie 28b40db1de * Modify helper url for admin block. 2023-02-27 16:48:56 +08:00
liumengyi 4912b2004e * Finish task #85630. 2023-02-27 06:54:39 +00:00
tianshujie cb3a0faa9c * Added mandatory execution items config. 2023-02-17 14:02:01 +08:00
tianshujie 2925520efd * Modify field name. 2023-02-16 15:53:11 +08:00
tianshujie d657ae898a * Restore. 2023-02-16 15:50:31 +08:00
tianshujie 9b4772b07d * Fix bug #32215. 2023-02-16 15:44:35 +08:00
tianshujie f39f2d27ed * Code for fix bug #32206. 2023-02-16 15:27:43 +08:00
tianshujie 9df139a83a * Fixed an error in the lite Edition. 2023-02-14 14:37:24 +08:00
wangyidong 26f1849bbc * code for task #83739. 2023-02-13 16:52:02 +08:00
wangyidong 6b0a919b6f * code for task #83737. 2023-02-13 15:23:46 +08:00
wangyidong ff66b39a2a * code for task #83736. 2023-02-10 17:37:50 +08:00
caoyanyi 9ea480e4b8 * Add sub menu active. 2023-02-10 10:18:38 +08:00
wangyidong 1ff0629556 * adjust for admin index page. 2023-02-09 16:29:00 +08:00
tianshujie be37300935 * Code for finish task #83741. 2023-02-09 14:19:15 +08:00
tianshujie 78506e6ad4 * Add navigation highlighting. 2023-02-09 13:27:31 +08:00
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
caoyanyi 7e20b4813f * Modify sub menu active. 2023-02-09 10:38:05 +08:00
tianshujie bc73b6d379 * Code for finish task #83727. 2023-02-09 09:59:56 +08:00
wangyidong 81e8a96d6f * code for task #83740. 2023-02-09 09:59:24 +08:00
tianshujie f53cd0d57a * Code for finish task #83726. 2023-02-09 09:29:06 +08:00
wangyidong a12f2b07b4 * revert for api link. 2023-02-08 16:44:13 +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
王怡栋 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
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
caoyanyi 4896324869 * Optimize plugin desc style. 2023-02-03 12:08:57 +08:00
caoyanyi 702cb679fb * Modify extension list. 2023-02-02 09:47:24 +08:00
wangyidong 2975445f53 * fix bug for admin menu. 2023-02-02 09:43:48 +08:00
caoyanyi 0395e9266d * Modify lite vision system style. 2023-02-02 09:10:15 +08:00
caoyanyi 9f7d184aaa * Modify system block style. 2023-02-01 14:22:47 +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 8ec471f950 * code for task #83439. 2023-02-01 11:20:57 +08:00
guofeilong b8cc73ea73 * code for dom more 2023-02-01 10:13:24 +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 062200535c * Modify page style. 2023-01-31 13:54:21 +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 49f6118bb2 - Remove useless config items. 2022-11-17 14:01:46 +08:00
wangyidong e6b8ac6a2b * fix for link zentao site. 2018-09-21 15:15:13 +08:00