zhouxudong
|
97e5aab33c
|
* Fix bug #19917.
|
2022-02-23 16:37:44 +08:00 |
|
zhengrunyu
|
599e94d578
|
* Fixbug 19911.
|
2022-02-23 14:12:39 +08: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 |
|
孙广明
|
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 |
|
孙广明
|
9748e70a31
|
* Fix bug #19356.
|
2022-02-10 09:37:34 +08:00 |
|
孙广明
|
531ec207f8
|
Merge branch 'sprint/fixbug_18593' into 'master'
Sprint/fixbug 18593
See merge request easycorp/zentaopms!1727
|
2022-02-08 08:17:22 +00:00 |
|
zhouxudong
|
a7a720e66d
|
*Fix bug #18593.
|
2022-02-08 14:13:24 +08:00 |
|
zhouxudong
|
41c4f7135f
|
*Fix bug #18593.
|
2022-02-08 09:08:15 +08:00 |
|
tanghucheng
|
83632f916d
|
* Fix bug #19269.
|
2022-02-08 09:01:19 +08:00 |
|
tianshujie
|
0ef9b12a2c
|
* Fix bug #19070.
|
2022-01-27 16:13:13 +08:00 |
|
zhouxin
|
e48be0c1db
|
Fix s bug.
|
2022-01-27 03:11:36 +00:00 |
|
zhujinyong
|
a69e209afa
|
* Fix link for lite.
|
2022-01-27 10:55:50 +08:00 |
|
sgm0422
|
4f3c4dbdae
|
* Fix bug #19048.
|
2022-01-27 08:32:36 +08:00 |
|
liumengyi
|
0cade87855
|
* Fix bug #18999.
|
2022-01-26 11:59:58 +08:00 |
|
李玉春
|
8bff3489c8
|
Merge branch 'sgm_47983' into 'master'
* Fix bug #18972.
See merge request easycorp/zentaopms!1633
|
2022-01-26 02:39:03 +00:00 |
|
孙广明
|
7f6a737d82
|
* Fix details.
|
2022-01-26 10:26:52 +08:00 |
|
孙广明
|
6cf044da20
|
* Fix details.
|
2022-01-26 10:26:18 +08:00 |
|
孙广明
|
967553b646
|
* Fix code details.
|
2022-01-26 10:16:53 +08:00 |
|
孙广明
|
2530d27f0b
|
* Fix bug #18972.
|
2022-01-26 10:14:30 +08:00 |
|
tianshujie
|
8dcd1a0e4c
|
* Fix the problem of error reporting and button dividing line.
|
2022-01-26 09:02:16 +08:00 |
|
李玉春
|
bde3d0ef34
|
Merge branch 'master' into 'sgm_47983'
# Conflicts:
# module/kanban/css/common.css
# module/kanban/css/view.css
|
2022-01-25 09:16:04 +00:00 |
|
tianshujie
|
9550c947ef
|
* Fix bug #18773.
|
2022-01-25 16:54:37 +08:00 |
|