Commit Graph

1313 Commits

Author SHA1 Message Date
Zongjun Lan
7add528024 * fix bug 19496 2022-03-07 15:37:27 +08:00
tianshujie
5b2b646db3 * Fix bug #20328. 2022-03-04 16:29:56 +08:00
孙广明
af52c74832 Merge branch 'sprint/186_liumengyi_20293' into 'master'
* Fix bug #20290.

See merge request easycorp/zentaopms!2058
2022-03-03 06:55:22 +00:00
liumengyi
86d19f82f7 * Fix bug #20290. 2022-03-03 14:53:58 +08:00
Zongjun Lan
0512526c23 * fix bug 19713 2022-03-03 10:07:55 +08:00
tianshujie
b1afcd3a6e * Fix bug #20154. 2022-03-01 10:15:29 +08:00
liumengyi
54fe05a303 * Fix bug #20103. 2022-02-28 15:16:36 +08:00
孙广明
8f89f4d64f Merge branch '185_sunhuawei_story_30529' into 'sprint/185'
185 sunhuawei story 30529

See merge request easycorp/zentaopms!1958
2022-02-25 05:45:27 +00:00
孙华伟
68ef9809dd * 2022-02-25 13:37:32 +08:00
孙广明
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
孙华伟
0067119fbe *Fix bug #19959 #19963 2022-02-25 11:08:38 +08:00
孙华伟
47e2415b16 *Fix bug #19959 #19963 . 2022-02-25 11:06:20 +08:00
zhengrunyu
b641170d85 * Fix bug 19941 19923 19922 19787. 2022-02-25 11:01:31 +08:00
孙华伟
e7920e73b4 * 2022-02-25 08:38:25 +08:00
孙广明
32f322ec51 Merge branch 'sprint/186_tianshujie_version' into 'sprint/185'
Sprint/186 tianshujie version

See merge request easycorp/zentaopms!1960
2022-02-24 09:04:10 +00:00
tianshujie
b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +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
8a9824bc98 * Fix bug . 2022-02-24 15:28:01 +08:00
zhouxudong
88163d846f * Fix bug . 2022-02-24 15:22:12 +08:00
孙华伟
890532c727 *Fix bug #19959 #19963. 2022-02-24 15:08:20 +08:00
孙华伟
af6e121c60 * 2022-02-24 14:17:50 +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
zhengrunyu
9f6eb6c7a5 * Remove (). 2022-02-24 11:27:02 +08:00
zhengrunyu
172b62dbfb * Fixbug 19953. 2022-02-24 11:18:44 +08: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
周旭东
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
王怡栋
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
李玉春
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
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