李玉春
|
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 |
|
xieqiyu
|
a9c2c09338
|
* Optimize the code.
|
2021-11-18 11:41:17 +08:00 |
|
xieqiyu
|
7d15430ab1
|
* Modify the review code.
|
2021-11-18 10:39:46 +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 |
|
mayue
|
a2f3100ea5
|
* Modify branch.
|
2021-11-15 16:18:26 +08:00 |
|
zhouxin
|
b5ab5a03d7
|
Finish task #43916.
|
2021-11-15 10:07:01 +08:00 |
|
zhouxin
|
e57d1d1cc7
|
Finish task #43916.
|
2021-11-12 14:06:44 +08:00 |
|
tianshujie
|
35504f6745
|
* Combine the acquisition branch into a function.
|
2021-11-10 09:17:28 +08:00 |
|
tianshujie
|
fe99d1fafb
|
* Finish task #43901.
|
2021-11-09 19:56:48 +08:00 |
|
李玉春
|
98f519fe31
|
Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901'
# Conflicts:
# module/branch/model.php
# module/story/model.php
|
2021-11-09 07:53:17 +00:00 |
|
李玉春
|
d75156dd74
|
Merge branch 'sprint/170_songchenxuan_43918' into 'sprint/170'
* Finish task #43918.
See merge request easycorp/zentaopms!361
|
2021-11-09 06:00:23 +00:00 |
|
root
|
c0169fd823
|
* Finish task #43918.
|
2021-11-09 11:27:30 +08:00 |
|
root
|
67635b0317
|
* Finish task #43918.
|
2021-11-09 10:39:02 +08:00 |
|
root
|
c55a455a16
|
* Finish task #43918.
|
2021-11-09 10:37:48 +08:00 |
|
tianshujie
|
eedcc1aed5
|
* Modify code logic.
|
2021-11-09 10:28:16 +08:00 |
|
tianshujie
|
3986d8c297
|
* Add the logic of project-related multi-branch products.
|
2021-11-09 10:04:05 +08:00 |
|
zhouxin
|
92fb767ff9
|
Finish task #43916.
|
2021-11-08 14:34:44 +08:00 |
|
root
|
d6361de047
|
* Finish task 43917
|
2021-11-04 17:38:34 +08:00 |
|
root
|
24c8e0948d
|
* Finish task 43917
|
2021-11-04 17:24:52 +08:00 |
|
xieqiyu
|
92462e266a
|
* Code for bug#15518.
|
2021-10-14 14:47:32 +08:00 |
|
hufangzhou
|
a80eca0ab5
|
* Fix bug #15477.
|
2021-10-12 15:42:58 +08:00 |
|
王怡栋
|
96a8ef6b04
|
Merge branch '15.5' into 165
|
2021-10-09 10:06:05 +08:00 |
|
朱金勇
|
ff09127219
|
Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42846.
See merge request easycorp/zentaopms!41
|
2021-10-09 01:32:30 +00:00 |
|
王怡栋
|
a14fc4e7f9
|
* finish task #42848.
|
2021-09-30 15:49:24 +08:00 |
|
zenggang
|
f139f00e61
|
* Task 42862,previously committed to the master branch, now resubmit to the 165 branch
|
2021-09-30 11:19:05 +08:00 |
|
zenggang
|
6798a9cb46
|
* Fix bug#15280
|
2021-09-26 17:10:11 +08:00 |
|
王怡栋
|
77d501887d
|
* fix bug for save execution session.
|
2021-09-15 14:34:13 +08:00 |
|
tianshujie
|
c473a76d01
|
* Fix bug #15136.
|
2021-09-14 08:56:22 +08:00 |
|
tianshujie
|
8219bc43d3
|
* Fix bug #14966.
|
2021-09-13 09:52:24 +08:00 |
|
王怡栋
|
2fadc69fa3
|
* fix bug #15083,15079.
|
2021-09-10 11:34:10 +08:00 |
|
tianshujie
|
9e8583ee1e
|
* Ignore admin when judging permissions.
|
2021-09-09 11:06:58 +08:00 |
|
tianshujie
|
2a86208f65
|
* Fix bug #14957.
|
2021-09-09 10:51:06 +08:00 |
|
tianshujie
|
1609837ff7
|
* Fix bug #14982.
|
2021-09-09 09:12:42 +08:00 |
|
tianshujie
|
c88d7f16e2
|
* Finish task #42385.
|
2021-09-09 08:56:01 +08:00 |
|
liyuchun
|
69c1b44157
|
* Fix bug #15061.
|
2021-09-08 16:53:55 +08:00 |
|
tianshujie
|
e23b4cd7ff
|
* Fix bug #15010.
|
2021-09-08 14:09:23 +08:00 |
|
liyuchun
|
e769b98b82
|
* Adjust logic of get execution by id list.
|
2021-09-03 16:01:06 +08:00 |
|
王怡栋
|
4eee4d5523
|
Merge branch '15.4'
|
2021-09-02 19:21:30 +08:00 |
|
tianshujie
|
8088a0c285
|
* Finish task #42146.
|
2021-09-02 14:33:50 +08:00 |
|
王怡栋
|
9f7bde9760
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-09-02 13:13:48 +08:00 |
|
王怡栋
|
76945e64ff
|
* Sync stories to new project when change execution project.
|
2021-09-02 13:13:04 +08:00 |
|
tianshujie
|
6f7835da43
|
* Fix bug #14568.
|
2021-09-02 13:02:26 +08:00 |
|
tianshujie
|
04dbede939
|
* Fix the execution view error.
|
2021-08-31 15:34:45 +08:00 |
|
tianshujie
|
026287cbf5
|
* Fix bug #14655.
|
2021-08-31 14:59:53 +08:00 |
|
liyuchun
|
8a99c654f5
|
Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-08-31 13:01:16 +08:00 |
|
liyuchun
|
757d23337d
|
* Fix bug #14783.
|
2021-08-31 13:00:58 +08:00 |
|
tianshujie
|
346173b831
|
* Fix bug #14795.
|
2021-08-31 11:12:38 +08:00 |
|
zhujinyong
|
664e290f97
|
* Rename openApp to tab.
|
2021-08-31 00:30:48 +08:00 |
|
hufangzhou
|
adeb8ba5b6
|
* Code for bug #12802.
|
2021-08-30 13:30:59 +08:00 |
|