孙广明
|
e24ded1429
|
Merge branch 'sprint/174_hufangzhou_17116' into 'master'
* Fix bug #17116, bug #17117.
See merge request easycorp/zentaopms!789
|
2021-12-06 05:07:38 +00:00 |
|
hufangzhou
|
05d9182e31
|
* Fix bug #17116, bug #17117.
|
2021-12-06 12:09:15 +08:00 |
|
李玉春
|
4a2d21595e
|
Merge branch 'sptint/174_xieqiyu_17079' into 'master'
* Fix bug#17079.
See merge request easycorp/zentaopms!778
|
2021-12-06 03:22:48 +00:00 |
|
孙广明
|
ad1cc7c04f
|
Merge branch 'sprint/174_hufangzhou_17077' into 'master'
* Fix bug #17077.
See merge request easycorp/zentaopms!774
|
2021-12-06 02:33:35 +00:00 |
|
xieqiyu
|
4de8fc462f
|
* Fix bug#17079.
|
2021-12-06 09:33:41 +08:00 |
|
hufangzhou
|
e1b5dd4642
|
* Add the unitcases method for remove the branch select.
|
2021-12-06 09:12:46 +08:00 |
|
liyuchun
|
5c23642d36
|
* Fix bug #16639.
|
2021-12-06 09:06:50 +08:00 |
|
hufangzhou
|
6eeaa44aa0
|
* Fix bug #17077.
|
2021-12-06 08:58:58 +08:00 |
|
mayue
|
8ba4ebf390
|
* Conflict resolution #17036.
|
2021-12-02 15:40:02 +08:00 |
|
mayue
|
f6676e2757
|
* Conflict resolution #17036.
|
2021-12-02 15:36:31 +08:00 |
|
mayue
|
8c355ac388
|
* Modify style #17036.
|
2021-12-02 15:30:23 +08:00 |
|
tianshujie
|
d33b9ae7e6
|
* Fix bug #17006,16785.
|
2021-12-02 10:11:18 +08:00 |
|
李玉春
|
d258b05fd4
|
Merge branch 'sprint/174_songchenxuan_16798' into 'master'
* Fix bug #16798.
See merge request easycorp/zentaopms!708
|
2021-12-01 06:23:41 +00:00 |
|
songchenxuan
|
98b5a77754
|
* Fix bug #16798.
|
2021-12-01 14:16:24 +08:00 |
|
tianshujie
|
ac27fd80d8
|
* Fix bug #16781.
|
2021-12-01 13:30:10 +08:00 |
|
tianshujie
|
7498352698
|
* Fix bug #16789.
|
2021-12-01 13:13:21 +08:00 |
|
xieqiyu
|
b3e9bd7e61
|
* Delete unused code.
|
2021-12-01 08:42:20 +08:00 |
|
xieqiyu
|
4c0eb137da
|
* Finish task#45004.
|
2021-11-30 19:43:49 +08:00 |
|
李玉春
|
cb03696c8a
|
Merge branch 'sprint/174_songchenxuan_45019' into 'master'
* Finish task #45019.
See merge request easycorp/zentaopms!671
|
2021-11-30 06:45:00 +00:00 |
|
songchenxuan
|
a8b2009bad
|
* Finish task #45019.
|
2021-11-30 14:00:37 +08:00 |
|
tianshujie
|
2a469dc6f7
|
* Modify use case branch query conditions.
|
2021-11-30 11:17:10 +08:00 |
|
tianshujie
|
d2f57affa6
|
* Finish task #45000.
|
2021-11-30 10:30:36 +08:00 |
|
tianshujie
|
826a99a0b7
|
* Finish task #45005,45007.
|
2021-11-30 10:12:47 +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 |
|
tianshujie
|
f2b60bda9e
|
* Finish task #45011.
|
2021-11-27 19:17:38 +08:00 |
|
mayue
|
ffaaf3ab6e
|
* Fix bug #16640.
|
2021-11-26 15:23:26 +08:00 |
|
mayue
|
0a3c124b20
|
* Fix bug #16640.
|
2021-11-26 13:34:17 +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 |
|
王怡栋
|
d9ee0bfbf7
|
Merge branch 'master' into 'sprint/170_package_bug'
# Conflicts:
# module/mr/model.php
|
2021-11-25 00:32:52 +00:00 |
|
songchenxuan
|
7fc99d65fd
|
* Fix bug 16696.
|
2021-11-24 10:51:49 +08:00 |
|
songchenxuan
|
fc0e55a418
|
* Fix bug #16656.
|
2021-11-24 10:00:59 +08:00 |
|
songchenxuan
|
049ae60320
|
* Fix bug #16642.
|
2021-11-23 17:30:37 +08:00 |
|
王怡栋
|
74a41448dc
|
* add lang for mobile api.
|
2021-11-23 09:35:16 +08:00 |
|
xieqiyu
|
0669e7385b
|
* Fix bug#16519.
|
2021-11-22 12:33:27 +08:00 |
|
xieqiyu
|
c82113ab84
|
* Modify the drop-down range of versions when submitting tests.
|
2021-11-21 11:33:43 +08:00 |
|
xieqiyu
|
8b3198bb0a
|
* Fix an error for batch run testcase.
|
2021-11-19 10:39:38 +08:00 |
|
xieqiyu
|
84340fa6f2
|
* Code for task#44497.
|
2021-11-17 22:57:30 +08:00 |
|
hufangzhou
|
8352d145f5
|
* Deal with the branch is empty.
|
2021-11-12 15:22:47 +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 |
|
root
|
02c2f5e2e2
|
* Fix bug #15689
|
2021-11-03 15:45:26 +08:00 |
|
xieqiyu
|
92462e266a
|
* Code for bug#15518.
|
2021-10-14 14:47:32 +08:00 |
|
hufangzhou
|
bf78fe9be4
|
* Add the 15.6 version and upgrade.
|
2021-10-12 09:35:39 +08:00 |
|
tianshujie
|
4f977efaeb
|
* Finish task #42854.
|
2021-09-28 13:14:32 +08:00 |
|
王怡栋
|
b70381885a
|
* add new version and upgrade.
|
2021-09-14 11:36:00 +08:00 |
|
王怡栋
|
71e494840a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-09-08 16:01:39 +08:00 |
|
王怡栋
|
d2403a6b8e
|
* add new version and upgrade.
|
2021-09-08 16:00:42 +08:00 |
|
zenggang
|
f495f058ed
|
* Finish task#42421,42411,42409,42403,42392,42388,42386,42374
|
2021-09-08 15:31:11 +08:00 |
|
zenggang
|
d3ffc97d41
|
* Fix bug#14927 and Finish task#42423,42420,42419
|
2021-09-08 13:52:53 +08:00 |
|