李玉春
|
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
|
70d8039750
|
* Add comment.
|
2021-11-30 15:31:10 +08:00 |
|
xieqiyu
|
888fbfe73b
|
* Code for task#45080.
|
2021-11-30 15:05:16 +08:00 |
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
李玉春
|
c30c1466d0
|
Merge branch 'sprint/174_songchenxuan_45028' into 'master'
* Finish task #45028.
See merge request easycorp/zentaopms!662
|
2021-11-30 05:19:03 +00:00 |
|
李玉春
|
4b223ec01b
|
Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.
See merge request easycorp/zentaopms!657
|
2021-11-30 05:02:41 +00: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 |
|
hufangzhou
|
883f87a19c
|
* Remove the unused code.
|
2021-11-29 15:24:46 +08:00 |
|
mayue
|
a77510b311
|
* Finish task #44987,44988,44989.
|
2021-11-29 15:11:16 +08: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
|
5d6909d347
|
* Finish task #45050.
|
2021-11-26 15:20:05 +08:00 |
|
songchenxuan
|
bc13a23d1e
|
* Finish task #45050.
|
2021-11-26 14:58:39 +08:00 |
|
王怡栋
|
1ac64ab4c1
|
* code for task #44939.
|
2021-11-26 11:26:27 +08:00 |
|
朱金勇
|
293a375ec8
|
Merge branch 'sprint/174_mayue_16605' into 'master'
Fix bug #16605.
See merge request easycorp/zentaopms!616
|
2021-11-25 06:45:58 +00: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 |
|
王怡栋
|
9a80f35962
|
Merge branch 'sprint/app10'
|
2021-11-25 10:25:05 +08:00 |
|
xieqiyu
|
15867e4fd3
|
* Fix bug#16638.
|
2021-11-23 19:05:34 +08:00 |
|
zhengrunyu
|
16873a8154
|
*Finish task #16619.
|
2021-11-23 17:50:26 +08:00 |
|
tianshujie
|
d8d277842b
|
* Fix bug #16549.
|
2021-11-23 17:38:43 +08:00 |
|
王怡栋
|
0e6e41d003
|
* fix bug for get needconfirm case.
|
2021-11-22 15:21:43 +08:00 |
|
孙广明
|
87ab1ecc76
|
Merge branch 'sprint/170_zhengrunyu_16529' into 'sprint/170'
*Finish task #16529.
See merge request easycorp/zentaopms!587
|
2021-11-22 07:12:13 +00:00 |
|
zhengrunyu
|
995ca51b88
|
*Finish task #16529.
|
2021-11-22 15:06:52 +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 |
|
李玉春
|
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
|
fb6ce99d18
|
* Fix bug #16490.
|
2021-11-21 09:34:14 +08:00 |
|
xieqiyu
|
2a18aba808
|
* Display branch when batch edit testcase.
|
2021-11-21 03:38:48 +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 |
|
李玉春
|
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 |
|