Commit Graph

1761 Commits

Author SHA1 Message Date
李玉春
214f0a767e Merge branch 'sprint/170' into 'sprint/170_tianshujie_issue'
# Conflicts:
#   module/testcase/control.php
#   module/testcase/view/create.html.php
2021-11-19 07:36:48 +00:00
tianshujie
3d09288eca * Modify the code. 2021-11-19 15:33:19 +08:00
李玉春
51e7f68851 Merge branch 'sprint/170_mayue_modify_style' into 'sprint/170'
* Modify style.

See merge request easycorp/zentaopms!555
2021-11-19 07:14:27 +00:00
mayue
9828fa18f0 * Modify style. 2021-11-19 14:59:56 +08:00
tianshujie
256c76c0b8 * Modify code logic. 2021-11-19 11:40:58 +08:00
tianshujie
53a34f1546 * Modify the code. 2021-11-19 11:27:36 +08:00
tianshujie
3045b1a234 * Fix the scope of the products listed in the edit case. 2021-11-19 10:54:18 +08:00
李玉春
7e24f57dad Merge branch 'sprint/170' into 'sprint/170_songchenxuan_16417'
# Conflicts:
#   module/testcase/control.php
2021-11-19 02:25:07 +00:00
songchenxuan
269633eb6d * Fix bug 16417. 2021-11-19 10:23:44 +08:00
mayue
926e2e853d * Fix bug #16407. 2021-11-19 09:59:01 +08:00
tianshujie
f033e37924 * Modify the product range of a single creation use case. 2021-11-19 09:32:00 +08:00
songchenxuan
5e49c845e6 * Fix bug 16417 2021-11-19 09:02:21 +08:00
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
李玉春
40b0b05a3e Merge branch 'sprint/170_mayue_16407' into 'sprint/170'
* Fix bug #16407.

See merge request easycorp/zentaopms!525
2021-11-18 09:33:43 +00:00
mayue
1d9fc9d476 * Fix bug #16407. 2021-11-18 17:26:27 +08:00
mayue
d03b905ffd * Fix bug #16407. 2021-11-18 16:30:07 +08:00
mayue
940e79bf1f * Fix bug #16406. 2021-11-18 16:08:28 +08:00
mayue
8bf4523777 * Fix bug #16407. 2021-11-18 16:03:19 +08:00
王怡栋
27bd5770b1 * code for task #44332. 2021-11-18 16:03:06 +08: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
tianshujie
22fdf1f0fc * Modify code. 2021-11-18 14:48:21 +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
mayue
a0efdf92a8 * Fix bug #16333. 2021-11-18 09:58:40 +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
tianshujie
79fa075854 * Scope of repair stories. 2021-11-17 17:25:59 +08:00
tianshujie
27d509df08 * Finish task #44496. 2021-11-17 16:28:30 +08:00
tianshujie
859327d7a3 * Modify the logic of loading stories when creating use cases in batches. 2021-11-17 14:50:42 +08: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
8cce5342f4 * Finish task #44493,44494. 2021-11-17 09:35:30 +08:00
mayue
8b8c4fe180 * Finish task #44493,44494. 2021-11-17 09:30:34 +08:00
mayue
65ef0c6f1b * Finish task #44493,44494. 2021-11-17 08:41:04 +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
tianshujie
fdfadb7940 * Modify the wrong parameter. 2021-11-16 15:15:14 +08:00
tianshujie
d268587e8d * Finish task #44496. 2021-11-16 15:07:18 +08:00
songchenxuan
f495a6cb62 * Finish task 44492 2021-11-16 14:46:14 +08:00
xieqiyu
cce14cef80 * Fix bug#16188. 2021-11-14 10:47:12 +08:00
hufangzhou
8352d145f5 * Deal with the branch is empty. 2021-11-12 15:22:47 +08:00
hufangzhou
7d9793eaa3 * Modify the get by search. 2021-11-11 11:29:54 +08:00
hufangzhou
8e9f8b860e * Fix bug #16092. 2021-11-11 11:07:23 +08:00
zhujinyong
37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
李玉春
b9bdc8a517 Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.

See merge request easycorp/zentaopms!356
2021-11-09 01:49:16 +00:00
mayue
cafb5d08a8 * Fix bug #15688. 2021-11-09 09:47:10 +08:00
mayue
6c23d4a336 * Fix bug #15688. 2021-11-09 09:37:33 +08:00
李玉春
7e1412258c Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.

See merge request easycorp/zentaopms!339
2021-11-08 07:06:48 +00:00
mayue
b305831daf * Fix bug #15688. 2021-11-08 15:04:55 +08:00
李玉春
261d027273 Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.

See merge request easycorp/zentaopms!336
2021-11-08 06:40:53 +00:00