 李玉春
|
9b4fe955ea
|
Merge branch 'sprint/185_zhouxudong_19917' into 'sprint/185'
Sprint/185 zhouxudong 19917
See merge request easycorp/zentaopms!1923
|
2022-02-23 09:26:48 +00:00 |
|
|
李玉春
|
e30201491d
|
Merge branch '185_sunhuawei_story_30529' into 'sprint/185'
185 sunhuawei story 30529
See merge request easycorp/zentaopms!1929
|
2022-02-23 09:26:29 +00:00 |
|
|
周旭东
|
bc832bcf22
|
Update kanban.js
|
2022-02-23 09:20:20 +00:00 |
|
|
孙华伟
|
e78a9cc05a
|
*Story #30529.
|
2022-02-23 17:17:28 +08:00 |
|
|
孙华伟
|
51e54dcf74
|
*Story #30529.
|
2022-02-23 17:15:56 +08:00 |
|
|
zhouxudong
|
6556130370
|
* Modify variable name.
|
2022-02-23 17:11:26 +08:00 |
|
|
李玉春
|
cbd1ec29ce
|
Merge branch 'sprint/185_zhengrunyu_Fixbug_19932' into 'sprint/185'
*Fix bug 19932 .
See merge request easycorp/zentaopms!1924
|
2022-02-23 08:56:19 +00:00 |
|
|
zhouxudong
|
ad7d67071d
|
* Fix bug #19917.
|
2022-02-23 16:50:08 +08:00 |
|
|
zhengrunyu
|
c07ca10dd7
|
*Fix bug 19932 .
|
2022-02-23 16:39:35 +08:00 |
|
|
zhouxudong
|
97e5aab33c
|
* Fix bug #19917.
|
2022-02-23 16:37:44 +08:00 |
|
|
孙华伟
|
234cfff784
|
*Story #30529.
|
2022-02-23 16:30:50 +08:00 |
|
|
李玉春
|
322c9c2b54
|
Merge branch 'sprint/185_zxd_49696' into 'sprint/185'
* Finish task #49696.
See merge request easycorp/zentaopms!1908
|
2022-02-23 08:11:28 +00:00 |
|
|
tanghucheng
|
f057a1b832
|
* Finish task #49375.
|
2022-02-23 15:50:46 +08:00 |
|
|
zhengrunyu
|
599e94d578
|
* Fixbug 19911.
|
2022-02-23 14:12:39 +08:00 |
|
|
周旭东
|
7d6fa23ced
|
Update taskkanban.html.php
|
2022-02-23 05:29:00 +00:00 |
|
|
周旭东
|
177b6005f3
|
Update taskkanban.html.php
|
2022-02-23 05:28:31 +00:00 |
|
|
周旭东
|
8b494a429d
|
Update kanban.html.php
|
2022-02-23 05:27:17 +00:00 |
|
|
周旭东
|
ede11fedbe
|
Update kanban.html.php
|
2022-02-23 05:21:05 +00:00 |
|
|
周旭东
|
f134c0d63b
|
Merge branch 'sprint/185' into 'sprint/185_zxd_49696'
# Conflicts:
# module/execution/view/kanban.html.php
|
2022-02-23 05:17:54 +00:00 |
|
|
李玉春
|
e637d830ee
|
Merge branch 'sprint/185' into 'sprint/185_zxd_49693'
# Conflicts:
# module/execution/js/kanban.js
# module/execution/view/kanban.html.php
|
2022-02-23 05:08:23 +00:00 |
|
|
zhengrunyu
|
269ac9742e
|
* Fix bug 19890 19891.
|
2022-02-23 10:37:23 +08:00 |
|
|
zhouxudong
|
eb3894a900
|
* Finish task #49693.
|
2022-02-23 09:58:03 +08:00 |
|
|
李玉春
|
9405f7bf71
|
Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
# db/update16.4.sql
# module/user/view/story.html.php
|
2022-02-23 01:33:37 +00:00 |
|
|
zhengrunyu
|
51db3536d7
|
*Code bug.
|
2022-02-23 09:04:01 +08:00 |
|
|
zhengrunyu
|
d04ff0a6d9
|
* Finish task 49306.
|
2022-02-23 09:00:37 +08:00 |
|
|
zhouxudong
|
d3d29e78b1
|
* Finish task #49693.
|
2022-02-22 17:41:44 +08:00 |
|
|
李玉春
|
2f548dce80
|
Merge branch 'sprint/185_zhengrunyu_49694' into 'sprint/185'
*Finish task 49694 49695.
See merge request easycorp/zentaopms!1886
|
2022-02-22 08:35:39 +00:00 |
|
|
zhengrunyu
|
c9685d4441
|
*Finish task 49694 49695.
|
2022-02-22 15:52:32 +08:00 |
|
|
zhujinyong
|
49af622fd8
|
* Move exit to return.
|
2022-02-22 14:25:14 +08:00 |
|
|
zhujinyong
|
5a334ccb86
|
* Fix bug: return error.
|
2022-02-22 09:26:31 +08:00 |
|
|
zhujinyong
|
b17c3c8206
|
* Move die to return print.
|
2022-02-22 08:42:32 +08:00 |
|
|
zhouxudong
|
15ea32151f
|
* Finish task #19696.
|
2022-02-21 14:22:17 +08:00 |
|
|
孙广明
|
ffbbfe417f
|
Merge branch 'sprint/185' into 'sprint/185_zhangzilong_49284'
# Conflicts:
# db/update16.4.sql
|
2022-02-18 06:23:22 +00:00 |
|
|
zhangzilong
|
4e84e5cbd7
|
* Finish task #49284.
|
2022-02-17 17:35:11 +08:00 |
|
|
zhengrunyu
|
069f009b6d
|
*Finish task 49283
|
2022-02-17 14:34:11 +08:00 |
|
|
zhujinyong
|
d02ddc138c
|
Merge branch 'lite' into sprint/185
|
2022-02-17 10:20:50 +08:00 |
|
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|
|
tanghucheng
|
8104870b83
|
* code for task #49080.
|
2022-02-16 15:11:44 +08:00 |
|
|
李玉春
|
459f6a2076
|
Merge branch 'master' into 'sunhuawei_fixbug_19247'
# Conflicts:
# module/execution/css/story.css
|
2022-02-15 05:41:51 +00:00 |
|
|
周旭东
|
117a240287
|
Update kanban.html.php
|
2022-02-15 05:13:13 +00:00 |
|
|
zhouxudong
|
bc31a203ae
|
*Fix bug #19343.
|
2022-02-15 10:45:33 +08:00 |
|
|
zhouxudong
|
c21f887cbc
|
*Fix bug #18593.
|
2022-02-14 17:11:05 +08:00 |
|
|
孙华伟
|
77210ab767
|
Fix bug #19435.
|
2022-02-14 17:09:23 +08:00 |
|
|
李玉春
|
bc643436ab
|
Merge branch 'sprint/fixbug_zxd_19424' into 'master'
Fix bug #19424.
See merge request easycorp/zentaopms!1776
|
2022-02-14 06:58:21 +00:00 |
|
|
周旭东
|
a50c77de55
|
Update control.php
|
2022-02-14 05:20:41 +00:00 |
|
|
liyuchun
|
5583b62fc9
|
Merge branch 'devops21'
|
2022-02-14 10:20:11 +08:00 |
|
|
孙华伟
|
db37a2ea85
|
Fix bug #19435.
|
2022-02-14 10:07:49 +08:00 |
|
|
孙华伟
|
1a494d0329
|
Fix bug #19435.
|
2022-02-14 09:32:47 +08:00 |
|
|
zhouxudong
|
090905f628
|
Fix bug #19424.
|
2022-02-14 08:42:51 +08:00 |
|
|
孙华伟
|
ef8e2c049b
|
*Fix bug 19435.
|
2022-02-11 17:39:30 +08:00 |
|