Commit Graph
51977 Commits
Author SHA1 Message Date
caoyanyi edc301d455 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 15:24:30 +08:00
wangyidong 1290b01c85 * adjust extension api for admin. 2023-03-01 15:11:02 +08:00
Yagami 9fe8ffa4af Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-01 14:48:22 +08:00
Yagami 97c421c5b4 * Fix bug #32374. 2023-03-01 14:48:12 +08:00
wangyidong 455e030e23 * adjst for monaco editor. 2023-03-01 14:34:30 +08:00
孙广明 cef80a4330 Merge branch 'sprint/hufangzhou_fixbug_32533' into 'master'
* Fix bug #32533.

See merge request easycorp/zentaopms!7107
2023-03-01 06:34:02 +00:00
孙广明 630e1eb570 Merge branch 'wxp_bug85658_' into 'master'
* Fix bug #85658.

See merge request easycorp/zentaopms!7108
2023-03-01 06:33:47 +00:00
孙广明 dc4027286e Merge branch 'fixbug_liumengyi_32414' into 'master'
* Fix bug 32513.

See merge request easycorp/zentaopms!7106
2023-03-01 06:33:24 +00:00
孙广明 c8cc3fbf87 Merge branch 'tsj_fixbug' into 'master'
* Code for fix bug #32528.

See merge request easycorp/zentaopms!7104
2023-03-01 06:33:10 +00:00
tianshujie 7f121ebdf7 * Code for fix bug #32487. 2023-03-01 14:29:57 +08:00
caoyanyi 1a7b1c0401 * Compatible with PHP5.3. 2023-03-01 14:29:23 +08:00
wangxuepeng 9c840db309 * Fix bug #85658. 2023-03-01 06:25:32 +00:00
tianshujie 0233152d1e * Change the project to a variable. 2023-03-01 13:45:52 +08:00
hufangzhou c262a060bd * Fix bug #32533. 2023-03-01 05:32:58 +00:00
liumengyi 951e4a09e1 * Fix bug #32513. 2023-03-01 05:06:42 +00:00
孙广明 925456c326 Merge branch 'lyk_fixbug' into 'master'
* Fix bug: Gitea cannot stop sync.

See merge request easycorp/zentaopms!7100
2023-03-01 04:23:54 +00:00
zhujinyong b2b07abd7e * Fix bug #32411. 2023-03-01 12:00:44 +08:00
caoyanyi bec24aafa9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 11:52:44 +08:00
tianshujie 745151425c * Code for fix bug #32528. 2023-03-01 11:17:30 +08:00
王怡栋 504455b53c Merge branch 'sprint/hufangzhou_bug_32486' into 'master'
* Fix bug #32486.

See merge request easycorp/zentaopms!7102
2023-03-01 03:06:54 +00:00
王怡栋 9f2dc5d215 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7101
2023-03-01 03:06:37 +00: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
王怡栋 27ccbf8bc6 Merge branch 'sprint/hufangzhou_bug_32518' into 'master'
* Fix bug #32518.

See merge request easycorp/zentaopms!7098
2023-03-01 03:05:55 +00:00
王怡栋 27e032ff95 Merge branch 'cyy_bug' into 'master'
* Modify admin tutorial style.

See merge request easycorp/zentaopms!7097
2023-03-01 03:05:31 +00:00
liumengyi 57c46206e9 * Fix bug #32525. 2023-03-01 03:01:40 +00:00
zhujinyong f667435248 Fix bug #32521. 2023-03-01 10:49:02 +08:00
tianshujie 707bc8cbda * Code for fix bug #32522. 2023-03-01 10:41:57 +08:00
caoyanyi 64de9482d8 * Modify plugins locate. 2023-03-01 10:26:29 +08:00
tianshujie b0b5babbd4 * Added the determination that the editor configuration item does not
exist.
2023-03-01 10:25:17 +08:00
caoyanyi f5a93d1166 * Fix bug #32517. 2023-03-01 10:15:17 +08:00
tianshujie 9e4fa093d8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 10:14:51 +08:00
hufangzhou 451f5b190b * Fix bug #32486. 2023-03-01 02:07:51 +00:00
tianshujie ffab596abf * Code for fix bug #32519. 2023-03-01 09:42:03 +08:00
liumengyi 76be77868c * Fix bug #32520. 2023-03-01 01:34:14 +00:00
caoyanyi a32120f52b * Fix bug #32516. 2023-03-01 09:28:10 +08:00
tianshujie 688c38b78b * Code for fix bug #32519. 2023-03-01 09:27:20 +08:00
liuyongkai b70f496d83 * Fix bug: Gitea cannot stop sync. 2023-03-01 09:02:00 +08:00
liumengyi 39d756b905 * Fix bug #32414. 2023-03-01 00:56:46 +00:00
hufangzhou e93bfa4498 * Fix bug #32518. 2023-03-01 00:55:15 +00:00
zhujinyong e0bb071d99 * Fix bug #32339. 2023-03-01 08:52:19 +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 308b28f51c * Modify admin tutorial style. 2023-03-01 08:45:27 +08:00
胡方舟 c1110cc668 Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Fix bug #32466.

See merge request easycorp/zentaopms!7095
2023-03-01 00:38:10 +00:00
tianshujie 872137cea6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 08:35:21 +08:00
王怡栋 4f6e7cbe34 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7096
2023-03-01 00:32:32 +00:00
王怡栋 23d4e4d11e Merge branch 'daitingting_bug_#32503' into 'master'
* Fix bug #32503.

See merge request easycorp/zentaopms!7094
2023-03-01 00:31:59 +00:00
王怡栋 079e301cbc Merge branch 'cyy_optimize' into 'master'
* Optimize page style for guide block.

See merge request easycorp/zentaopms!7093
2023-03-01 00:31:40 +00:00
王怡栋 edadf35e67 Merge branch 'zenops_task_85166' into 'master'
* Finish task#85166,85171

See merge request easycorp/zentaopms!7091
2023-03-01 00:31:10 +00:00
王怡栋 97feb59658 Merge branch 'master_xieqiyu_28400' into 'master'
* Code for bug#28400.

See merge request easycorp/zentaopms!7090
2023-03-01 00:30:04 +00:00