 tianshujie
|
70f8e0d320
|
* Fix execution and project linked product prompt issues.
|
2021-11-19 08:44:53 +08:00 |
|
|
mayue
|
039784e212
|
* Fix code error.
|
2021-11-18 15:24:15 +08:00 |
|
|
李玉春
|
bf47fb620b
|
Merge branch 'sprint/170' into 'sprint/170_mayue_16364'
# Conflicts:
# module/project/control.php
|
2021-11-18 07:09:28 +00:00 |
|
|
mayue
|
c26fb97685
|
* Fix bug #16364.
|
2021-11-18 15:07:42 +08:00 |
|
|
mayue
|
49b3b22630
|
* Fix bug #16364.
|
2021-11-18 14:48:05 +08:00 |
|
|
李玉春
|
3870f6f9e4
|
Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.
See merge request easycorp/zentaopms!495
|
2021-11-18 06:30:03 +00:00 |
|
|
mayue
|
03620d8454
|
* Fix bug #16364.
|
2021-11-18 14:24:29 +08:00 |
|
|
李玉春
|
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
|
292b09bb28
|
* Delete unused code.
|
2021-11-17 23:23:00 +08:00 |
|
|
xieqiyu
|
47cdcd78c0
|
* Code for task#44497.
|
2021-11-17 19:30:13 +08:00 |
|
|
mayue
|
9979876a0d
|
* Fix bug #16257.
|
2021-11-17 16:54:16 +08:00 |
|
|
zhouxin
|
b7e3fe9003
|
Finis task #44486,44487,44488.
|
2021-11-17 15:49:24 +08:00 |
|
|
songchenxuan
|
1578acc86d
|
* Fix bug 15828
|
2021-11-16 17:37:30 +08:00 |
|
|
songchenxuan
|
fe5c7a762e
|
* Fix bug 15828
|
2021-11-16 17:30:56 +08:00 |
|
|
songchenxuan
|
626ff953ca
|
* Fix bug 15828
|
2021-11-16 16:47:00 +08:00 |
|
|
songchenxuan
|
515221aa5d
|
*Fix bug #15828
|
2021-11-16 16:03:37 +08:00 |
|
|
孙广明
|
102d718ecf
|
Merge branch 'sprint/170' into 'sprint/170_zhengrunyu_44498'
# Conflicts:
# module/project/model.php
|
2021-11-16 05:47:29 +00:00 |
|
|
zhengrunyu
|
d5783e71b3
|
*Finish task #44498.
|
2021-11-16 13:43:05 +08:00 |
|
|
李玉春
|
b74f5ab258
|
Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Fix bug #43916.
See merge request easycorp/zentaopms!465
|
2021-11-16 03:20:54 +00:00 |
|
|
zhouxin
|
dd5cf8c7bd
|
Fix bug #43916.
|
2021-11-15 19:15:20 +08:00 |
|
|
mayue
|
a2f3100ea5
|
* Modify branch.
|
2021-11-15 16:18:26 +08:00 |
|
|
李玉春
|
a8523d317a
|
Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Finish task #43916.
See merge request easycorp/zentaopms!437
|
2021-11-15 05:05:00 +00:00 |
|
|
李玉春
|
dbf8840697
|
Merge branch 'sprint/170_mayue_16223' into 'sprint/170'
* Fix bug #16223.
See merge request easycorp/zentaopms!449
|
2021-11-15 01:40:34 +00:00 |
|
|
xieqiyu
|
a9ba1c9344
|
* Fix bug#16094.
|
2021-11-14 14:18:40 +08:00 |
|
|
mayue
|
3921075895
|
* Fix bug #16223.
|
2021-11-12 17:55:58 +08:00 |
|
|
tianshujie
|
bc2560fd95
|
* Remove spaces.
|
2021-11-12 15:36:29 +08:00 |
|
|
tianshujie
|
a3da8bf0e0
|
* Merge conflict.
|
2021-11-12 15:33:35 +08:00 |
|
|
李玉春
|
9686f7e13e
|
Merge branch 'sprint/170' into 'sprint/170_tianshujie_16194'
# Conflicts:
# module/project/control.php
|
2021-11-12 07:31:40 +00:00 |
|
|
tianshujie
|
48d7682b0f
|
* Modify the code issue.
|
2021-11-12 15:18:26 +08:00 |
|
|
liyuchun
|
0c7bcaf928
|
* Fix error of manage product.
|
2021-11-12 15:07:42 +08:00 |
|
|
tianshujie
|
50b4590655
|
* Fix bug #16194.
|
2021-11-12 14:53:51 +08:00 |
|
|
zhouxin
|
e57d1d1cc7
|
Finish task #43916.
|
2021-11-12 14:06:44 +08:00 |
|
|
tianshujie
|
5582354037
|
* When repairing the project and execution linked products, the branch judgment problem.
|
2021-11-11 09:42:37 +08:00 |
|
|
tianshujie
|
11887cffe9
|
* The product is selected by default when modifying the branch.
|
2021-11-11 09:00:05 +08:00 |
|
|
tianshujie
|
fb7f493036
|
* Modify the error code.
|
2021-11-10 09:58:49 +08:00 |
|
|
tianshujie
|
fe99d1fafb
|
* Finish task #43901.
|
2021-11-09 19:56:48 +08:00 |
|
|
tianshujie
|
9e622a2995
|
* Merge conflicts.
|
2021-11-09 16:27:06 +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 |
|
|
tianshujie
|
8e9dd74c0d
|
* Modify code logic.
|
2021-11-09 15:47:31 +08:00 |
|
|
tianshujie
|
5ab6fe77c2
|
* Modify code logic.
|
2021-11-09 14:21:17 +08:00 |
|
|
zhengrunyu
|
0f975ee3c4
|
*Finish task #44157.
|
2021-11-09 13:48:06 +08:00 |
|
|
zhengrunyu
|
57bc70b75b
|
*Finish task #44157.
|
2021-11-09 13:31:05 +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 |
|
|
zhengrunyu
|
64d4d04c7e
|
*Finish task #43915.
|
2021-11-04 13:13:10 +08:00 |
|
|
zhengrunyu
|
01a7ed9151
|
*Finish task #43915.
|
2021-11-04 13:09:02 +08:00 |
|
|
zhengrunyu
|
5b47d67d93
|
*Finish task #43915.
|
2021-11-04 13:05:19 +08:00 |
|
|
zhengrunyu
|
79e7052af0
|
*Finish task #43915.
|
2021-11-03 17:23:38 +08:00 |
|
|
zhengrunyu
|
3a5bbcdaf7
|
*Finish task #43915.
|
2021-11-03 17:20:24 +08:00 |
|