Commit Graph
128 Commits
Author SHA1 Message Date
wangyidong 1c98978146 * Code for task #110543. 2024-01-18 16:14:51 +08:00
zhouxin b2fa96b29a - Remove measurement,measrecord,meas module. 2023-12-29 16:12:42 +08:00
caoyanyi 8e17266f28 * Update commit link info. 2023-12-06 13:42:44 +08:00
caoyanyi a33ad4ad71 * Update copyright year. 2023-12-05 13:32:52 +08:00
tanghucheng 3d94eac50a Merge branch 'Merge184' into c07e4a71eb 2023-11-30 21:21:55 -05:00
chaideqing d603c728d3 * Merge module-admin 18.8-18.x to Merge184. 2023-11-27 16:35:59 +08:00
chaideqing a4d5438696 * Merge module-admin 18.4-18.8 to Merge184. 2023-11-22 09:41:29 +08:00
liugang eb746929b0 * admin: display required tag and change text of submit button. 2023-07-26 14:07:53 +08:00
zenggang 3d9d74a7ad * Finish task#98019 2023-07-19 06:40:49 +00:00
朱金勇 1eae54c17b * Migrate admin of qucheng. 2023-06-09 03:31:44 +00:00
liumengyi 43c8fd2a6b * Rename the privilege of admin-safe. 2023-04-14 10:53:38 +08:00
liumengyi 268c7f3271 + Revert the privilege of admin-sso. 2023-04-13 15:53:59 +08:00
liumengyi ae3d710996 - Delete the privilege of admin-checkDB. 2023-04-13 15:37:18 +08:00
liumengyi 485ed73e6a - Delete the privilege of admin-sso. 2023-04-13 15:35:06 +08:00
tianshujie 1cb2dc55d4 * Code for fix bug #33014. 2023-03-16 16:21:33 +08:00
guofeilong e23d18108b * Code for change lang in admin. 2023-03-01 17:22:08 +08:00
tianshujie f0ff736880 * Code for fix bug #32473. 2023-02-28 13:55:12 +08:00
tianshujie 1fb329fd8d * Optimize the display of grey blocksOptimize the display of grey blocks. 2023-02-27 16:42:54 +08:00
guofeilong d3e27b3389 * Code for module admin refactors. 2023-02-21 14:00:48 +08:00
tianshujie d6266bc607 * Code for finish task #85047. 2023-02-20 14:47:10 +08:00
caoyanyi b478779676 * Fix bug #32184,32192,32193. 2023-02-16 11:09:18 +08:00
tianshujie 2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
tianshujie b2fef4f696 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-15 08:19:27 +08:00
hufangzhou cc4b6d5310 * Adjust the lang. 2023-02-14 15:35:45 +08:00
wangyidong 1ff0629556 * adjust for admin index page. 2023-02-09 16:29:00 +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
guofeilong fb9f725975 * Code for update admin.html 2023-02-07 16:54:50 +08:00
guofeilong 36bd3f3384 * Code for task #83731 2023-02-06 16:52:51 +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 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
wangyuting2 f8f329ec94 * Finish task #73470. 2022-10-26 07:01:57 +00:00
liumengyi a998967592 * Finish task #65551. 2022-08-18 08:21:33 +08:00
wangyidong 811c1d2ad6 * adjust for change table engine. 2022-08-15 13:04:24 +08:00