Commit Graph

627 Commits

Author SHA1 Message Date
tianshujie
38ebc359e6 * Modify the code logic. 2022-02-23 17:02:03 +08:00
tianshujie
e1e2686493 * Modify the issue of feature review. 2022-02-23 16:56:22 +08:00
孙广明
0ee66db862 * Code for upgrade. 2022-02-23 13:44:09 +08:00
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
zhujinyong
4f32cb8a1c + Add xuan extension. 2022-02-21 10:30:38 +08:00
王怡栋
3082abe478 * adjust for set vision. 2022-02-18 08:36:54 +08:00
zhujinyong
d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +08:00
zhujinyong
5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
王怡栋
936e1e21e1 * code for task #48841. 2022-02-15 10:47:50 +08:00
周旭东
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
王怡栋
de3200de24 * code for vision condition. 2022-02-10 17:17:29 +08:00
Wenrui LI
2ea759e42a * load extension class from custom extension paths. 2022-01-29 13:32:02 +08:00
tanghucheng
516001b2eb * Fix bug #19064. 2022-01-27 13:54:06 +08:00
zhujinyong
a7c35dec56 * Fix tmp model. 2022-01-21 12:19:37 +08:00
tanghucheng
e8053d6c9a * adjust for setVision if not install. 2022-01-21 09:16:21 +08:00
tanghucheng
dee6a7a312 * adjust for setVision if not install. 2022-01-21 08:58:04 +08:00
zhujinyong
2d122d54b8 * Autoload if module is not include. 2022-01-21 08:13:36 +08:00
zhujinyong
3baf9213a2 * Fix rnd vision. 2022-01-19 14:34:55 +08:00
王怡栋
bd824458e3 * add edition. 2022-01-19 09:07:40 +08:00
王怡栋
03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +08:00
王怡栋
d8577f7d28 * adjust for project kanban. 2022-01-17 17:25: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
王怡栋
37d1c0e9e6 * code for task #47149. 2022-01-13 09:03:35 +08:00
zhangrunyu
80d6389aaf Add roadrunner cron 2022-01-12 13:10:52 +08:00
Wenrui LI
0962bd39a0 * fix loading index.php from www. 2022-01-11 09:11:50 +08:00
zhujinyong
b4c3ec0a9c * Refactoring for extension. 2022-01-10 22:39:54 +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