Commit Graph
280 Commits
Author SHA1 Message Date
wangyidong f18bba53af * adjust for ioncube php8.1. 2022-08-25 16:18:53 +08:00
liumengyi e1a022ba7f * Fix bug #26768. 2022-08-24 10:54:29 +08:00
wangyidong 1897a831dd * fix for php8.1 2022-08-22 17:00:23 +08:00
tianshujie 98694da2ae Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-18 16:47:14 +08:00
tianshujie 24e39026cc * Finish task #64967. 2022-08-16 17:07:27 +08:00
liyuchun 6c2cacf02c Merge branch 'master' into zenops_41 2022-08-10 08:26:42 +00:00
wangyidong aaee558b83 * code for task #62742. 2022-08-04 17:30:27 +08:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
caoyanyi 06abe97624 * Modify branch check error. 2022-08-02 15:19:08 +08:00
hufangzhou 8883ac8e77 * Finish task #62132, #62133, #62134, #62135, #62136. 2022-07-26 18:14:09 +08:00
wangyidong 7542c26998 * code for task #61483. 2022-07-20 10:58:57 +08:00
wangyidong 35c8543a74 * adjust for check account in set vision. 2022-07-11 10:08:40 +08:00
wangyidong 072945f180 * fix for tid. 2022-07-07 10:09:19 +08:00
zhujinyong 467b958ba0 * If run in container, no need check ok.txt. 2022-06-29 16:35:39 +08:00
wangyidong 549bd70626 * code for bug #24381. 2022-06-28 15:29:11 +08:00
lanzongjun 61234b500f * fix bug workflowdatasource 2022-05-31 16:07:58 +08:00
wangyidong a899fad671 * check $_SERVER['REQUEST_URI'] var. 2022-05-30 17:06:18 +08:00
liyuchun 8a008bc17a * Fix bug for cli. 2022-05-26 02:48:59 +00:00
wangyidong 2bbae04ded * adjust for tid. 2022-05-24 16:57:56 +08:00
wangyidong b072234b4d * adjust for tid. 2022-05-24 15:53:57 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
wangyidong a8531b8e58 * fix bug. 2022-05-20 10:40:45 +08:00
wangyidong e94adb7e51 * adjust for get installed version. 2022-05-20 08:33:01 +08:00
wangyidong 98df6e3ffb * adjust code for tid. 2022-05-18 13:09:40 +08:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
dingguodong 39b77f36b6 * Add codes for saas extension. 2022-05-10 13:24:06 +08:00
wangyidong 1d9f9c0e75 * code for bug #22095. 2022-04-28 17:46:41 +08:00
wangyidong d9874358fe * revert code for web extension. 2022-04-27 14:14:36 +08:00
wangyidong 5acdc8964c * fix bug #22001. 2022-04-26 10:14:04 +08:00
wangyidong f208fcea12 * fix error. 2022-04-25 15:58:32 +08:00
wangyidong 668637fc18 * adjust for web page. 2022-04-25 15:20:05 +08:00
wangyidong a08edd3336 * adjust for repo. 2022-04-22 15:29:06 +08:00
王怡栋 b9eab52620 * fix vulnerability. 2022-04-22 10:38:41 +08:00
王怡栋 4ea25a7725 * revert for setOpenApp method. 2022-04-18 14:26:23 +08:00
王怡栋 b9ebcd6944 * code for bug #21655. 2022-04-15 11:20:28 +08:00
xieqiyu 964e484f09 * Fix bug#21382. 2022-04-01 14:47:00 +08:00
caoyanyi 4e1c4c0249 * Add return for file upload size. 2022-03-29 14:36:29 +08:00
caoyanyi e2ba478233 * Modify config get. 2022-03-24 09:02:00 +08:00
王怡栋 7e0a6e8b11 * fix bug #19267. 2022-03-17 09:41:28 +08:00
王怡栋 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