Commit Graph
740 Commits
Author SHA1 Message Date
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
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
daitingting cd6698cc9b * Add relations params for buildActionMenu. 2022-05-18 07:38:45 +00: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
lanzongjun 6e0e9d2348 * fix bug #22570 2022-05-18 08:43:08 +08:00
lanzongjun 10eebbd136 * fix bug #22570 2022-05-17 17:13:17 +08:00
tanghucheng d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
王怡栋 93e5d9e108 Merge branch 'sprint/wangyuting_workflow' into 'master'
* Fix print extend fields bug.

See merge request easycorp/zentaopms!3362
2022-05-12 07:59:55 +00:00
wangyidong 450a61cf12 * fix bug #22415. 2022-05-12 15:52:24 +08:00
wangyuting2 58c08b95a6 * Fix print extend fields bug. 2022-05-12 14:10:10 +08:00
wangyuting2 d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
daitingting 0fba3427af * Build operate menu for productplan module. 2022-05-11 01:39:53 +00:00
王怡栋 d9d331c38e Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
#   framework/control.class.php
2022-05-10 08:46:32 +00:00
wangyuting2 bcf64c0c54 * Optimize code. 2022-05-10 16:41:36 +08:00
wangyuting2 248683c67d * Merge code. 2022-05-10 16:36:06 +08:00
wangyuting2 fe3c882c5e * Adjust buildin workflow menu. 2022-05-10 16:32:04 +08:00
朱金勇 e431b802f4 Merge branch 'zentaocloud/dingguodong' into 'master'
* Add codes for saas extension.

See merge request easycorp/zentaopms!3303
2022-05-10 07:44:31 +00:00
daitingting deb8d170a7 * Build operate menu for product. 2022-05-10 05:44:25 +00:00
dingguodong 39b77f36b6 * Add codes for saas extension. 2022-05-10 13:24:06 +08:00
wangyuting2 dceb7ba183 * Optimize code. 2022-05-09 17:09:24 +08:00
daitingting d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
wangyuting2 a607161591 * Finish task #53549. 2022-05-09 17:00:41 +08:00
wangyuting2 103f3a21c6 * Adjust return value. 2022-05-09 16:18:12 +08:00
wangyuting2 e86f32df24 * Adjust feedback menu. 2022-05-09 15:58:02 +08:00
wangyuting2 cc57fc819a * Add buildOperateMenu for bug module. 2022-05-09 11:16:14 +08:00
wangyuting2 45ae4de775 * Do task 53548. 2022-05-09 09:20:01 +08:00
wangyuting2 d29cf03d41 * Merge lib dao code. 2022-05-07 13:11:44 +08:00
wangyuting2 3d4374964a * Merge zdoo framework. 2022-05-07 09:52:16 +08:00
daitingting 59b1e62590 * Update setFlowURI and mergeParams function according to zdoo. 2022-05-06 07:36:11 +00: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 2d82ad3e79 * fix bug. 2022-04-27 10:33:03 +08:00
wangyidong 899c123dac * code for bug #19303. 2022-04-27 09:37:01 +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
王怡栋 f52e4a8a82 * code for bug #18161. 2022-04-12 14:21:07 +08:00
songchenxuan 0654bcc2ad * Fix api format data bug. 2022-04-08 16:03:03 +08:00
李玉春 46a965b02b Merge branch 'cyy_bug_14928' into 'master'
* Fix bug #14928.

See merge request easycorp/zentaopms!2662
2022-04-02 06:05:51 +00:00
xieqiyu 964e484f09 * Fix bug#21382. 2022-04-01 14:47:00 +08:00
caoyanyi 2fcabdfc3f * Modify api function for createLink. 2022-03-31 17:08:28 +08:00