Commit Graph
31954 Commits
Author SHA1 Message Date
孙广明 40d0b988d7 Merge branch 'sprint/179_tianshujie_bug' into 'master'
Sprint/179 tianshujie bug

See merge request easycorp/zentaopms!1121
2021-12-23 08:59:45 +00:00
tianshujie 827b4ed3b5 * Fix bug #17694. 2021-12-23 16:56:33 +08:00
孙广明 b603c6186e Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Modify css style.

See merge request easycorp/zentaopms!1120
2021-12-23 08:53:50 +00:00
liumengyi e04d64126a * Modify css style. 2021-12-23 16:51:54 +08:00
tianshujie 2cda67d63e * Fix bug #17892,#17899. 2021-12-23 16:35:31 +08:00
孙广明 129bf0e524 Merge branch 'sprint/179_zhengrunyu_codecard' into 'master'
*Code english title wrap.

See merge request easycorp/zentaopms!1111
2021-12-23 08:31:05 +00:00
孙广明 a967a70574 Merge branch 'sprint/178_hufangzhou_tutorial' into 'master'
* Fix bug #17447.

See merge request easycorp/zentaopms!1117
2021-12-23 08:28:58 +00:00
孙广明 50315f2bf3 Merge branch 'sprint/179_tianshujie_bug' into 'master'
Sprint/179 tianshujie bug

See merge request easycorp/zentaopms!1118
2021-12-23 08:15:11 +00:00
李玉春 97d3de7b7e Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17890, #17888.

See merge request easycorp/zentaopms!1115
2021-12-23 08:12:59 +00:00
tianshujie fe9c5aeaf1 * Fix the problem of creating a region error. 2021-12-23 16:10:03 +08:00
tianshujie fb1027b47d * Fix bug #17898. 2021-12-23 15:54:41 +08:00
liumengyi 7f2eb13792 * Fix bug for #17894. 2021-12-23 15:50:20 +08:00
hufangzhou 9c31edcd60 * Fix bug #17447. 2021-12-23 15:35:19 +08:00
tianshujie 090194c8ba * Fix bug #17892. 2021-12-23 15:29:39 +08:00
zhujinyong f2e9a6c7a0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-23 15:28:03 +08:00
zhujinyong abe71da613 * Fix apistruct. 2021-12-23 15:27:46 +08:00
liumengyi 8856fcd785 * Fix bug #17894. 2021-12-23 15:27:06 +08:00
tianshujie 56fc6f64ff * Fix bug #17889,#17870. 2021-12-23 15:16:06 +08:00
liyuchun 178a45b6b5 Merge branch 'devops17' 2021-12-23 15:15:21 +08:00
liumengyi 13f0ca9cb4 * Fix bug #17890, #17888. 2021-12-23 15:14:49 +08:00
王怡栋 ec958d5f90 Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Fix errors.

See merge request easycorp/zentaopms!1114
2021-12-23 07:07:03 +00:00
liyuchun da283574bb * Fix errors. 2021-12-23 15:04:53 +08:00
李玉春 e1ddc3f664 Merge branch 'devops17_wangyidong_bug' into 'devops17'
* fix error for get repo by url.

See merge request easycorp/zentaopms!1113
2021-12-23 07:02:25 +00:00
孙广明 6e8f173eda Merge branch 'sprint/178_mayue_17638' into 'master'
* Fix a bug #17638.

See merge request easycorp/zentaopms!1108
2021-12-23 06:56:01 +00:00
王怡栋 9874145789 * fix error for get repo by url. 2021-12-23 14:55:19 +08:00
孙广明 6540fb4f0f Merge branch 'sprint/179_sunhao/kanban_ui' 2021-12-23 14:54:26 +08:00
孙广明 146a19fbac Merge branch 'master' into 'sprint/179_sunhao/kanban_ui'
# Conflicts:
#   module/kanban/js/view.js
2021-12-23 06:54:14 +00:00
zhengrunyu ae99db15f2 *Code english title wrap. 2021-12-23 14:40:41 +08:00
Hao Sun bf7da44094 * fix kanban header affix not work in fullscreen mode. 2021-12-23 14:40:39 +08:00
mayue be1671c243 * Modify the code. 2021-12-23 14:34:44 +08:00
孙广明 2b387708f2 Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17882.

See merge request easycorp/zentaopms!1110
2021-12-23 06:29:49 +00:00
孙广明 da2eeed0bf Merge branch 'sprint/179_zhengrunyu_codecard' into 'master'
adjust card color and margin.

See merge request easycorp/zentaopms!1109
2021-12-23 06:28:46 +00:00
tianshujie a9c8d74b72 * Fix bug #17882. 2021-12-23 14:26:46 +08:00
zhengrunyu 571baaccce adjust card color and margin. 2021-12-23 14:25:39 +08:00
Hao Sun f3b3fc93aa * limit kanban card height. 2021-12-23 14:20:13 +08:00
孙广明 c47057a387 Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug for view card.

See merge request easycorp/zentaopms!1107
2021-12-23 06:17:56 +00:00
liumengyi 32927f78c5 * Fix bug for view card. 2021-12-23 14:15:29 +08:00
mayue f8f763f9dd * Fix a bug #17638. 2021-12-23 14:15:27 +08:00
Hao Sun a8d5863b6b * adjust space for kanban layout. 2021-12-23 14:15:15 +08:00
李玉春 3e1b811de9 Merge branch 'sgm_kanbanstyle' into 'master'
* Adjust kanban style.

See merge request easycorp/zentaopms!1106
2021-12-23 06:05:45 +00:00
孙广明 416e541d8d Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug for create column menu.

See merge request easycorp/zentaopms!1103
2021-12-23 06:03:13 +00:00
孙广明 9622540b60 Merge branch 'sprint/178_songchenxuan_46099_fixbug' into 'master'
*Fix task #46099 bug.

See merge request easycorp/zentaopms!1102
2021-12-23 06:03:01 +00:00
王怡栋 8b14f70b30 Merge branch 'devops17_caoyanyi_test' into 'devops17'
Devops17 caoyanyi test

See merge request easycorp/zentaopms!1104
2021-12-23 06:02:46 +00:00
孙广明 b65c22407f Merge branch 'sprint/178_hufangzhou_mergetBranchStyle' into 'master'
* Adjust the merge branch page style.

See merge request easycorp/zentaopms!1105
2021-12-23 06:02:41 +00:00
孙广明 007dd4f43c * Adjust kanban style. 2021-12-23 14:01:37 +08:00
hufangzhou 897f930f48 * Adjust the merge branch page style. 2021-12-23 14:01:25 +08:00
caoyanyi 8ebdeefebf * Add auth and language. 2021-12-23 05:59:54 +00:00
caoyanyi e2f5ad2385 * Modify empty validate. 2021-12-23 05:59:42 +00:00
Hao Sun af81e6bb78 * enable kanban sortable in fullscreen mode. 2021-12-23 13:51:44 +08:00
liumengyi 3e3fe0543c * Remove useless code. 2021-12-23 13:50:04 +08:00