Commit Graph
115 Commits
Author SHA1 Message Date
zenggang 29f2f5187b * Merge 18.x 2023-08-28 10:27:22 +00:00
wangyidong 1d0e660d55 * Fix bug #37626. 2023-08-25 16:11:22 +08:00
zhaoke a988a3a76e * Fix permission error of devops. 2023-08-16 18:11:37 +08:00
刘刚 7a6232fdec revert 64def76b06
revert + helper: add function to compute and display time consuming between 2 endpoints.
2023-08-10 10:20:58 +08:00
liugang 64def76b06 + helper: add function to compute and display time consuming between 2 endpoints. 2023-08-10 10:03:26 +08:00
zhaoke 9252914c45 * Fix miss action button of dtable. 2023-08-08 08:41:36 +08:00
zhaoke 69c6c9285d * Refactor space and store module. 2023-08-01 17:20:05 +08:00
zhaoke 86ae11aa9d * Fix error of check param type. 2023-07-31 16:25:40 +08:00
sunhao e97ab9686b + add zin and zui3 files. 2023-07-25 17:42:27 +08:00
caoyanyi 3642fc0e53 * Move isCacheEnabled function to base dir. 2023-06-30 13:25:27 +08:00
Lufei 80877816f4 * Fix typo. 2023-06-09 10:19:34 +08:00
Lufei 206b5d737b + Add helper::isCacheEnabled method. 2023-06-07 11:22:17 +08:00
Lufei 02969e979b * Optimize isIntranet. 2023-05-25 17:45:18 +08:00
tianshujie 4f5e7ef2e8 * Increment to the value of null time. 2023-02-21 17:20:53 +08:00
孙广明 777b20ebdc Merge branch 'sprint/tsj_task' into 'master'
Sprint/tsj task

See merge request easycorp/zentaopms!7009
2023-02-21 05:47:26 +00:00
caoyanyi f2bd44df29 * Modify date diff result. 2023-02-21 08:58:32 +08:00
tianshujie d6266bc607 * Code for finish task #85047. 2023-02-20 14:47:10 +08:00
caoyanyi b478779676 * Fix bug #32184,32192,32193. 2023-02-16 11:09:18 +08:00
caoyanyi 88ad600143 * Adjust code. 2023-02-08 15:53:04 +08:00
wangyuting a5488a96c9 * Fix bug #28221. 2022-11-18 06:42:14 +00:00
wangyuting bec09e5a0a * Adjust isFeature to canConfigFeature. 2022-11-11 07:28:46 +00:00
wangyuting aed53849d1 * Finish task #75248. 2022-11-09 02:10:29 +00:00
wangyuting2 0cefde5d28 * Optimize code for review code. 2022-11-04 06:35:21 +00:00
daitingting 53b1eabf0e * Return empty string when the time is empty. 2022-06-06 07:46:12 +00:00
zhujinyong b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
Yurun c19e44c044 Fix die naming compatibility 2021-12-21 14:25:53 +08:00
Yurun 2ca28f589f Add EndResponseException and helper::die() 2021-12-21 09:47:31 +08:00
王怡栋 7dd4586d46 * adjust for api. 2021-11-12 13:51:26 +08:00
王怡栋 9b51c138dc * adjust for multilingual api. 2021-11-09 08:47:24 +08:00
zhujinyong d3922df5a9 * Recovery file upload. 2021-04-27 16:56:44 +08:00
zhujinyong cf24126d5b * Wrap move_uploaded_file function. 2021-04-22 17:23:14 +08:00
wangyidong f27516a1a5 * adjust for newest xuanxuan. 2019-11-29 08:27:10 +08:00
Yagami 2433ce4b44 * Finish task #6382. 2019-10-08 14:34:42 +08:00
wangyidong 003f68c25d * adjust for convertEncoding. 2019-09-19 14:20:48 +08:00
滔哥 c8a78acbb9 * Fix bug for php7.2. 2018-08-08 19:29:51 +08:00
wangyidong 505932a672 * fix for session error. 2018-07-11 14:30:51 +08:00
wangyidong ad797236c4 * change for zui css. 2018-03-06 13:59:40 +08:00
wangyidong 816e5d1ff9 * adjust for ui. 2018-03-05 09:57:32 +08:00
滔哥 70f18180d2 * Task#3576 2018-01-10 08:33:18 +08:00
滔哥 371b945d32 framework 2017-10-20 15:49:07 +08:00
滔哥 984f3940c9 change .gitignore 2017-10-20 14:31:55 +08:00
lvtao320 303ad1cb7d Update helper.class.php 2017-10-20 14:26:43 +08:00
滔哥 129834b30f * childTask and multiTask 2017-10-20 13:50:48 +08:00
wangyidong ded7a07ad7 * adjust for oa. 2017-09-04 14:46:02 +08:00
wangyidong a37df65bc8 * mereg zentaophp framework to zentao. 2017-06-09 17:06:18 +08:00
wangyidong 7d42927406 * adjust for convertEncoding. 2017-01-16 10:45:57 +08:00
wangyidong 4b929ab7ae * adjust for convert encoding. 2016-12-09 11:54:16 +08:00
wangyidong 985e18282f * fix for jsonEncode4Parse in php5.3. 2016-07-11 09:39:18 +08:00
wangyidong 90f6005bc4 * adjust for php5.2 json_encode. 2016-07-11 09:21:04 +08:00
wangyidong 6a280b79e2 * json encode for parseJSON. 2016-06-28 14:15:54 +08:00