Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
46,127 Commits 2 Branches 292 Tags
38af20255bc6c56fe6cd49335b15cbc3eb759833
Commit Graph
786 Commits
Author SHA1 Message Date
王 于听 59d85868b5 Merge branch 'sprint/zentaopms240_wangyuting' into 'sprint/zentaopms240' 
* Fix bug in review code.

See merge request easycorp/zentaopms!5612
 2022-09-29 05:51:04 +00:00
wangyuting2 d33cc87da9 * Fix bug in review code. 2022-09-29 05:50:16 +00:00
wangyidong 9c83ba7cae Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240 2022-09-29 09:50:49 +08:00
wangyidong 1e928ed625 * code for task #70541. 2022-09-29 09:50:11 +08:00
daitingting 63f84968b7 * Finish task #70546. 2022-09-28 07:17:52 +00:00
wangyuting2 ef6a569f2e * Add disabledFeatures config. 2022-09-27 07:38:49 +00:00
wangyidong fd623cb0c4 * adjust for code ajax send. 2022-09-27 15:18:51 +08:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
daitingting fe13c4de38 * Doing task #69253. 2022-09-16 01:02:13 +00:00
wangyidong d859327126 * fix bug #26951. 2022-08-29 09:17:51 +08:00
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
liumengyi a54d9168bb * Fix bug for task #64967. 2022-08-22 14:49:04 +08:00
liumengyi 67151d4595 * Fix bug for task #64967. 2022-08-22 14:43:18 +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
wangyuting2 964e64efe1 * Finish task #63892. 2022-08-10 14:14:56 +08:00
王怡栋 9e6111ad6c Merge branch 'master' into 'sprint/devplat_30' 
# Conflicts:
#   db/update17.4.sql
 2022-08-08 08:44:25 +00:00
daitingting ebfbc9df97 * Fix bug #26016. 2022-08-05 03:27:07 +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
daitingting 8709c1a5ea * Finish task #62921. 2022-08-03 06:19:09 +00: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
宋辰轩 f82626dfab * Fix api bug. 2022-07-21 17:05:38 +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
daitingting e06b64e997 * Add fetchModule to distinguish rawModule. 2022-07-06 08:42:21 +00: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
wangyidong 9a586dbbb6 * adjust bug for flow. 2022-06-17 09:11:44 +08:00
zenggang ea2280da59 * Adjust code 2022-06-14 06:56:01 +00:00
zenggang cc49cbe439 * Finish task#57156 2022-06-14 06:03:55 +00:00
tanghucheng 72d05c14df * Fix bug #23228. 2022-06-09 16:40:16 +08:00
wangyidong f9a14f40d4 * adjust for task #56614. 2022-06-09 13:50:18 +08:00
wangyidong 5147feb289 * adjust for set flow uri. 2022-06-09 11:32:47 +08:00
tanghucheng 841c52b556 * Fix bug #23433. 2022-06-09 09:31:12 +08:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
daitingting 53b1eabf0e * Return empty string when the time is empty. 2022-06-06 07:46:12 +00:00
wangyuting2 2c4c1a4779 * Finish task #12469. 2022-06-02 16:10:04 +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
zhujinyong 632c0a569c * Fix array type. 2022-05-24 09:15:44 +08:00