Commit Graph
826 Commits
Author SHA1 Message Date
wangyuting a5488a96c9 * Fix bug #28221. 2022-11-18 06:42:14 +00:00
daitingting 40ff070bc9 * Fix bug #29652. 2022-11-16 09:15:15 +00:00
wangyuting bec09e5a0a * Adjust isFeature to canConfigFeature. 2022-11-11 07:28:46 +00:00
王怡栋 66b9e6b116 Merge branch 'master' into 'zentaopms258_wyd'
# Conflicts:
#   framework/base/router.class.php
2022-11-11 02:49:32 +00:00
wangyidong 8a178c72fe * adjust for project release link story and bug. 2022-11-11 10:47:01 +08:00
wangyidong a5b9f374d1 * merge git stash. 2022-11-10 15:50:17 +08:00
wangyidong 6eae8345f7 * merge ztSessionHandler. 2022-11-10 15:47:05 +08:00
王怡栋 d8b1b0ba39 Merge branch 'zentaopms_258_task#75248' into 'master'
* Finish task #75248.

See merge request easycorp/zentaopms!6082
2022-11-09 08:00:04 +00:00
wangyuting aed53849d1 * Finish task #75248. 2022-11-09 02:10:29 +00:00
宋辰轩 8883698534 * Delete unsed code. 2022-11-08 16:09:30 +08:00
宋辰轩 33c4c5278e *Fix api cannot use bug. 2022-11-08 16:07:09 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
鲁飞 b8619da3a6 * Fix missing requireFields error. 2022-11-07 09:14:12 +00:00
王怡栋 dc6371478d Merge branch 'zentaopms_239_task_#74859' into 'zentaopms_239'
* Finish task #74859.

See merge request easycorp/zentaopms!6049
2022-11-07 00:32:52 +00:00
daitingting bb4a0945fd * Finish task #74859. 2022-11-04 09:20:53 +00:00
Lufei 35ef023439 * Fix die error for xuanxuan. 2022-11-04 17:17:49 +08:00
wangyuting2 0cefde5d28 * Optimize code for review code. 2022-11-04 06:35:21 +00:00
朱金勇 8fff18a3ea Merge branch 'sprint/fix-api' into 'master'
* Fix call api error.

See merge request easycorp/zentaopms!6025
2022-11-04 02:51:21 +00:00
鲁飞 95d10ea6d3 * Fix call api error. 2022-11-04 02:51:20 +00:00
tianshujie 787ba2ad2d * Fix bug #29247. 2022-11-04 10:17:00 +08:00
wangyidong 59f0cc09d9 * adjust for account. 2022-11-03 15:58:08 +08:00
zhujinyong e5aa646144 * Fix session for api. 2022-11-03 10:03:19 +08:00
鲁飞 e0cd779954 * Remove use exit for api. 2022-11-03 00:32:42 +00:00
wangyidong fd56b11e41 * code for task #74779. 2022-11-02 10:18:26 +08:00
Lufei 3970bc226d * Fix install and upgrade locate error. 2022-11-01 19:22:40 +08:00
Lufei ac363b3df7 * Fix install error. 2022-11-01 15:44:49 +08:00
wangyidong 4f824f9410 * code for task #73994. 2022-11-01 15:02:20 +08:00
Yagami 68665d5ed0 * Finish task #74207. 2022-11-01 14:57:52 +08:00
Lufei 031838a6ce * Fix loadModel for entry. 2022-10-31 16:36:52 +08:00
鲁飞 b1cb5a798e * Fix bug of unauthorized users. 2022-10-28 08:16:50 +00:00
wangyidong 11e0ad5c0b * adjust for ztsession. 2022-10-28 09:38:40 +08:00
wangyuting2 a1df161747 * Finish task #73818. 2022-10-27 06:45:09 +00:00
wangyuting2 5467991e67 * Finish task #73814. 2022-10-27 06:10:54 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyuting2 f8f329ec94 * Finish task #73470. 2022-10-26 07:01:57 +00:00
caoyanyi 1a68e5ac28 * Modify session error. 2022-10-26 09:56:45 +08:00
wangyidong 91ae21caec Merge branch 'master' into sprint/feedback_module 2022-10-11 09:33:25 +08:00
wangyidong 460c3d9fb1 * adjust for ztSessionHandler. 2022-10-09 10:41:14 +08:00
王 于听 59d85868b5 Merge branch 'sprint/zentaopms240_wangyuting' into 'sprint/zentaopms240'
* Fix bug in review code.

See merge request easycorp/zentaopms!5612
2022-09-29 05:51:04 +00:00
wangyuting2 d33cc87da9 * Fix bug in review code. 2022-09-29 05:50:16 +00:00
wangyidong 9c83ba7cae Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240 2022-09-29 09:50:49 +08:00
wangyidong 1e928ed625 * code for task #70541. 2022-09-29 09:50:11 +08:00
wangyidong a4ae767404 * adjust for ztSessionHandler. 2022-09-29 09:38:22 +08:00
daitingting 63f84968b7 * Finish task #70546. 2022-09-28 07:17:52 +00:00
wangyuting2 ef6a569f2e * Add disabledFeatures config. 2022-09-27 07:38:49 +00:00
wangyidong fd623cb0c4 * adjust for code ajax send. 2022-09-27 15:18:51 +08:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
daitingting fe13c4de38 * Doing task #69253. 2022-09-16 01:02:13 +00:00
lanzongjun 2dbf74064c feedback module 2022-09-02 11:37:53 +08:00
wangyidong d859327126 * fix bug #26951. 2022-08-29 09:17:51 +08:00