Commit Graph

232 Commits

Author SHA1 Message Date
王怡栋
55beac7f83 * fix bug #20581. 2022-03-10 16:31:46 +08:00
王怡栋
aff63f4ff7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-08 10:54:08 +08:00
王怡栋
b960a07ecf * code for task #49352. 2022-03-08 10:52:48 +08:00
王怡栋
ed5aa3d335 Merge branch 'sprint/master_tanghucheng_bug' into 'master'
* Fix bug #50369.

See merge request easycorp/zentaopms!2133
2022-03-08 02:26:35 +00:00
tanghucheng
b279fbbc3e * Fix bug #50369. 2022-03-08 10:19:07 +08:00
zhujinyong
4451a14e00 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-07 23:04:17 +08:00
zhujinyong
43ef4bc43c * Fix upgrade. 2022-03-07 23:00:30 +08:00
hufangzhou
6822e98080 * Fix bug #50310. 2022-03-07 10:36:44 +08:00
zhujinyong
732a6d8891 * Fix bug: declare function of ext model. 2022-03-04 08:46:41 +08:00
zhujinyong
f25b9b44ce * Remove ext model of same filename. 2022-03-03 22:58:39 +08:00
王怡栋
58b1f576bc * fix for api and remove bom and adjust for php8.1. 2022-03-03 10:19:58 +08:00
zhujinyong
994cb810ef * Fix xuan extension. 2022-02-28 14:41:44 +08:00
孙广明
5ff5699d91 * Fix bug. 2022-02-25 17:11:58 +08:00
孙广明
c1ebe28837 * Fix bug. 2022-02-25 15:39:08 +08:00
zhujinyong
762c60d0d0 * Fix extLangPath. 2022-02-25 15:17:53 +08:00
zhujinyong
a33ba80fb4 * Adjust language of router. 2022-02-25 14:58:58 +08:00
孙广明
8cbc861ec1 Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
* adjust for set vision.

See merge request easycorp/zentaopms!1962
2022-02-24 08:20:31 +00:00
王怡栋
34395b7a41 * adjust for set vision. 2022-02-24 16:17:09 +08:00
zhujinyong
c7708b55cc * Adjust style of vision switcher. 2022-02-24 16:02:17 +08:00
zhujinyong
0ba3f443cf * Fix loadExtension. 2022-02-24 14:58:02 +08:00
孙广明
0ee66db862 * Code for upgrade. 2022-02-23 13:44:09 +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
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
朱金勇
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
tianshujie
26685258c7 * Fix bug #18213. 2022-01-06 11:14:48 +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
Yurun
08935cfe5b Optimize 2021-12-21 13:21:12 +08:00