Commit Graph

2518 Commits

Author SHA1 Message Date
daitingting
e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting
96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
hufangzhou
90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
王怡栋
a0c13f4d80 Merge branch 'fixbug' into 'master'
* Fix bug #22025,22028.

See merge request easycorp/zentaopms!3181
2022-04-28 08:46:46 +00:00
李玉春
e6c646f6bd Merge branch 'sprint/fixbug_liumengyi_2441' into 'master'
* Fix bug #2441.

See merge request easycorp/zentaopms!3198
2022-04-28 08:26:06 +00:00
liumengyi
2780f01d00 * Fix bug #2441. 2022-04-28 16:21:37 +08:00
mayue
3d55d30a92 * Optimize code. 2022-04-28 07:54:22 +00:00
mayue
94c3a3a270 * Fix bug #10878. 2022-04-28 07:50:01 +00:00
tanghucheng
c04c165276 * Fix bug #21429. 2022-04-28 13:50:48 +08:00
sunjun
c2d9f7b240 *Fixbug_sunjun_22007 2022-04-28 02:48:11 +00:00
sunjun
0495a32a20 *Fixbug_sunjun_22007 2022-04-27 07:59:37 +00:00
zhouxudong
5c09cedfe9 * Fix bug #22022. 2022-04-27 01:11:34 +00:00
mayue
18b70b3208 * Fix bug #10878. 2022-04-26 09:18:13 +00:00
孙广明
8010daa536 Merge branch 'sprint/master_zhouxudong_15338' into 'master'
* Fix bug #15338.

See merge request easycorp/zentaopms!3140
2022-04-26 09:12:31 +00:00
zhouxudong
9851bc1047 * Fix bug #15338. 2022-04-26 09:10:29 +00:00
zhouxudong
a55f5f9df6 * Fix bug #15338. 2022-04-26 09:03:06 +00:00
李玉春
fe221fec43 Merge branch 'bug_21982' into 'master'
Fix bug#21982,21983,21981

See merge request easycorp/zentaopms!3122
2022-04-26 08:09:06 +00:00
孙广明
f1551c78d0 Merge branch 'api_zry' into 'master'
* Fix bug when create task and story error.

See merge request easycorp/zentaopms!3134
2022-04-26 07:20:18 +00:00
zhengrunyu
2633b5c23c * Fix bug when create task and story error. 2022-04-26 15:14:22 +08:00
zenggang
9e1f09d37a * Fix bug#21982,21983 2022-04-26 03:25:12 +00:00
孙广明
37733991df Merge branch 'fixbug_21140' into 'master'
*Fixbug_21140

See merge request easycorp/zentaopms!3107
2022-04-25 06:42:26 +00:00
sunjun
1cf2e5e541 *Fixbug_21140 2022-04-25 13:10:55 +08:00
wangyidong
0705daa805 * adjust for performance issue. 2022-04-25 08:55:03 +08:00
王怡栋
1b25be3932 Merge branch 'master_xieqiyu_21947' into 'master'
* Fix bug#21947.

See merge request easycorp/zentaopms!3092
2022-04-24 06:42:36 +00:00
xieqiyu
3a533b72c9 * Fix bug#21947. 2022-04-24 09:48:31 +08:00
caoyanyi
b8c0f822d9 * Add response data. 2022-04-22 05:38:48 +00:00
孙广明
c37e1ef5b6 Merge branch 'fixbug_21140' into 'master'
*Fixbug_21140

See merge request easycorp/zentaopms!3069
2022-04-22 00:50:58 +00:00
sunjun
cce29cd63c *Fixbug_21140 2022-04-22 08:48:03 +08:00
孙广明
e4295fdbe5 * Code for workflow bug. 2022-04-21 10:40:56 +08:00
孙广明
7fb3a62058 * Fix workflow bug. 2022-04-21 10:24:25 +08:00
孙广明
e4738c50ea * Add required to workflow field. 2022-04-20 13:08:20 +08:00
孙广明
313e39712c * Fix workflow bug. 2022-04-20 10:17:16 +08:00
tanghucheng
c96f215ad5 * Fix bug #1780. 2022-04-15 08:08:48 +08:00
zhouxudong
95f8bfa4ee * Fix bug #12358. 2022-04-14 10:13:56 +08:00
王怡栋
a8983445c8 Merge branch 'master' into 'sprint/master_zhouxudong_17994'
# Conflicts:
#   module/bug/model.php
#   module/task/model.php
2022-04-13 07:52:03 +00:00
王怡栋
c273c3aefe Merge branch 'sprint/master_zhouxudong_21700' into 'master'
* Fix bug #21700.

See merge request easycorp/zentaopms!2904
2022-04-13 07:19:18 +00:00
zhouxudong
dcdbf60bdf * Fix bug #17994. 2022-04-13 11:07:22 +08:00
zhouxudong
37337bdb68 * Fix bug #17994. 2022-04-13 10:59:25 +08:00
tanghucheng
0c2c898c01 * Fix bug #21576. 2022-04-13 10:46:44 +08:00
zhouxudong
7ac526401d * Fix bug #21700. 2022-04-13 10:08:53 +08:00
zhouxudong
1dd4af6ff3 * Fix bug #17994. 2022-04-13 09:26:20 +08:00
zhouxudong
233a035b12 * Fix bug #17994. 2022-04-12 17:23:24 +08:00
zhouxudong
8baef621d2 * Fix bug #17994. 2022-04-12 16:50:56 +08:00
孙广明
bccf6e5248 Merge branch 'master_xieqiyu_18080' into 'master'
* Fix bug#18080.

See merge request easycorp/zentaopms!2837
2022-04-11 09:24:46 +00:00
xieqiyu
a60f498ea8 * Modify review code. 2022-04-11 17:23:59 +08:00
李玉春
ecf6797cb2 Merge branch 'sprint/master_zhouxudong_15146' into 'master'
Sprint/master zhouxudong 15146

See merge request easycorp/zentaopms!2855
2022-04-11 06:14:39 +00:00
周旭东
36e1809e7c Update control.php 2022-04-11 06:11:03 +00:00
xieqiyu
93cb0c08bf * Fix bug#15146. 2022-04-11 14:07:49 +08:00
zhouxudong
5e5f3c50d1 * Fix bug #15146. 2022-04-11 09:50:59 +08:00
xieqiyu
ee5d43bea9 * Fix bug#18080. 2022-04-11 08:53:28 +08:00