 李玉春
|
0c72b041b4
|
Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Finish task #43892.
See merge request easycorp/zentaopms!389
|
2021-11-11 00:30:32 +00:00 |
|
|
mayue
|
dbfabc47c2
|
* Finish task #43892.
|
2021-11-11 08:18:08 +08:00 |
|
|
zhujinyong
|
f77b0e6d2d
|
* Check compatibility.
|
2021-11-11 05:10:38 +08:00 |
|
|
zhujinyong
|
37b486ad1c
|
* Replace htmlspecialchars to htmlSpecialString for compatibility.
|
2021-11-10 14:57:48 +08:00 |
|
|
李玉春
|
421b19928f
|
Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Finish task #43892.
See merge request easycorp/zentaopms!379
|
2021-11-10 05:03:53 +00:00 |
|
|
mayue
|
7247a7d4b5
|
* Finish task #43892.
|
2021-11-10 11:13:37 +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 |
|
|
tianshujie
|
3986d8c297
|
* Add the logic of project-related multi-branch products.
|
2021-11-09 10:04:05 +08:00 |
|
|
hufangzhou
|
d10834ab9f
|
* Code for task #43904.
|
2021-11-08 18:02:15 +08:00 |
|
|
李玉春
|
7692460500
|
Merge branch 'sprint/170_xieqiyu_44028' into 'sprint/170'
Finish task#44028.
See merge request easycorp/zentaopms!327
|
2021-11-08 06:08:31 +00:00 |
|
|
李玉春
|
9fe54a903c
|
Merge branch 'sprint/170' into 'sprint/170_hufangzhou_43891_new'
# Conflicts:
# module/branch/control.php
|
2021-11-08 05:53:39 +00:00 |
|
|
xieqiyu
|
866c7adc75
|
* Code for task#43902.
|
2021-11-08 13:53:16 +08:00 |
|
|
李玉春
|
db0c5df00e
|
Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.
See merge request easycorp/zentaopms!333
|
2021-11-08 05:30:29 +00:00 |
|
|
mayue
|
aa116136d0
|
* Fix bug #15688.
|
2021-11-08 13:24:23 +08:00 |
|
|
hufangzhou
|
5d1e3bd65e
|
* Finish task #43904.
|
2021-11-08 13:14:44 +08:00 |
|
|
hufangzhou
|
9732ba073a
|
* Modify the cookie of preBranch type.
|
2021-11-08 10:19:56 +08:00 |
|
|
tianshujie
|
c5779575c1
|
* Modify code logic.
|
2021-11-08 09:29:45 +08:00 |
|
|
xieqiyu
|
acf5b15c06
|
* Code for task#43902.
|
2021-11-08 09:20:57 +08:00 |
|
|
hufangzhou
|
d279c5d7d7
|
* Finish task #43891.
|
2021-11-05 18:47:39 +08:00 |
|
|
tianshujie
|
0328182a47
|
* Modify the logic of the acquisition plan.
|
2021-11-05 17:19:41 +08:00 |
|
|
tianshujie
|
77da777064
|
* Finish task #43893.
|
2021-11-05 15:46:52 +08:00 |
|
|
孙广明
|
5812a1e510
|
Merge branch 'sprint/170_tianshujie_43903' into 'sprint/170'
* Finish task #43903
See merge request easycorp/zentaopms!319
|
2021-11-05 03:22:17 +00:00 |
|
|
tianshujie
|
0e3d64843e
|
* Restore code.
|
2021-11-05 09:08:25 +08:00 |
|
|
tianshujie
|
6cb70ab01d
|
* Finish task #43903.
|
2021-11-05 08:59:55 +08:00 |
|
|
zhouxin
|
23b7e471d2
|
Finish task $43876.
|
2021-11-04 17:16:16 +08:00 |
|
|
tianshujie
|
d297c809b3
|
* Finish task #43907.
|
2021-11-03 15:51:04 +08:00 |
|
|
hufangzhou
|
8b1b92bdfc
|
* Add the version.
|
2021-11-02 12:37:51 +08:00 |
|
|
孙广明
|
1007936087
|
Merge branch 'sprint/169_wangjingbo_43541' into 'sprint/169'
Sprint/169 wangjingbo 43541
See merge request easycorp/zentaopms!157
|
2021-10-27 02:29:25 +00:00 |
|
|
孙广明
|
5cec976a63
|
Merge branch 'sprint/169_zhouxin_43561' into 'sprint/169'
Sprint/169 zhouxin 43561
See merge request easycorp/zentaopms!160
|
2021-10-27 02:28:04 +00:00 |
|
|
mayue
|
131b428d20
|
*Fix a bug #15712
|
2021-10-26 18:20:14 +08:00 |
|
|
zhouxin
|
396d267729
|
Finish task #43561.
|
2021-10-26 16:00:50 +08:00 |
|
|
wangjingbo
|
706128a141
|
* Finish task #43541.
|
2021-10-26 15:39:25 +08:00 |
|
|
zenggang
|
4c6d8f5a99
|
* Fix bug#15548
|
2021-10-19 04:04:01 +00:00 |
|
|
孙广明
|
27086797f3
|
* Fix story bug and add user test.
|
2021-10-19 08:54:24 +08:00 |
|
|
王怡栋
|
a44472fb45
|
Merge branch '15.6' into sprint/167
|
2021-10-14 15:48:14 +08:00 |
|
|
孙广明
|
2b2132d5e0
|
* Fix story review bug.
|
2021-10-14 14:56:48 +08:00 |
|
|
hufangzhou
|
52e49919d2
|
* Code for bug #15518.
|
2021-10-14 13:51:59 +08:00 |
|
|
xieqiyu
|
28d62ece60
|
* Fix bug#15501.
|
2021-10-13 16:11:07 +08:00 |
|
|
hufangzhou
|
bf78fe9be4
|
* Add the 15.6 version and upgrade.
|
2021-10-12 09:35:39 +08:00 |
|
|
王怡栋
|
96a8ef6b04
|
Merge branch '15.5' into 165
|
2021-10-09 10:06:05 +08:00 |
|
|
zenggang
|
3efa133827
|
* Fix bug#15278
|
2021-09-29 10:59:27 +08:00 |
|
|
朱金勇
|
aa86fdea50
|
Merge branch 'sprint/165_liyuchun_42854' into 'sprint/165'
* Finish task #42854.
See merge request easycorp/zentaopms!38
|
2021-09-28 07:37:30 +00:00 |
|
|
朱金勇
|
1173e8b65d
|
Merge branch 'sprint/165_wangyidong' into 'sprint/165'
Sprint/165 wangyidong
See merge request easycorp/zentaopms!37
|
2021-09-28 07:31:10 +00:00 |
|
|
liyuchun
|
9b5a28392b
|
* Finish task #42854.
|
2021-09-28 12:31:59 +08:00 |
|
|
王怡栋
|
08f1d594c0
|
* adjust for task #42835.
|
2021-09-28 09:24:33 +08:00 |
|
|
王怡栋
|
f30eb20fbd
|
* code for task #42835.
|
2021-09-27 14:50:09 +08:00 |
|
|
liyuchun
|
7dfa0963e6
|
* Finish task #42860.
|
2021-09-26 16:23:20 +08:00 |
|
|
hufangzhou
|
ddb583a707
|
* Fix bug #15230: Added judgment conditions for version when batch review stories.
|
2021-09-17 10:53:08 +08:00 |
|