 田淑杰
|
c5925821b0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-20 09:37:03 +08:00 |
|
|
孔令茂
|
5de767bed3
|
* Optimize word.
|
2022-12-17 14:06:27 +00:00 |
|
|
tianshujie
|
c201a0e478
|
* Finish task #79634.
|
2022-12-13 14:47:28 +08:00 |
|
|
文睿 李
|
cb729e1864
|
* resolve conflict of task model, add method for task searching.
|
2022-12-08 03:44:50 +00:00 |
|
|
Wenrui LI
|
8aa30bd281
|
* use tasks api in zentao bot.
|
2022-12-07 10:36:49 +08:00 |
|
|
鲁飞
|
2f4ad5c556
|
* Format code and fix return value.
|
2022-12-06 06:05:18 +00:00 |
|
|
dingguodong
|
5fc4eeb5dd
|
* Adjust extension loading priority for saas.
|
2022-12-05 10:00:37 +08:00 |
|
|
wangyidong
|
e460772fc4
|
* code for task #77129.
|
2022-11-29 10:52:01 +08:00 |
|
|
liugang
|
08748eb7d4
|
Merge branch 'guanxiying/zentaopms-master'
|
2022-11-23 10:09:31 +08:00 |
|
|
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 |
|
|
liugang
|
540cd0e3c5
|
* Rename model to target.
|
2022-11-01 09:59:32 +08:00 |
|
|
liugang
|
8220ce7025
|
* Load tao class in the model class and its subclasses.
|
2022-11-01 09:47:09 +08:00 |
|
|
liugang
|
9b6e282725
|
* Load zen class in the control class and its subclasses.
|
2022-11-01 09:45:25 +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 |
|
|
Guan Xiying
|
c2e9f3dab2
|
* Add function to load target file.
|
2022-10-27 15:48:48 +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 |
|
|
Guan Xiying
|
3848e7312d
|
* Use $this->moduleName instead of $moduleName for it might be empty
sometimes.
|
2022-10-26 14:00:12 +08:00 |
|
|
Guan Xiying
|
3c46850e0e
|
* Return false when the target object is empty to avoid assigning
property to a null object.
|
2022-10-26 13:58:18 +08:00 |
|