Commit Graph
28549 Commits
Author SHA1 Message Date
孙广明 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
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
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
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
zhouxin 5f445bc7d5 Fix bug. 2022-01-26 09:25:08 +00:00
xieqiyu e398afaf88 * Modify pop-up style. 2022-01-26 17:18:54 +08:00
孙广明 049c3ceaf2 * Fix bug. 2022-01-26 17:03:31 +08:00
caoyanyi 9b8743c494 * Modify mr view style. 2022-01-26 08:40:55 +00:00
xieqiyu 341e3c5cdd * Fix bug#19039. 2022-01-26 16:35:35 +08:00
孙广明 8e4e9f6328 Merge branch 'sprint/183_liumengyi_19020' into 'master'
* Fix bug #19028, #19030.

See merge request easycorp/zentaopms!1651
2022-01-26 06:21:02 +00:00
liumengyi dd0ae6c80f * Fix bug #19028, #19030. 2022-01-26 14:19:17 +08:00
tianshujie 927ff878a5 * Fix execution icon. 2022-01-26 14:06:01 +08:00
孙广明 73e61e84f7 Merge branch 'sprint/183_tianshujie_bug' into 'master'
* Adjust style pager.

See merge request easycorp/zentaopms!1649
2022-01-26 06:00:49 +00:00
tianshujie 0f12cdd8aa * Adjust style pager. 2022-01-26 13:59:24 +08:00
孙广明 5eede9c40a Merge branch 'sprint/183_hufangzhou_newVersion' into 'master'
* Rename the function.

See merge request easycorp/zentaopms!1648
2022-01-26 05:59:10 +00:00
hufangzhou 52cbfc7451 * Rename the function. 2022-01-26 13:58:22 +08:00
孙广明 45043790ee Merge branch 'sprint/183_hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!1647
2022-01-26 05:53:27 +00:00
孙广明 94ddacd400 Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
Sprint/183 xieqiyu fixbug

See merge request easycorp/zentaopms!1639
2022-01-26 05:53:04 +00:00
孙广明 d22e4e4b83 Merge branch 'sprint/183_liumengyi_19020' into 'master'
* Fix bug #19020.

See merge request easycorp/zentaopms!1645
2022-01-26 05:51:50 +00:00
xieqiyu e19003ba64 * Fix bug#18995. 2022-01-26 13:50:14 +08:00
hufangzhou b0ab0f8ae4 * Add the new version. 2022-01-26 13:47:00 +08:00
李玉春 7234b58c3f Merge branch 'sgm_fixbug' into 'master'
* Fix details.

See merge request easycorp/zentaopms!1646
2022-01-26 05:38:14 +00:00
liumengyi aba10f0435 * Fix bug #19020. 2022-01-26 13:36:12 +08:00
孙广明 fb7369ce46 * Fix details. 2022-01-26 13:35:48 +08:00
李玉春 7217d5baea Merge branch 'sgm_fixbug' into 'master'
* Fix en lang for set column width.

See merge request easycorp/zentaopms!1644
2022-01-26 05:25:24 +00:00