Commit Graph
31969 Commits
Author SHA1 Message Date
hufangzhou e28dfd6879 * Add the zentao api lib for install. 2021-12-24 11:08:10 +08:00
hufangzhou 8b82566999 * Fix bug #17924. 2021-12-24 10:53:15 +08:00
hufangzhou 1aeccfed43 * Fix bug #17919. 2021-12-24 10:47:30 +08:00
hufangzhou be2d532c77 * Add the zentao api lib for upgrade. 2021-12-24 09:33:45 +08:00
李玉春 76821df642 Merge branch 'sprint/178_hufangzhou_17903' into 'master'
* Fix bug #17903.

See merge request easycorp/zentaopms!1125
2021-12-23 09:55:10 +00:00
hufangzhou 5a8966c8e8 * Fix bug #17903. 2021-12-23 17:28:29 +08:00
朱金勇 53eb9cd702 Merge branch 'sprint/178_songchenxuan_17399' into 'master'
*Fix bug #17399.

See merge request easycorp/zentaopms!1123
2021-12-23 09:19:39 +00:00
songchenxuan 5e8b17d6df *Fix bug #17399. 2021-12-23 17:11:35 +08:00
王怡栋 0c1ef02491 Merge branch 'sprint/liyuchun_devops' into 'master'
* Add unit testcase of delete tag.

See merge request easycorp/zentaopms!1122
2021-12-23 09:03:46 +00:00
zhujinyong a5cb10a6da Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-23 17:01:43 +08:00
liyuchun f13fbc6f5b * Add unit testcase of apiDeleteTag. 2021-12-23 17:01:30 +08:00
zhujinyong 8efde58482 Merge branch 'sprint/178_songchenxuan_17682' 2021-12-23 17:01:30 +08:00
liyuchun aba26e05ac * Add unit testcase of delete tag. 2021-12-23 17:00:24 +08:00
孙广明 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
songchenxuan 2507b9ba75 *Fix bug 17682. 2021-12-23 16:24:11 +08: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
songchenxuan 47d7d7a92d *Fix bug #17682. 2021-12-23 15:24:23 +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