Commit Graph
852 Commits
Author SHA1 Message Date
孙广明 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
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
liumengyi 221909550d * Kanban whitelist can only be selected from space whitelist. 2022-01-27 12:58:12 +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
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
liumengyi 56be31302b * Fix bug #19063. 2022-01-27 10:18:07 +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
李玉春 f9568b59ba Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1654
2022-01-27 00:37:31 +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
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
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
孙广明 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
李玉春 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
孙广明 fbaace7761 Merge branch 'sprint/183_tianshujie_bug' into 'master'
* Fix bug #19003.

See merge request easycorp/zentaopms!1642
2022-01-26 05:12:38 +00:00
孙广明 12859c9e8d * Fix en lang for set column width. 2022-01-26 13:11:47 +08:00
tianshujie 95ca9fbc52 * Fix bug #19003. 2022-01-26 11:02:48 +08:00
孙广明 5d10caf48f * Fix bug. 2022-01-26 11:02:13 +08:00
孙广明 24e404cde0 Merge branch 'sprint/183_zhouxin_18843' into 'master'
Sprint/183 zhouxin 18843

See merge request easycorp/zentaopms!1636
2022-01-26 02:41:03 +00:00
zhouxin 4284a2331f Change blackButton to btnColor. 2022-01-26 02:40:18 +00:00
孙广明 f8a7b87bb8 Merge branch 'sprint/183_liumengyi_18987' into 'master'
* Fix bug #18993.

See merge request easycorp/zentaopms!1634
2022-01-26 02:37:27 +00:00
孙广明 3317e04ce6 Merge branch 'sprint/183_mayue_18961' into 'master'
* Fix bug #18961.

See merge request easycorp/zentaopms!1635
2022-01-26 02:37:02 +00:00
xieqiyu 5df559c0dc * Fix bug#18991. 2022-01-26 10:34:18 +08:00
xieqiyu 0b9e65b245 * Fix bug#18983. 2022-01-26 10:27:50 +08:00
mayue cf8da1955d * Fix bug #18961. 2022-01-26 10:21:28 +08:00
liumengyi a596a19a98 * Fix bug #18993. 2022-01-26 10:15:06 +08:00
xieqiyu 8f843697f2 * Fix bug#18989. 2022-01-26 10:11:59 +08:00
zhouxin 2b284939d5 Fix bug #18845. 2022-01-26 01:59:31 +00:00
孙广明 42238429ce Merge branch 'sprint/183_liumengyi_18987' into 'master'
* Fix bug #18987.

See merge request easycorp/zentaopms!1630
2022-01-26 01:52:14 +00:00
孙广明 24a5707ce3 Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
* Adjust classic mode.

See merge request easycorp/zentaopms!1629
2022-01-26 01:51:47 +00:00
liumengyi e079baf12a * Fix bug #18987. 2022-01-26 09:49:49 +08:00