 李玉春
|
9c4b07e8b7
|
Merge branch 'sprint/170' into 'sprint/173_lizhiqiang__16336'
# Conflicts:
# module/execution/view/bug.html.php
|
2021-11-18 01:04:00 +00:00 |
|
|
xieqiyu
|
84340fa6f2
|
* Code for task#44497.
|
2021-11-17 22:57:30 +08:00 |
|
|
xieqiyu
|
47cdcd78c0
|
* Code for task#44497.
|
2021-11-17 19:30:13 +08:00 |
|
|
hufangzhou
|
6e1f7dfbf7
|
* Finish task #44361.
|
2021-11-17 18:06:48 +08:00 |
|
|
lizhiqiang
|
791ea627de
|
* Finish bug #16336.
|
2021-11-17 17:57:04 +08:00 |
|
|
Hao Sun
|
6ad007f06e
|
* task #44357, refactor executions kanban with kanban component and support dnd.
|
2021-11-17 17:51:20 +08:00 |
|
|
李玉春
|
508539166d
|
Merge branch 'sprint/170_mayue_16257' into 'sprint/170'
* Fix bug #16257.
See merge request easycorp/zentaopms!493
|
2021-11-17 09:45:57 +00:00 |
|
|
mayue
|
bf7e878ae4
|
* Fix bug #16257.
|
2021-11-17 17:44:22 +08:00 |
|
|
mayue
|
9979876a0d
|
* Fix bug #16257.
|
2021-11-17 16:54:16 +08:00 |
|
|
hufangzhou
|
0d39951950
|
* Code for task #44361.
|
2021-11-17 16:14:53 +08:00 |
|
|
zhouxin
|
b7e3fe9003
|
Finis task #44486,44487,44488.
|
2021-11-17 15:49:24 +08:00 |
|
|
mayue
|
2f4ed8f1c0
|
* Fix bug #16000.
|
2021-11-17 15:00:40 +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 |
|
|
tanghucheng
|
939023de6d
|
* Finish task #44023 for max.
|
2021-11-15 10:19:35 +08: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 |
|
|
李玉春
|
68653946e5
|
Merge branch 'sprint/171_sgm_sortwiki' into 'sprint/168'
Sprint/171 sgm sortwiki
See merge request easycorp/zentaopms!435
|
2021-11-12 05:24:19 +00:00 |
|
|
孙广明
|
70c1981893
|
* Fix bug #16059.
|
2021-11-12 11:23:35 +08:00 |
|
|
liyuchun
|
fa1ffa32bb
|
* Fix bug #16163.
|
2021-11-12 11:13:37 +08:00 |
|
|
liyuchun
|
4865431f22
|
* Fix bug #16166.
|
2021-11-12 10:36:57 +08:00 |
|
|
songchenxuan
|
2dbfab7e5a
|
* Fix bug #16043.
|
2021-11-12 10:29:30 +08:00 |
|
|
孙广明
|
a075c72531
|
* Fix execution update order.
|
2021-11-12 09:28:37 +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 |
|
|
liyuchun
|
4604c3d496
|
* Finish task #44217,#44218,#44219,#44220.
|
2021-11-11 12:32:20 +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 |
|
|
李玉春
|
900de67361
|
Merge branch 'sprint/171_sgm_43998' into 'sprint/168'
* Finish task #43998.
See merge request easycorp/zentaopms!376
|
2021-11-10 02:35:22 +00:00 |
|
|
tianshujie
|
fb7f493036
|
* Modify the error code.
|
2021-11-10 09:58:49 +08:00 |
|
|
孙广明
|
6d625bb597
|
* Finish task #43998.
|
2021-11-10 09:43:04 +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 |
|
|
Hao Sun
|
a233ecdf4b
|
* fix iframe modal show double times on click at second time.
|
2021-11-09 19:55:15 +08:00 |
|
|
liyuchun
|
00d9bc4d7f
|
* Sort execution kanban.
|
2021-11-09 17:22:42 +08:00 |
|
|
孙广明
|
b4e9ab871d
|
Merge branch 'sprint/168' into 'sprint/168_liyuchun_43982'
# Conflicts:
# module/kanban/lang/en.php
# module/kanban/lang/zh-cn.php
|
2021-11-09 08:57:01 +00:00 |
|
|
liyuchun
|
cec2fd2c42
|
* Finish task #43960.
|
2021-11-09 16:42:22 +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 |
|
|
孙广明
|
521a8e871d
|
* Finish task #44139.
|
2021-11-09 14:39:07 +08:00 |
|
|
李玉春
|
60766cee16
|
Merge branch 'sprint/168_sgm_43995' into 'sprint/168'
* Finish task #43955.
See merge request easycorp/zentaopms!359
|
2021-11-09 06:36:52 +00:00 |
|
|
孙广明
|
21d6cbd160
|
* Fix logic error.
|
2021-11-09 14:24:49 +08: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 |
|