Commit Graph
581 Commits
Author SHA1 Message Date
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
王怡栋 179d3998f2 Merge branch 'dev/gfl_views_refacotrs_admin' into 'master'
* Adjust code in admin.

See merge request easycorp/zentaopms!7133
2023-03-02 09:08:27 +00:00
王怡栋 2534dd97e4 Merge branch 'admin_bug_32593' into 'master'
Admin bug 32593

See merge request easycorp/zentaopms!7134
2023-03-02 09:08:12 +00:00
caoyanyi 58d9fd2ee9 * Fix bug #32593. 2023-03-02 17:04:44 +08:00
郭飞龙 95184b53a3 * Adjust code in control.php. 2023-03-02 09:00:04 +00:00
guofeilong f1c5c8c82c * Adjust code in admin. 2023-03-02 16:58:42 +08:00
郭飞龙 7ebf700fd4 * Adjust code. 2023-03-02 06:57:28 +00:00
caoyanyi a261f37af4 * Add zentao api get. 2023-03-02 14:51:35 +08:00
guofeilong 75b2f2abe6 * Code for view refactors in admin . 2023-03-02 14:34:20 +08:00
wangyidong 6ba9f87069 * code for bug #32512. 2023-03-02 10:08:29 +08:00
guofeilong e23d18108b * Code for change lang in admin. 2023-03-01 17:22:08 +08:00
孙广明 db4662cfbc Merge branch 'cyy_bug' into 'master'
* Fix bug #32549.

See merge request easycorp/zentaopms!7109
2023-03-01 09:13:25 +00:00
wangyidong 1290b01c85 * adjust extension api for admin. 2023-03-01 15:11:02 +08:00
caoyanyi 6fb473eeea * Fix bug #32549. 2023-03-01 14:31:40 +08:00
王怡栋 05142a4c39 Merge branch 'fixbug_liumengyi_32414' into 'master'
* Fix bug 32414.

See merge request easycorp/zentaopms!7099
2023-03-01 03:06:17 +00:00
liumengyi 57c46206e9 * Fix bug #32525. 2023-03-01 03:01:40 +00:00
caoyanyi 64de9482d8 * Modify plugins locate. 2023-03-01 10:26:29 +08:00
caoyanyi f5a93d1166 * Fix bug #32517. 2023-03-01 10:15:17 +08:00
caoyanyi a32120f52b * Fix bug #32516. 2023-03-01 09:28:10 +08:00
tianshujie f0ff736880 * Code for fix bug #32473. 2023-02-28 13:55:12 +08:00
tianshujie c82f1a02a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_ui 2023-02-28 13:13:13 +08:00
caoyanyi ef0c77d611 * Modify tutorial tip. 2023-02-28 12:28:15 +08:00
tianshujie f6a573a51f * Code for fix bug #32458. 2023-02-28 10:32:13 +08:00
tianshujie 28b40db1de * Modify helper url for admin block. 2023-02-27 16:48:56 +08:00
tianshujie 1fb329fd8d * Optimize the display of grey blocksOptimize the display of grey blocks. 2023-02-27 16:42:54 +08:00
wangyidong 11507ffff2 * fix bug #32277. 2023-02-27 16:16:04 +08:00
孙广明 167539f822 Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Modify menu name.

See merge request easycorp/zentaopms!7076
2023-02-27 06:59:14 +00:00
hufangzhou f41f2cfb9b * Add the lang item. 2023-02-27 06:57:19 +00:00
liumengyi 4912b2004e * Finish task #85630. 2023-02-27 06:54:39 +00:00
liumengyi a23d205435 * Modify menu name. 2023-02-27 06:24:08 +00:00
王怡栋 65991d0a05 Merge branch 'dev/gfl_admin_css_refactors' into 'master'
* Code for css refactors in admin.

See merge request easycorp/zentaopms!7053
2023-02-23 07:19:31 +00:00
guofeilong c1153374fa * Code for css refactors in admin. 2023-02-23 14:11:18 +08:00
tianshujie a11b0a52a2 * Modify menu order for admin module. 2023-02-23 13:38:52 +08:00
guofeilong a08e498530 * Code for admin view refactors. 2023-02-22 17:17:01 +08:00
guofeilong 966511dc89 * Code for admin view refactors. 2023-02-22 17:08:49 +08:00
tianshujie 12cdb2f6d7 * Modify menu param. 2023-02-22 16:11:21 +08:00
王怡栋 8b53329ebb Merge branch 'cyy_optimize' into 'master'
* Code for issue #762.

See merge request easycorp/zentaopms!7030
2023-02-22 07:51:35 +00:00
guofeilong 746860335b * admin: view refactors. 2023-02-22 15:39:38 +08:00
caoyanyi 7c257b5e1e * Code for issue #762. 2023-02-22 15:16:48 +08:00
guofeilong bdd52bcd1d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_admin_refactors 2023-02-21 16:36:15 +08:00
tianshujie 8d2abc483d * Fixed print navigation issues. 2023-02-21 16:14:27 +08:00
guofeilong d3e27b3389 * Code for module admin refactors. 2023-02-21 14:00:48 +08:00
孙广明 6c1ed365ab Merge branch 'sprint/292_liumengyi_85038' into 'master'
* Finish task #85038, #85039, #85040.

See merge request easycorp/zentaopms!7010
2023-02-21 05:50:04 +00:00
tianshujie 71c60b8332 * Code for finish task #85047. 2023-02-21 09:30:09 +08:00
liumengyi 95e3978fb0 * Finish task #85038, #85039. 2023-02-21 01:05:24 +00:00
tianshujie d6266bc607 * Code for finish task #85047. 2023-02-20 14:47:10 +08:00
tianshujie 8208608430 * Compatible with earlier versions of php. 2023-02-17 17:32:46 +08:00
tianshujie cb3a0faa9c * Added mandatory execution items config. 2023-02-17 14:02:01 +08:00
tianshujie 0e7556ab18 * Compatible with php version. 2023-02-17 11:22:49 +08:00
tianshujie 2925520efd * Modify field name. 2023-02-16 15:53:11 +08:00