Commit Graph

1238 Commits

Author SHA1 Message Date
李玉春
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
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
孙广明
e797653a34 * Finish task #47983. 2022-01-25 16:35:42 +08:00
tianshujie
c56ecee795 * Fix bug #18910,18762. 2022-01-25 14:47:51 +08:00
tianshujie
f7d58603fa * Fix bug #18944,18947,18946. 2022-01-25 14:05:23 +08:00
孙广明
2ec4e43353 Merge branch 'sprint/183_tianshujie_18838' into 'master'
* Fix bug #18838.

See merge request easycorp/zentaopms!1591
2022-01-25 03:20:31 +00:00
tianshujie
7001f6c2d5 * Fix bug #18838. 2022-01-25 11:16:14 +08:00
liumengyi
571f530460 * Fix bug #18936, #18924. 2022-01-25 11:03:05 +08:00
孙广明
c48452ae1a Merge branch 'sprint/183_liumengyi_18883' into 'master'
* Finish task 18883,add project team.

See merge request easycorp/zentaopms!1575
2022-01-24 09:25:29 +00:00
liumengyi
b6b895bb87 * Modify how the creator is appended to team members. 2022-01-24 17:20:38 +08:00
tianshujie
67e57e26b7 * Modify the format. 2022-01-24 16:27:57 +08:00
tianshujie
281885f598 * Fix bug #18848. 2022-01-24 16:24:52 +08:00
liumengyi
c3b7172f24 * Fix bug #18883. 2022-01-24 15:23:17 +08:00
liumengyi
1353d674c7 * Fix bug #18883 and #18891. 2022-01-24 14:19:35 +08:00
tianshujie
3f15a1e016 * Fix bug #18806. 2022-01-21 15:04:25 +08:00
孙广明
c40034f942 Merge branch 'master' into 'sprint/183_liumengyi_fixbug'
# Conflicts:
#   module/execution/js/kanban.js
2022-01-21 05:57:10 +00:00
liumengyi
80da12fc7d * Finish task#48008 and fix bug for 48011. 2022-01-21 13:49:47 +08:00
tianshujie
fe23db6218 * Finish task #48012. 2022-01-21 12:23:38 +08:00
孙广明
8c2bd2386d Merge branch 'sprint/183_liumengyi_48012_bug' into 'master'
* Finish task #48012.

See merge request easycorp/zentaopms!1535
2022-01-21 02:52:33 +00:00
liumengyi
02c47ead7c * Finish task #48012. 2022-01-21 10:39:54 +08:00
孙广明
9011d2f61b Merge branch 'sprint/183_tianshujie_48012' into 'master'
Sprint/183 tianshujie 48012

See merge request easycorp/zentaopms!1528
2022-01-21 01:16:16 +00:00
tianshujie
bd99d3def9 * Realize the partial refresh function of the story card. 2022-01-20 17:35:49 +08:00
liumengyi
3ec206f626 * Finish task #48012.Add the bug smooth refresh of create, batchcreate, confiremBug,resolve. 2022-01-20 17:07:03 +08:00