Commit Graph

604 Commits

Author SHA1 Message Date
周旭东
82d4f1c8ea Update helper.class.php 2022-02-11 01:02:07 +00:00
周旭东
acdbf7e73d Update helper.class.php 2022-02-11 01:01:50 +00:00
zhouxudong
6ddf3fdc98 *Fix bug #19294. 2022-02-11 08:59:20 +08:00
朱金勇
91e9aeaf20 Merge branch 'roadrunner-zhangrunyu' into 'master'
Add roadrunner cron

See merge request easycorp/zentaopms!1359
2022-01-13 05:01:47 +00:00
zhangrunyu
39e30fc64f Fix compatibility with PHP 5.4 2022-01-13 10:14:15 +08:00
zhangrunyu
80d6389aaf Add roadrunner cron 2022-01-12 13:10:52 +08:00
孙广明
e94c1128e1 Merge branch 'sprint/180_songchenxuan_fix_code_review' into 'master'
*Code for code review.

See merge request easycorp/zentaopms!1287
2022-01-06 06:18:23 +00:00
songchenxuan
8927059720 *Code for code review. 2022-01-06 13:08:46 +08:00
王怡栋
51e32b6fa1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-01-06 11:56:43 +08:00
王怡栋
9b9c95ca54 * adjust for check requiredField for flow. 2022-01-06 11:56:07 +08:00
tianshujie
26685258c7 * Fix bug #18213. 2022-01-06 11:14:48 +08:00
zhujinyong
87817d186c * Fix router error of api. 2022-01-04 10:52:29 +08:00
zhujinyong
17384dcb06 * Fix bug: super model must return. 2022-01-04 10:27:09 +08:00
zhujinyong
8407a4a105 * Adjust code for PHP8. 2021-12-28 16:21:57 +08:00
zhujinyong
3dbabdf6af * Adjust code for PHP8. 2021-12-28 16:15:20 +08:00
zhujinyong
df07ada2b3 * Fix path of api. 2021-12-28 14:34:12 +08:00
Yurun
c19e44c044 Fix die naming compatibility 2021-12-21 14:25:53 +08:00
朱金勇
3a8eabb057 Merge branch 'change-die-zhangrunyu' into 'master'
Change die

See merge request easycorp/zentaopms!1029
2021-12-21 05:59:10 +00:00
Yurun
08935cfe5b Optimize 2021-12-21 13:21:12 +08:00
王怡栋
bf4dcdd19c * adjust get api version. 2021-12-21 11:08:28 +08:00
Yurun
2ca28f589f Add EndResponseException and helper::die() 2021-12-21 09:47:31 +08:00
王怡栋
56437f6418 Merge branch 'master' into 'apiext'
# Conflicts:
#   config/routes.php
2021-12-17 09:58:59 +00:00
zhujinyong
de2e4be174 * Fix test. 2021-12-17 10:23:57 +08:00
zhujinyong
fc9fe1ac84 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-03 10:01:17 +08:00
zhujinyong
861e92107c + Add user type for api. 2021-12-03 10:01:01 +08:00
王怡栋
caab069444 * add system mode for config. 2021-12-03 09:54:28 +08:00
liyuchun
f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
王怡栋
9286434da5 * code for task #45297. 2021-12-01 13:59:25 +08:00
zhujinyong
d8cefe71d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-01 10:01:02 +08:00
zhujinyong
74a4cd7470 + Add productplan methods for api. 2021-12-01 10:00:06 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
liyuchun
4906d6f51a * Fix bug #16759. 2021-11-30 09:29:35 +08:00
王怡栋
ae346dd200 * adjust for set api version. 2021-11-29 14:06:00 +08:00
zhujinyong
be26a7c731 * Fix errors of api. 2021-11-29 13:09:05 +08:00
zhujinyong
4b57e8627b * Fix api of program. 2021-11-28 22:17:33 +08:00
王怡栋
385cb41a0e * code for task #44938. 2021-11-25 11:35:46 +08:00
zhujinyong
49bff6df49 * Fix router of api. 2021-11-25 10:26:17 +08:00
王怡栋
90a913ca4b Merge branch 'sprint/170' 2021-11-22 16:59:40 +08:00
zhujinyong
39b22de67b Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 2021-11-19 08:42:40 +08:00
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
zhujinyong
0ee281b800 * Fix version of api request. 2021-11-18 14:37:26 +08:00
dingguodong
4e97e695f3 * Correct the bad param type. 2021-11-16 10:55:27 +08:00
王怡栋
1feb6d2b2f * code for task #43747. 2021-11-15 08:37:51 +08:00
王怡栋
7dd4586d46 * adjust for api. 2021-11-12 13:51:26 +08:00
dingguodong
acb23a5053 * Change function comment and resolve others which unexpected. 2021-11-11 18:29:59 +08:00
zhujinyong
1515e07c04 * Fix bugs: Compatibility for old version. 2021-11-11 17:19:55 +08:00
zhujinyong
9e996b6deb * Fix code error of compatibility. 2021-11-10 16:01:47 +08:00
zhujinyong
37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
zhujinyong
ea45b8f9ea * Fix compatibility. 2021-11-09 20:43:53 +08:00
王怡栋
fe82c61361 * code for task #43761. 2021-11-09 13:47:06 +08:00