Commit Graph

690 Commits

Author SHA1 Message Date
李玉春
befdfa2eb4 Merge branch 'sprint/174_tianshujie_16927' into 'master'
* Fix bug #16927.

See merge request easycorp/zentaopms!730
2021-12-02 07:39:36 +00:00
songchenxuan
febde653ad * Fix bug #16872. 2021-12-02 13:06:03 +08:00
tianshujie
4ac099088e * Fix bug #16927. 2021-12-02 11:01:06 +08:00
mayue
07f8a820b0 * Code format #16987. 2021-12-02 09:28:02 +08:00
mayue
63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08:00
李玉春
686d773f0b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!692
2021-12-01 05:23:47 +00:00
songchenxuan
1261ac3edb * Fix bug #16953. 2021-12-01 11:11:11 +08:00
songchenxuan
1bb80cb5b3 * Fix bug #16953. 2021-12-01 11:02:31 +08:00
mayue
c62d599292 * Finish task #44987,44988,44989. 2021-12-01 10:44:38 +08:00
xieqiyu
d0afac5593 * Fix bug for batch edit story and bug in project. 2021-11-30 17:10:12 +08:00
李玉春
a4426db6f0 Merge branch 'sprint/174_tianshujie_45081' into 'master'
* Fix bug #16939 and modify the scope of the plan when editing bugs.

See merge request easycorp/zentaopms!672
2021-11-30 06:45:48 +00:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
tianshujie
508d7d78bf * Fix bug #16939 and modify the scope of the plan when editing bugs. 2021-11-30 14:14:14 +08:00
tianshujie
8f1a017225 * Modify the code. 2021-11-22 14:14:17 +08:00
tianshujie
69842996d6 * Fix bug #16533. 2021-11-22 13:45:44 +08:00
tianshujie
a1c59d2ca0 * Fix bug #16528. 2021-11-22 11:23:09 +08:00
liumengyi
3836941efd * Fix Bug #16505. 2021-11-22 10:26:45 +08:00
李玉春
8e7c536a8d Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
Modify the branch scope when creating and editing bugs.

See merge request easycorp/zentaopms!560
2021-11-22 01:00:45 +00:00
tianshujie
46ac0a5e88 * Modify the code. 2021-11-22 08:59:40 +08:00
tianshujie
0408f2f8ce * Modify the execution scope of creating and editing bugs. 2021-11-21 10:46:35 +08:00
xieqiyu
d91735a9b2 * Fix bug#16465. 2021-11-21 02:13:19 +08:00
tianshujie
47a651b599 * Deal with the scope of the product when creating and editing bugs. 2021-11-19 19:21:34 +08:00
李玉春
dc8dc55534 Merge branch 'sprint/170_mayue_16406' into 'sprint/170'
* Fix bug #16406.

See merge request easycorp/zentaopms!528
2021-11-18 09:29:29 +00:00
mayue
bff4aebfd4 * Fix bug #16406. 2021-11-18 17:24:00 +08:00
mayue
3a48a57047 * Fix bug #16406. 2021-11-18 16:42:27 +08:00
tianshujie
9c6c4dfc9c * Fix bug #16429. 2021-11-18 16:30:45 +08:00
李玉春
12b6f58053 Merge branch 'sprint/170_songchenxuan_16377' into 'sprint/170'
Sprint/170 songchenxuan 16377

See merge request easycorp/zentaopms!514
2021-11-18 07:06:26 +00:00
songchenxuan
073deec215 * Fix bug 16377 2021-11-18 15:05:56 +08:00
李玉春
c4e9dc5a4e Merge branch 'sprint/170_zhengrunyu_BUG_16378' into 'sprint/170'
*Finish task #16378.

See merge request easycorp/zentaopms!512
2021-11-18 07:03:43 +00:00
孙广明
6085ad3089 Merge branch 'sprint/170_tianshujie_44496' into 'sprint/170'
*Finish task #44496

See merge request easycorp/zentaopms!511
2021-11-18 06:59:45 +00:00
songchenxuan
504e284d63 * Fix bug 16377. 2021-11-18 14:48:41 +08:00
songchenxuan
91c8826f45 * Fix bug 16377 2021-11-18 14:08:21 +08:00
zhengrunyu
0e51961266 *Finish task #16378. 2021-11-18 13:51:25 +08:00
tianshujie
5e473398be * Batch modify the judgment of the branch to which the bug belongs. 2021-11-18 13:49:04 +08:00
李玉春
e41ccac2b7 Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
#   module/build/view/create.html.php
#   module/project/model.php
2021-11-18 05:15:10 +00:00
xieqiyu
7d15430ab1 * Modify the review code. 2021-11-18 10:39:46 +08:00
xieqiyu
84340fa6f2 * Code for task#44497. 2021-11-17 22:57:30 +08:00
xieqiyu
47cdcd78c0 * Code for task#44497. 2021-11-17 19:30:13 +08:00
songchenxuan
59f3ac6661 * Finish task 44490 2021-11-17 17:42:10 +08:00
songchenxuan
8cd05d8301 * Finish task 44490. 2021-11-17 16:22:43 +08:00
songchenxuan
1dab48045e * Finish task 44490. 2021-11-17 15:39:30 +08:00
liumengyi
30204c1568 * Finish task #44369. 2021-11-17 14:39:37 +08:00
李玉春
293f76a1ed Merge branch 'sprint/170_songchenxuan_44601' into 'sprint/170'
* Fix bug 13756

See merge request easycorp/zentaopms!483
2021-11-17 05:25:38 +00:00
李玉春
87597eccbb Merge branch 'sprint/170_mayue_44493,44494' into 'sprint/170'
* Finish task #44493,44494.

See merge request easycorp/zentaopms!477
2021-11-17 02:33:33 +00:00
mayue
0dd5dd1955 * Finish task #44493,44494. 2021-11-17 10:27:02 +08:00
mayue
8b8c4fe180 * Finish task #44493,44494. 2021-11-17 09:30:34 +08:00
songchenxuan
4b42cb22a4 * Fix bug 13756 2021-11-17 09:26:02 +08:00
mayue
102561019d * Finish task #44493,44494. 2021-11-16 18:20:35 +08:00
mayue
7d496eebc2 * Finish task #44493,44494. 2021-11-16 17:05:03 +08:00
songchenxuan
f262ca14d1 *Finish task 44492 2021-11-16 15:23:13 +08:00