 李玉春
|
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 |
|
|
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 |
|
|
songchenxuan
|
2dbfab7e5a
|
* Fix bug #16043.
|
2021-11-12 10:29:30 +08:00 |
|
|
tianshujie
|
e349618c4c
|
* Fix bug #16205.
|
2021-11-12 08:48:52 +08:00 |
|
|
tianshujie
|
382e3103d0
|
* Fix bug #16205.
|
2021-11-12 08:46:19 +08:00 |
|
|
tianshujie
|
34ad92ab78
|
* Modify the judgment logic.
|
2021-11-11 17:50:47 +08:00 |
|
|
王怡栋
|
1f8bb88e8c
|
* revert ajaxSetUnfoldID.
|
2021-11-11 16:19:56 +08:00 |
|
|
tianshujie
|
4940500fe1
|
* Fix the trunk display problem when execution manage products.
|
2021-11-11 13:59:52 +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 |
|
|
zhujinyong
|
37b486ad1c
|
* Replace htmlspecialchars to htmlSpecialString for compatibility.
|
2021-11-10 14:57:48 +08:00 |
|
|
tianshujie
|
c29ea5077a
|
* Finish task #43901.
|
2021-11-10 13:10:11 +08:00 |
|
|
李玉春
|
fe315477ea
|
Update manageproducts.html.php
|
2021-11-10 02:53:53 +00:00 |
|
|
tianshujie
|
0ac42fe56b
|
* Modify variable value.
|
2021-11-10 10:49:53 +08:00 |
|
|
tianshujie
|
fb7f493036
|
* Modify the error code.
|
2021-11-10 09:58:49 +08:00 |
|
|
tianshujie
|
8174540183
|
* Remove useless code.
|
2021-11-10 09:22:08 +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
|
8c731d67fe
|
Finish task #43918.
|
2021-11-09 13:14:05 +08: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 |
|
|
李玉春
|
d7ac642f3d
|
Merge branch 'sprint/170_songchenxuan_43917' into 'sprint/170'
* Finish task 43917
See merge request easycorp/zentaopms!314
|
2021-11-04 09:42:14 +00: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 |
|
|
tianshujie
|
50ad0453f6
|
* Modify variable error.
|
2021-11-04 14:25:33 +08:00 |
|
|
tianshujie
|
79597546d9
|
* Finish task #43907.
|
2021-11-04 09:07:09 +08:00 |
|
|
tianshujie
|
d297c809b3
|
* Finish task #43907.
|
2021-11-03 15:51:04 +08:00 |
|
|
王怡栋
|
d8ac3d1950
|
Merge branch 'sprint/167_hufangzhou_package' into 'sprint/167'
* Check the code for upgrade.
See merge request easycorp/zentaopms!84
|
2021-10-18 05:14:44 +00:00 |
|
|
hufangzhou
|
c4824ba3d7
|
* Check the code for upgrade.
|
2021-10-18 13:11:07 +08:00 |
|
|
王怡栋
|
621eecf52c
|
* adjust for execution action list.
|
2021-10-18 10:18:40 +08:00 |
|
|
xieqiyu
|
92462e266a
|
* Code for bug#15518.
|
2021-10-14 14:47:32 +08:00 |
|
|
tianshujie
|
ab662e5cf4
|
* Fix bug #15511.
|
2021-10-14 13:31:08 +08:00 |
|
|
hufangzhou
|
a80eca0ab5
|
* Fix bug #15477.
|
2021-10-12 15:42:58 +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 |
|
|
朱金勇
|
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
|
5d37062ad6
|
* Fix bug#15359
|
2021-09-29 10:46:07 +08:00 |
|
|
朱金勇
|
8ef308be2f
|
Merge branch 'sprint/165_zenggang' into 'sprint/165'
* Fix bug#15368
See merge request easycorp/zentaopms!35
|
2021-09-28 08:11:15 +00:00 |
|
|
朱金勇
|
79a020c0f5
|
Merge branch 'sprint/165_dingna_task42827' into 'sprint/165'
* Finish task 42827.
See merge request easycorp/zentaopms!36
|
2021-09-28 07:46:19 +00: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 |
|
|
liyuchun
|
9b5a28392b
|
* Finish task #42854.
|
2021-09-28 12:31:59 +08:00 |
|