Commit Graph

358 Commits

Author SHA1 Message Date
tianshujie
deeced3e14 * Fix bug #21307. 2022-03-31 16:04:41 +08:00
tianshujie
b1bb3b7400 * Fix bug #21300. 2022-03-31 15:15:24 +08:00
孙广明
e2c29e7854 Merge branch 'sprint/master_zhouxudong_18270' into 'master'
Sprint/master zhouxudong 18270

See merge request easycorp/zentaopms!2654
2022-03-31 03:08:33 +00:00
孙广明
36244ef5a2 Merge branch 'fixbugs_zhouxin_20813' into 'master'
* Fix bug #20813.

See merge request easycorp/zentaopms!2646
2022-03-30 09:14:08 +00:00
王怡栋
08e3b0e29d Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
#   module/execution/model.php
2022-03-30 08:01:18 +00:00
tanghucheng
19e6390ed7 * Fix bug #20890. 2022-03-30 15:16:52 +08:00
zhouxin
2280c483ad * Fix bug #20813. 2022-03-30 05:30:10 +00:00
孙广明
3a808fc514 Merge branch 'fixbugs_zhouxin_17322' into 'master'
Fixbugs zhouxin 17322

See merge request easycorp/zentaopms!2631
2022-03-30 05:12:36 +00:00
zhouxin
a8d3ff2801 * Fix bug #17322. 2022-03-30 05:11:32 +00:00
zhouxudong
c7e76c1176 * Fix bug #18270. 2022-03-30 13:05:59 +08:00
zhouxin
5cfff22e5a * Fix bug #21131. 2022-03-30 03:27:30 +00:00
zhouxin
1d21f7f62d * Fix bug #17322. 2022-03-30 03:23:48 +00:00
xieqiyu
f418c9b954 * Fix bug#21283. 2022-03-30 11:10:49 +08:00
zhouxudong
3e70b88210 * Fix bug #18270. 2022-03-29 14:49:01 +08:00
sunjun
a2e9c28f6e *Fixbug #21258 2022-03-29 11:12:02 +08:00
李玉春
9b388cc312 Merge branch 'fixbug_sunjun_13852' into 'master'
Fixbug sunjun 13852

See merge request easycorp/zentaopms!2576
2022-03-29 00:50:37 +00:00
sunjun
b411be89ec *Fixbug #13852 2022-03-29 08:44:48 +08:00
sunjun
0ce312f107 *Fixbug #13852 2022-03-28 17:02:25 +08:00
sunjun
79016f3bf7 *Fixbug #13852 2022-03-28 10:00:29 +08:00
mayue
f184873bca * Fix bug #17402. 2022-03-25 13:45:28 +08:00
孙广明
e4189b329c * Fix whitelist bug. 2022-03-25 10:21:50 +08:00
sunjun
43bfd5a4c1 *Fixbug 21115 2022-03-24 16:52:03 +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
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
liumengyi
441200128a * Add auto test of bug. 2022-03-21 14:29:19 +08:00
孙广明
d9505fa9fa Merge branch 'pailei2_zhouxin_50796' into 'pailei2'
Pailei2 zhouxin 50796

See merge request easycorp/zentaopms!2341
2022-03-18 03:25:54 +00:00
zhouxin
a0956b72d5 Adjust code. 2022-03-17 08:31:48 +00:00
zhouxin
332847783c Adjust code. 2022-03-17 08:29:16 +00:00
zhouxin
f0c4327371 Adjust code. 2022-03-17 08:22:09 +00:00
zhouxin
78263786ed Move getError from controller to model. 2022-03-17 07:50:54 +00:00
zhouxin
9062870343 Fix bug #18766. 2022-03-17 06:48:33 +00:00
zhouxin
109d4049e0 Add errorBegin and errorEnd for batchUpdate of stage. 2022-03-17 06:00:58 +00:00
xieqiyu
00a8efaf80 * Fix bug#18756. 2022-03-17 13:37:20 +08:00
王怡栋
5117bf7541 * fix bug #15347,15345. 2022-03-17 11:26:01 +08:00
zhouxin
cc9fad8baa Fix bug #18766. 2022-03-16 08:41:31 +00:00
xieqiyu
96fc77e620 * Fix bug#17363. 2022-03-14 16:36:30 +08:00
sunjun
f105fc944f fixbug #50421 2022-03-14 11:20:34 +08:00
sunjun
9621a762f1 fixbug #50431 2022-03-14 11:05:55 +08:00
sunjun
8269e9229a fixbug #50431 2022-03-14 10:38:45 +08:00
孙广明
4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
xieqiyu
4ba238cd27 * Modify review code. 2022-03-09 14:36:50 +08:00
xieqiyu
b68d3dda7e * Add selected lane when batch create story in kanban. 2022-03-08 21:14:06 +08:00
tianshujie
5b2b646db3 * Fix bug #20328. 2022-03-04 16:29:56 +08:00
tianshujie
b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
zhujinyong
5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
zhouxudong
090905f628 Fix bug #19424. 2022-02-14 08:42:51 +08:00
孙广明
9748e70a31 * Fix bug #19356. 2022-02-10 09:37:34 +08:00
tianshujie
7001f6c2d5 * Fix bug #18838. 2022-01-25 11:16:14 +08:00
liumengyi
b6b895bb87 * Modify how the creator is appended to team members. 2022-01-24 17:20:38 +08:00