 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 |
|
|
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
|
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 |
|
|
hufangzhou
|
52e49919d2
|
* Code for bug #15518.
|
2021-10-14 13:51:59 +08:00 |
|
|
王怡栋
|
96a8ef6b04
|
Merge branch '15.5' into 165
|
2021-10-09 10:06:05 +08:00 |
|
|
王怡栋
|
08f1d594c0
|
* adjust for task #42835.
|
2021-09-28 09:24:33 +08:00 |
|
|
tianshujie
|
441cda176d
|
* Modify the global creation return link.
|
2021-09-15 15:56:19 +08:00 |
|
|
hufangzhou
|
d0c7c58f18
|
* Fix bug #15172.
|
2021-09-14 16:27:56 +08:00 |
|
|
hufangzhou
|
4ed8765f38
|
* Fix bug #15093.
|
2021-09-13 10:27:11 +08:00 |
|
|
hufangzhou
|
ccdfd0e09b
|
* Fix bug #15000.
|
2021-09-08 16:08:34 +08:00 |
|
|
王怡栋
|
4eee4d5523
|
Merge branch '15.4'
|
2021-09-02 19:21:30 +08:00 |
|
|
tianshujie
|
1cdf0f171d
|
* Fix bug #14722.
|
2021-08-31 10:56:25 +08:00 |
|
|
tianshujie
|
f459105129
|
* Modify dynamic back link problem.
|
2021-08-31 09:12:58 +08:00 |
|
|
zhujinyong
|
664e290f97
|
* Rename openApp to tab.
|
2021-08-31 00:30:48 +08:00 |
|
|
tianshujie
|
89c43c9a63
|
* Modify the return link of the task.
|
2021-08-30 15:19:47 +08:00 |
|
|
tianshujie
|
1765f12338
|
* Modify the problem of the product module return link.
|
2021-08-30 10:24:25 +08:00 |
|
|
holan20180123
|
ad9fcd2b0f
|
* Fix bug #14552.
|
2021-08-25 13:44:27 +08:00 |
|
|
hufangzhou
|
d63dc92095
|
* Adjust the recall function redirection.
|
2021-08-16 17:29:21 +08:00 |
|
|
hufangzhou
|
99de8fa2ce
|
* Avoid the change button and recall button are clickable at the same time.
|
2021-08-12 17:13:46 +08:00 |
|
|
hufangzhou
|
4d0fd03c5e
|
* Finish task #41241.
|
2021-08-12 15:56:07 +08:00 |
|
|
hufangzhou
|
7599eb9bad
|
* Task#41242: If only the reviewers has changed when change the story, the story version also plus one.
|
2021-08-12 10:55:54 +08:00 |
|
|
hufangzhou
|
6d5eb4fa8e
|
* Finish task #41242.
|
2021-08-10 15:53:13 +08:00 |
|
|
qiyu-xie
|
506d2ec05f
|
* Fix bug#14091.
|
2021-08-09 14:32:14 +08:00 |
|
|
wangyidong
|
bbe793a8aa
|
Merge branch '15.2'
|
2021-08-02 16:31:42 +08:00 |
|
|
qiyu-xie
|
3c09c80ffa
|
* Modify file source type name for requirement.
|
2021-07-30 10:59:06 +08:00 |
|
|
Guan Xiying
|
db0416297a
|
* Clear codes for sync gitlab isssues.
|
2021-07-29 14:22:04 +08:00 |
|
|
wangyidong
|
effe28a36e
|
* finish task #40466.
|
2021-07-26 11:46:06 +08:00 |
|
|
zhujinyong
|
6f04aedcd3
|
Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-07-16 09:44:23 +08:00 |
|
|
zhujinyong
|
1677574443
|
* return before $this->send.
|
2021-07-16 09:40:41 +08:00 |
|
|
lichengjun
|
53c075cbee
|
*Adjust code.
|
2021-07-15 16:39:58 +08:00 |
|
|
dingguodong
|
3747bf90d9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-07-15 13:53:43 +08:00 |
|
|
dingguodong
|
bb7f7cf142
|
* Remove duplicated loadModel for gitlab related after CR.
|
2021-07-15 13:53:04 +08:00 |
|
|
zhujinyong
|
437ed911c8
|
+ Add product and story entry points of API.
|
2021-07-15 13:39:06 +08:00 |
|
|
Guan Xiying
|
1c802f2a36
|
Merge branch 'jihu'
|
2021-07-14 09:48:58 +08:00 |
|
|
wangyidong
|
fa4fa5941e
|
Merge branch '15.0'
|
2021-07-06 19:28:30 +08:00 |
|