Commit Graph

1221 Commits

Author SHA1 Message Date
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
tianshujie
25ee419afc * Implement the partial refresh function of the task card. 2022-01-20 15:31:10 +08:00
liumengyi
df8366e1ad * Modify code format. 2022-01-20 14:55:06 +08:00
liumengyi
e2e794c27f * Finish task #48011. 2022-01-20 14:49:16 +08:00
王怡栋
49cf88b669 Merge branch 'sprint/183_tianshujie_48012' into 'master'
* Achieve smooth refresh of completed tasks.

See merge request easycorp/zentaopms!1516
2022-01-20 05:50:27 +00:00
tianshujie
7383bb566d * Modify the question. 2022-01-20 13:49:21 +08:00
tianshujie
ee15a96157 * Achieve smooth refresh of completed tasks. 2022-01-20 13:41:20 +08:00
tianshujie
b22eed4a6d * Fix bug #18783,18780. 2022-01-20 11:15:33 +08:00
孙广明
f30562f520 Merge branch 'sprint/183_zhouxin_47980' into 'master'
Finish task #47980.

See merge request easycorp/zentaopms!1496
2022-01-19 09:32:28 +00:00
朱金勇
4cb8d68e80 Merge branch 'sprint/183_zhouxudong_trans47958' into 'master'
*Finish task #47958.

See merge request easycorp/zentaopms!1497
2022-01-19 06:51:01 +00:00
zhouxudong
a7fa427b91 *Finish task #47958. 2022-01-19 14:29:23 +08:00
zhouxin
919e91b029 Finish task #47980. 2022-01-19 05:51:01 +00:00
liumengyi
cca28df709 * Fix bug and add sql file. 2022-01-19 13:13:08 +08:00
孙广明
fdac2458cb Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18481.

See merge request easycorp/zentaopms!1490
2022-01-19 03:17:59 +00:00
liumengyi
361d245ac6 * Remove useless variables. 2022-01-19 11:13:43 +08:00
liumengyi
2d10aedf4b * Remove useless code. 2022-01-19 09:04:11 +08:00
孙广明
0c17431df8 Merge branch 'sprint/182_tianshujie_18692' into 'master'
* Fix bug #18692.

See merge request easycorp/zentaopms!1491
2022-01-19 01:02:24 +00:00
王怡栋
f3a6122cbe Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1492
2022-01-19 01:01:42 +00:00