Commit Graph

706 Commits

Author SHA1 Message Date
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
songchenxuan
3ede5cca11 * Fix api helper bug. 2022-03-31 16:30:00 +08:00
孙广明
2b1b3b1733 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #20939.

See merge request easycorp/zentaopms!2619
2022-03-30 06:03:01 +00:00
liyuchun
cd9b896e71 * Fix bug #18316. 2022-03-29 17:30:47 +08:00
caoyanyi
4e1c4c0249 * Add return for file upload size. 2022-03-29 14:36:29 +08:00
caoyanyi
258e8040c5 * Adjust code. 2022-03-24 09:03:37 +08:00
caoyanyi
e2ba478233 * Modify config get. 2022-03-24 09:02:00 +08:00
caoyanyi
63ab9c8de3 * Add config return. 2022-03-23 16:20:21 +08:00
孙广明
0c79df3fb6 Merge branch 'wyd_fixbug' into 'master'
Wyd fixbug

See merge request easycorp/zentaopms!2461
2022-03-23 00:53:36 +00:00
王怡栋
792501cf85 Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51347,#51307

See merge request easycorp/zentaopms!2429
2022-03-22 03:09:56 +00:00
Zongjun Lan
4d7ee95c09 * fix task #51347,#51307 2022-03-22 10:56:21 +08:00
朱金勇
ec7c5022c8 Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
#   module/execution/control.php
2022-03-21 06:12:21 +00:00
王怡栋
7e0a6e8b11 * fix bug #19267. 2022-03-17 09:41:28 +08:00
孙广明
d058c26177 * Remove unused code. 2022-03-16 15:48:03 +08:00
王怡栋
55beac7f83 * fix bug #20581. 2022-03-10 16:31:46 +08:00
songchenxuan
5118abeaf9 *Fix API bug. 2022-03-09 14:41:01 +08:00
zhengrunyu
2a6f7cbc4b *fix api. 2022-03-08 13:56:26 +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
孙广明
f76d93b889 Merge branch 'sprint/187_hufangzhou_20439' into 'master'
* Fix bug #20439.

See merge request easycorp/zentaopms!2125
2022-03-08 00:53:24 +00: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
24305ecd66 * Fix bug #20439. 2022-03-07 17:49:16 +08:00