Commit Graph
32031 Commits
Author SHA1 Message Date
孙广明 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
Hao Sun 167224d677 * optimize UI for d-n-d in kanban. 2021-12-23 13:47:39 +08:00
liumengyi 126b0f64f2 * Fix bug for create column menu. 2021-12-23 13:42:27 +08:00
zhujinyong d065d6077b * Adjust index page of api. 2021-12-23 13:27:41 +08:00
songchenxuan 2769417a6d *Fix task #46099 bug. 2021-12-23 13:23:47 +08:00
zhujinyong f384cdfb1b * Fix style of api. 2021-12-23 13:21:18 +08:00
孙广明 c6ee25fa52 Merge branch 'sprint/178_mayue_17581' into 'master'
* Fix a bug #17581.

See merge request easycorp/zentaopms!1101
2021-12-23 05:21:01 +00:00
孙广明 105c1ac726 Merge branch 'sprint/178_mayue_17854' into 'master'
* Fix a bug #17854.

See merge request easycorp/zentaopms!1091
2021-12-23 05:20:39 +00:00
mayue b94fc62ca1 * Fix a bug #17581. 2021-12-23 13:16:30 +08:00
孙广明 a3b4bc8cd9 Merge branch 'sprint/178_hufangzhou_17875' into 'master'
* Fix bug #17875.

See merge request easycorp/zentaopms!1100
2021-12-23 05:07:26 +00:00
孙广明 9a2a490e30 Merge branch 'sprint/179_tianshujie_bug' 2021-12-23 13:07:08 +08:00
孙广明 9bfb3c1377 Merge branch 'master' into 'sprint/179_tianshujie_bug'
# Conflicts:
#   module/kanban/js/view.js
2021-12-23 05:06:50 +00:00
hufangzhou 995e01680e * Fix bug #17875. 2021-12-23 13:06:18 +08:00
王怡栋 86f2f47ceb Merge branch 'devops17_caoyanyi_test' into 'devops17'
* Add test case for create mr by api.

See merge request easycorp/zentaopms!1096
2021-12-23 05:02:53 +00:00
孙广明 f0342c9745 Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master'
*Fix card

See merge request easycorp/zentaopms!1098
2021-12-23 04:18:26 +00:00
孙广明 4e6fe7ffd0 Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug for move card.

See merge request easycorp/zentaopms!1099
2021-12-23 04:17:26 +00:00
liumengyi fb904ff0d4 * Fix bug for move card. 2021-12-23 12:09:18 +08:00
zhengrunyu 5e07624939 *Fix card 2021-12-23 12:00:42 +08:00
Hao Sun 6f30a2c477 * fix text color for column title in kanban. 2021-12-23 11:58:41 +08:00
Hao Sun 38ed6e4222 * fix variable name. 2021-12-23 11:58:06 +08:00
tianshujie 63210497d3 * Fix bug #17785,#17743. 2021-12-23 11:43:04 +08:00
孙广明 f5da2d8a21 Merge branch 'sprint/178_hufangzhou_mergeBranch' into 'master'
* Finish task #46096.

See merge request easycorp/zentaopms!1095
2021-12-23 03:32:01 +00:00
hufangzhou e1075ca205 * Finish task #46096. 2021-12-23 11:29:51 +08:00
caoyanyi 6caf242a80 * Add test case for create mr by api. 2021-12-23 03:29:27 +00:00