Commit Graph
28582 Commits
Author SHA1 Message Date
李玉春 b7c97339c2 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug for kanban space view.

See merge request easycorp/zentaopms!1695
2022-01-28 02:45:10 +00:00
liumengyi e0b4902248 * Fix bug for kanban space view. 2022-01-28 10:27:21 +08:00
zhouxin 716b055fbf Fix bugs. 2022-01-28 02:20:42 +00:00
孙广明 82a5aa5bd7 Merge branch 'sprint/183_zhouxin_fixbugs' into 'master'
Add title for batchcreatecard page.

See merge request easycorp/zentaopms!1692
2022-01-27 08:59:15 +00:00
zhouxin 05e3d863bc Add title for batchcreatecard page. 2022-01-27 08:56:08 +00:00
孙广明 782d56e068 Merge branch 'tianshujie_19109' into 'master'
* Fix bug #19109.

See merge request easycorp/zentaopms!1690
2022-01-27 08:44:09 +00:00
tianshujie cb68227989 * Fix bug #19109. 2022-01-27 16:42:07 +08:00
孙广明 afc4c18584 Merge branch 'sprint/183_hufangzhou_PROtoBIZ' into 'master'
* Change the PRO to BIZ.

See merge request easycorp/zentaopms!1687
2022-01-27 08:41:55 +00:00
tianshujie 0ef9b12a2c * Fix bug #19070. 2022-01-27 16:13:13 +08:00
孙广明 96af22c4a2 Merge branch 'Fixbug_zhengrunyu_' into 'master'
*add padding for finish label.

See merge request easycorp/zentaopms!1686
2022-01-27 07:47:48 +00:00
hufangzhou 5e7c254161 * Change the PRO to BIZ. 2022-01-27 15:47:22 +08:00
zhengrunyu c6e92fb035 *add padding for finish label. 2022-01-27 15:45:49 +08:00
李玉春 e2e6d45dbc Merge branch 'devops20_zenggang' into 'master'
优化合并请求列表api请求数

See merge request easycorp/zentaopms!1680
2022-01-27 07:45:46 +00:00
李玉春 f0c7c87228 Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1683
2022-01-27 07:44:03 +00:00
zenggang 81849859ca * Adjust code 2022-01-27 07:43:46 +00:00
hufangzhou fe653f6438 * Fix bug #19105. 2022-01-27 15:42:53 +08:00
孙广明 827308efe2 * Fix bug. 2022-01-27 15:39:14 +08:00
孙广明 ab273f5720 Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
Sprint/183 xieqiyu fixbug

See merge request easycorp/zentaopms!1677
2022-01-27 07:36:25 +00:00
孙广明 c120d1c85f Merge branch 'sprint/183_tianshujie_19065' into 'master'
* Fix bug #19065.

See merge request easycorp/zentaopms!1682
2022-01-27 07:36:01 +00:00
tianshujie 45cbb3d9d6 * Fix bug #19065. 2022-01-27 15:34:49 +08:00
zenggang f4729ec429 * Adjust code 2022-01-27 07:23:52 +00:00
孙广明 5625fd1152 Merge branch 'Fixbug_zhengrunyu_' into 'master'
*Fix bug for card.

See merge request easycorp/zentaopms!1678
2022-01-27 07:09:30 +00:00
孙广明 0ada39cc38 Merge branch 'sprint/183_mayue_47996' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!1679
2022-01-27 07:09:11 +00:00
mayue 60f1fd01d5 * Optimize code. 2022-01-27 14:59:10 +08:00
zhengrunyu 3f9410f28c *Fix bug for card. 2022-01-27 14:58:08 +08:00
xieqiyu cbaffa5ea9 * Fix bug#19096. 2022-01-27 14:28:06 +08:00
孙广明 bfc0888e77 Merge branch 'sprint/183_hufangzhou_18707' into 'master'
* Fix bug #18707, #18706.

See merge request easycorp/zentaopms!1676
2022-01-27 06:21:10 +00:00
孙广明 0491f40fcd Merge branch 'sprint/183_zhouxin_fixbugs' into 'master'
Adjust code.

See merge request easycorp/zentaopms!1674
2022-01-27 06:19:34 +00:00
hufangzhou 269907c13a * Fix bug #18707, #18706. 2022-01-27 14:17:59 +08:00
xieqiyu 475fc0cf65 * Fix bug#19089. 2022-01-27 14:16:56 +08:00
liumengyi 28a481e82d * Fix bug #19090. 2022-01-27 14:05:23 +08:00
liumengyi 4e54d16ccf * Modify batch create card assignedto users. 2022-01-27 13:53:44 +08:00
zhouxin 9d9b2b1c2b Adjust code. 2022-01-27 05:31:35 +00:00
孙广明 307184ea77 Merge branch 'devops20_liyuchun' into 'master'
* Adjsut unit cases.

See merge request easycorp/zentaopms!1669
2022-01-27 05:04:51 +00:00
liumengyi 221909550d * Kanban whitelist can only be selected from space whitelist. 2022-01-27 12:58:12 +08:00
李玉春 f75a7f592d Merge branch 'devops_cyy_test' into 'master'
* Add testcase.

See merge request easycorp/zentaopms!1668
2022-01-27 03:21:33 +00:00
caoyanyi 894237885c * Adjust code. 2022-01-27 03:20:43 +00:00
李玉春 49bf993b35 Merge branch 'sprint/183_zhouxin_19057' into 'master'
Fix s bug.

See merge request easycorp/zentaopms!1667
2022-01-27 03:20:33 +00:00
liyuchun 4b9ee0cc3c * Adjsut unit cases. 2022-01-27 11:16:10 +08:00
caoyanyi 8e2db7b2cb * Add testcase. 2022-01-27 03:15:48 +00:00
zhouxin e48be0c1db Fix s bug. 2022-01-27 03:11:36 +00:00
孙广明 2993776ce2 Merge branch 'master' into 'Fixbug'
# Conflicts:
#   module/kanban/js/view.js
2022-01-27 03:02:56 +00:00
zhengrunyu 162cf32280 *change name. 2022-01-27 11:00:17 +08:00
zhengrunyu b13ae6cbd4 *change finish card and add status default. 2022-01-27 10:51:28 +08:00
孙广明 9820fd1e1e Merge branch 'sprint/183_mayue_47996' into 'master'
* Modify permissions.

See merge request easycorp/zentaopms!1666
2022-01-27 02:45:30 +00:00
李玉春 5520423d87 Merge branch 'tianshujie_bug_19046' into 'master'
* Fix bug #19046.

See merge request easycorp/zentaopms!1663
2022-01-27 02:43:47 +00:00
mayue 8d4ee4d242 * Modify permissions. 2022-01-27 10:39:17 +08:00
zhengrunyu 5b1a0f4b87 *change finished card and add status default 2022-01-27 10:35:33 +08:00
tianshujie 6ca88e549e * Fix bug #19046. 2022-01-27 10:25:44 +08:00
liumengyi 56be31302b * Fix bug #19063. 2022-01-27 10:18:07 +08:00