孙广明
|
7ba3ed1dfc
|
Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.
See merge request easycorp/zentaopms!1980
|
2022-02-25 05:26:24 +00:00 |
|
zhengrunyu
|
b641170d85
|
* Fix bug 19941 19923 19922 19787.
|
2022-02-25 11:01:31 +08:00 |
|
孙广明
|
39c8e0a2e7
|
Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong
See merge request easycorp/zentaopms!1957
|
2022-02-24 08:09:43 +00:00 |
|
zhouxudong
|
88163d846f
|
* Fix bug .
|
2022-02-24 15:22:12 +08:00 |
|
孙广明
|
f785af25c3
|
Merge branch 'sprint/186_tianshujie_fixbug' into 'sprint/185'
Sprint/186 tianshujie fixbug
See merge request easycorp/zentaopms!1946
|
2022-02-24 05:38:40 +00:00 |
|
王怡栋
|
56969ec4e3
|
Merge branch 'sprint/185_tanghucheng_fixbug' into 'sprint/185'
* Finish task #49376,49365,49366.
See merge request easycorp/zentaopms!1937
|
2022-02-24 05:05:25 +00:00 |
|
tianshujie
|
22147a542c
|
* Fix Kanban import bug menu error.
|
2022-02-24 11:02:55 +08:00 |
|
tanghucheng
|
57047bb2eb
|
* Finish task #49376,49365,49366.
|
2022-02-24 09:49:59 +08:00 |
|
李玉春
|
a04e4ec1d6
|
Merge branch 'sprint/185_zxd_49301' into 'sprint/185'
* Finish task #49301.
See merge request easycorp/zentaopms!1931
|
2022-02-24 00:42:27 +00:00 |
|
李玉春
|
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 |
|
孙华伟
|
e78a9cc05a
|
*Story #30529.
|
2022-02-23 17:17:28 +08:00 |
|
孙华伟
|
51e54dcf74
|
*Story #30529.
|
2022-02-23 17:15:56 +08:00 |
|
王怡栋
|
189158dabd
|
Merge branch 'sprint/185_fixbug_wangyidong' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_fixbug_wangyidong
|
2022-02-23 17:01:24 +08:00 |
|
王怡栋
|
f34bce05bf
|
* code for task #49401.
|
2022-02-23 17:00:55 +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 |
|
zhouxudong
|
0b891f21b6
|
* Finish task #49301.
|
2022-02-23 15:33:24 +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 |
|
李玉春
|
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 |
|
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 |
|
zhouxudong
|
15ea32151f
|
* Finish task #19696.
|
2022-02-21 14:22:17 +08:00 |
|
zhengrunyu
|
069f009b6d
|
*Finish task 49283
|
2022-02-17 14:34:11 +08: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 |
|
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 |
|
孙华伟
|
ef8e2c049b
|
*Fix bug 19435.
|
2022-02-11 17:39:30 +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 |
|
sgm0422
|
4f3c4dbdae
|
* Fix bug #19048.
|
2022-01-27 08:32:36 +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 |
|
孙广明
|
2530d27f0b
|
* Fix bug #18972.
|
2022-01-26 10:14:30 +08:00 |
|