 songchenxuan
|
70612e93aa
|
*Fix bug #17563.
|
2021-12-20 13:55:22 +08:00 |
|
|
songchenxuan
|
8a0881aef4
|
*Finish task #45543.
|
2021-12-13 10:14:50 +08:00 |
|
|
songchenxuan
|
8b874bfbbc
|
*Finish task #45545.
|
2021-12-09 09:20:45 +08:00 |
|
|
hufangzhou
|
68a534b137
|
* Fix bug #17269, bug #16975.
|
2021-12-08 17:16:22 +08:00 |
|
|
tianshujie
|
37a65b6789
|
* Fix bug #17259.
|
2021-12-08 16:10:09 +08:00 |
|
|
李玉春
|
9db701d207
|
Merge branch 'sptint/174_xieqiyu_17079' into 'master'
* Fix bug#17113.
See merge request easycorp/zentaopms!788
|
2021-12-06 07:18:39 +00:00 |
|
|
hufangzhou
|
05d9182e31
|
* Fix bug #17116, bug #17117.
|
2021-12-06 12:09:15 +08:00 |
|
|
xieqiyu
|
0dc84860e9
|
* Fix bug#17113.
|
2021-12-06 11:55:46 +08: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 |
|
|
hufangzhou
|
145fc2a461
|
* Fix bug #17074.
|
2021-12-06 10:27:51 +08:00 |
|
|
zhujinyong
|
5f3b5817c9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-05 23:51:59 +08:00 |
|
|
zhujinyong
|
f6d7234156
|
* Fix bugs of api.
|
2021-12-05 23:51:27 +08:00 |
|
|
xieqiyu
|
47f1099039
|
* Fix bug#17061.
|
2021-12-03 13:09:22 +08:00 |
|
|
hufangzhou
|
dda03577c1
|
* Fix bug #17038.
|
2021-12-02 16:55:52 +08:00 |
|
|
李玉春
|
82f0d4f39c
|
Merge branch 'sprint/174_hufangzhou_16975' into 'master'
* Fix bug #16975.
See merge request easycorp/zentaopms!739
|
2021-12-02 08:08:58 +00:00 |
|
|
hufangzhou
|
ed2efc053c
|
* Fix bug #16975.
|
2021-12-02 14:05:35 +08:00 |
|
|
李玉春
|
22aff07db9
|
Merge branch 'sprint/174_songchenxuan_addcomment' into 'master'
* Add testcase batchEdit comment.
See merge request easycorp/zentaopms!720
|
2021-12-02 05:08:14 +00:00 |
|
|
李玉春
|
4c29226156
|
Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Fix bug #16987.
See merge request easycorp/zentaopms!723
|
2021-12-02 01:48:29 +00: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 |
|
|
songchenxuan
|
13324bf430
|
* Add testcase batchEdit comment.
|
2021-12-02 08:45:27 +08:00 |
|
|
李玉春
|
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 |
|