Commit Graph
33479 Commits
Author SHA1 Message Date
孙广明 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
孙广明 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
孙广明 2cb945ddea Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #19090.

See merge request easycorp/zentaopms!1675
2022-01-27 06:08:46 +00:00
liumengyi 28a481e82d * Fix bug #19090. 2022-01-27 14:05:23 +08:00
孙广明 5ec7f42fb0 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Modify batch create card assignedto users.

See merge request easycorp/zentaopms!1673
2022-01-27 05:55:48 +00: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
孙广明 d1cc0d0161 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Kanban whitelist can only be selected from space whitelist.

See merge request easycorp/zentaopms!1671
2022-01-27 05:01:27 +00:00
liumengyi 221909550d * Kanban whitelist can only be selected from space whitelist. 2022-01-27 12:58:12 +08:00
李玉春 906f6eadd2 Merge branch 'devops_cyy_test' into 'master'
* Modify test case.

See merge request easycorp/zentaopms!1670
2022-01-27 03:28:06 +00:00
caoyanyi 2c8cf29161 * Modify test case. 2022-01-27 03:26:34 +00: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
sgm0422 141a2c3aa8 Merge branch 'Fixbug' 2022-01-27 11:03:17 +08: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
孙广明 2c659ad107 Merge branch 'sprint/183_liumengyi_19060' into 'master'
* Fix bug #19060.

See merge request easycorp/zentaopms!1664
2022-01-27 02:35:48 +00:00
zhengrunyu 5b1a0f4b87 *change finished card and add status default 2022-01-27 10:35:33 +08:00
liumengyi a7cae5e57f * Fix bug #19060. 2022-01-27 10:32:29 +08:00
tianshujie 6ca88e549e * Fix bug #19046. 2022-01-27 10:25:44 +08:00
孙广明 59ce246424 Merge branch 'sprint/183_liumengyi_19060' into 'master'
* Fix bug #19063.

See merge request easycorp/zentaopms!1662
2022-01-27 02:20:23 +00:00
liumengyi 56be31302b * Fix bug #19063. 2022-01-27 10:18:07 +08:00
孙广明 1bc6ce4832 Merge branch 'sprint/183_liumengyi_19060' into 'master'
* Fix bug #19060.

See merge request easycorp/zentaopms!1661
2022-01-27 02:04:20 +00:00
liumengyi 655b067c0b * Fix bug #19060. 2022-01-27 10:02:21 +08:00
孙广明 c96da59391 Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
Sprint/183 xieqiyu fixbug

See merge request easycorp/zentaopms!1660
2022-01-27 01:12:14 +00:00
xieqiyu d9389586db * Fix bug#19038. 2022-01-27 09:09:16 +08:00
李玉春 d15e1dbf15 Merge branch 'sprint/183_tianshujie_19055' into 'master'
* Fix bug #19055.

See merge request easycorp/zentaopms!1659
2022-01-27 01:08:37 +00:00
tianshujie 169ce62b4a * Fix bug #19055. 2022-01-27 09:06:58 +08:00
xieqiyu 6022f599a9 * Fix bug#19043. 2022-01-27 08:58:07 +08:00
李玉春 f3b82a01e2 Merge branch 'devops20_caoyanyi' into 'master'
* Modify mr view style.

See merge request easycorp/zentaopms!1653
2022-01-27 00:40:22 +00:00
caoyanyi 423b7dd303 * Modify access check. 2022-01-27 00:39:43 +00:00
李玉春 f9568b59ba Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1654
2022-01-27 00:37:31 +00:00
李玉春 723d5e8601 Merge branch 'sgm_colwidth' into 'master'
* Fix bug #19048.

See merge request easycorp/zentaopms!1658
2022-01-27 00:37:12 +00:00
sgm0422 4f3c4dbdae * Fix bug #19048. 2022-01-27 08:32:36 +08:00
孙广明 d17fa1029d Merge branch 'sprint/183_hufangzhou_modalMinHeight' into 'master'
* Set the min height of import modal.

See merge request easycorp/zentaopms!1657
2022-01-27 00:27:50 +00:00
hufangzhou dce9ca9f0e * Set the min height of import modal. 2022-01-26 18:14:22 +08:00
孙广明 541ccdeecb Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
Sprint/183 xieqiyu fixbug

See merge request easycorp/zentaopms!1655
2022-01-26 09:30:22 +00:00
孙广明 27fe8dc420 Merge branch 'sprint/183_zhouxin_19040' into 'master'
Fix bug.

See merge request easycorp/zentaopms!1656
2022-01-26 09:26:55 +00:00