 孙广明
|
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 |
|
|
李玉春
|
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 |
|
|
zhengrunyu
|
6a20c5b9b9
|
*Finish task #43915.
|
2021-11-03 17:16:46 +08:00 |
|
|
hufangzhou
|
8b1b92bdfc
|
* Add the version.
|
2021-11-02 12:37:51 +08:00 |
|
|
mayue
|
af5c3178ee
|
*Fix a bug #15696.
|
2021-10-28 16:21:31 +08:00 |
|
|
tianshujie
|
69743fa3a4
|
* Fix bug #15698.
|
2021-10-21 08:32:55 +08:00 |
|
|
李玉春
|
1ee2b61d95
|
Merge branch 'sprint/167_xieqiyu_15457' into 'sprint/167'
* Fix bug#15457.
See merge request easycorp/zentaopms!78
|
2021-10-18 01:17:58 +00:00 |
|
|
王怡栋
|
351b07352b
|
Merge branch '15.6' into sprint/167
|
2021-10-18 08:53:13 +08:00 |
|
|
xieqiyu
|
3e8e0dbcce
|
* Fix bug#15457.
|
2021-10-16 15:32:13 +08:00 |
|
|
xieqiyu
|
21ad4ecf0a
|
* Code for bug#15543.Modify the consumed hours of the project in the block.
|
2021-10-16 08:27:28 +08:00 |
|
|
xieqiyu
|
5cd2f5d2db
|
* Code for bug#15543.
|
2021-10-15 14:45:01 +08:00 |
|
|
李玉春
|
88323d34da
|
Merge branch 'sprint/167_hufangzhou_15544' into 'sprint/167'
* Fix bug #15544.
See merge request easycorp/zentaopms!76
|
2021-10-15 06:19:33 +00:00 |
|
|
xieqiyu
|
5697ba482a
|
* Fix bug#15543.
|
2021-10-15 14:13:41 +08:00 |
|
|
hufangzhou
|
dc8317d122
|
* Fix bug #15544.
|
2021-10-15 14:11:42 +08:00 |
|
|
Hao Sun
|
d8327a0cdc
|
* Task #43195, fix project creating guide modal not show as expected sometimes.
|
2021-10-15 11:18:37 +08:00 |
|
|
朱金勇
|
e50c3c65d9
|
Merge branch 'sprint/167_zenggang_43179' into 'sprint/167'
* Finish task#43179
See merge request easycorp/zentaopms!49
|
2021-10-15 01:05:33 +00:00 |
|
|
王怡栋
|
a44472fb45
|
Merge branch '15.6' into sprint/167
|
2021-10-14 15:48:14 +08:00 |
|
|
hufangzhou
|
52e49919d2
|
* Code for bug #15518.
|
2021-10-14 13:51:59 +08:00 |
|
|
李玉春
|
8e1161b02c
|
Merge branch 'sprint/167_tianshujie_43169' into 'sprint/167'
* Finish task #43169.
See merge request easycorp/zentaopms!64
|
2021-10-14 05:05:12 +00:00 |
|