Commit Graph

586 Commits

Author SHA1 Message Date
李玉春
fd0fb325fa Merge branch 'sprint/174_songchenxuan_16967' into 'master'
Sprint/174 songchenxuan 16967

See merge request easycorp/zentaopms!713
2021-12-02 00:34:22 +00:00
songchenxuan
97b2e63ea0 * Fix bug #16967. 2021-12-02 08:14:58 +08:00
tianshujie
92ad301e29 * Fix bug #16988. 2021-12-01 17:16:52 +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
李玉春
950c567912 Merge branch 'sprint/174_xieqiyu_45079' into 'master'
Finish task #44992, task #44991, task #44990.

See merge request easycorp/zentaopms!687
2021-12-01 05:23:04 +00:00
李玉春
171796e08f Merge branch 'sprint/174_songchenxuan_16953' into 'master'
* Fix bug #16953.

See merge request easycorp/zentaopms!694
2021-12-01 05:13:53 +00:00
李玉春
55166d5409 Merge branch 'sprint/174_tianshujie_45029' into 'master'
* Fix bug #45029.

See merge request easycorp/zentaopms!685
2021-12-01 03:35:46 +00:00
xieqiyu
a0efc7aab9 * Fix bug. 2021-12-01 11:30:22 +08:00
mayue
9a7bd2a6fc * Fix bug #16682. 2021-12-01 11:19:28 +08: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
tianshujie
34e9e02ae7 * Fix bug #45029. 2021-12-01 09:31:11 +08:00
xieqiyu
d0afac5593 * Fix bug for batch edit story and bug in project. 2021-11-30 17:10:12 +08:00
李玉春
dbc186a0c4 Merge branch 'master' into 'sprint/174_xieqiyu_45080'
# Conflicts:
#   module/story/control.php
#   module/story/view/header.html.php
#   module/testcase/control.php
2021-11-30 07:44:47 +00:00
xieqiyu
888fbfe73b * Code for task#45080. 2021-11-30 15:05:16 +08:00
songchenxuan
b0ad71231c * Finish task #45028. 2021-11-30 11:31:27 +08:00
songchenxuan
c5deb3e68d * Finish task #45028. 2021-11-30 10:57:49 +08:00
李玉春
80b3bcf938 Merge branch 'sprint/174_songchenxuan_fix_importfromlib_bug' into 'master'
* Fix bug testcase_importfromlib.

See merge request easycorp/zentaopms!645
2021-11-29 09:36:36 +00:00
songchenxuan
76e0a170f0 * Finish task #45028. 2021-11-29 17:30:52 +08:00
李玉春
a99419f0c5 Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
2021-11-29 08:03:38 +00:00
孙广明
8d9fb81d9d Merge branch 'master' into 'sprint/174_hufangzhou_45085'
# Conflicts:
#   module/story/model.php
2021-11-29 07:26:45 +00:00
songchenxuan
28eaf804d4 * Fix bug testcase_importfromlib. 2021-11-29 14:30:50 +08:00
tianshujie
96a46aa2ca * Modify the code. 2021-11-29 14:16:10 +08:00
hufangzhou
0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +08:00
tianshujie
0690823866 * Finish task #45030. 2021-11-27 18:58:33 +08:00
songchenxuan
eebabad646 * Fix task 45028. 2021-11-26 17:34:19 +08:00
songchenxuan
bc13a23d1e * Finish task #45050. 2021-11-26 14:58:39 +08:00
mayue
f92ba845a3 * Fix bug #16605. 2021-11-25 14:35:33 +08:00
mayue
1cf28e1120 * Fix bug #16605. 2021-11-25 13:20:54 +08:00
tianshujie
d8d277842b * Fix bug #16549. 2021-11-23 17:38:43 +08:00
tianshujie
23f78928dd * Modify the code. 2021-11-22 14:28:13 +08:00
tianshujie
c2ac079bbb * Modify the case module problem. 2021-11-22 14:01:02 +08:00
hufangzhou
5492d27798 * Fix bug #16512. 2021-11-22 13:46:02 +08:00
李玉春
d272f1e392 Merge branch 'sprint/173_xieqiyu_16479' into 'sprint/170'
* Fix bug#16479.

See merge request easycorp/zentaopms!564
2021-11-22 05:04:14 +00:00
xieqiyu
0669e7385b * Fix bug#16519. 2021-11-22 12:33:27 +08:00
tianshujie
c5de287171 * Fix bug #16502. 2021-11-22 09:32:13 +08:00
tianshujie
47a651b599 * Deal with the scope of the product when creating and editing bugs. 2021-11-19 19:21:34 +08:00
李玉春
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
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