Commit Graph
30572 Commits
Author SHA1 Message Date
mayue 8c6e0fabfb * Modify code #16987. 2021-12-02 09:44:12 +08:00
mayue 07f8a820b0 * Code format #16987. 2021-12-02 09:28:02 +08:00
mayue 63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08:00
mayue eec94fd383 * Fix bug #16936. 2021-12-01 17:14:43 +08:00
liyuchun e44737b3b3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-01 16:48:31 +08:00
liyuchun f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
tianshujie 64cac6374b * The plan is blank when switching branches. 2021-12-01 16:39:10 +08:00
liyuchun d11f6e9b6f * Fix bug #16901. 2021-12-01 16:29:36 +08:00
王怡栋 04e16ded07 Merge branch 'sprint/168_sunhao/improve_kanban' into 'master'
* Update kanban lib and zui lib.

See merge request easycorp/zentaopms!705
2021-12-01 08:02:17 +00:00
Hao Sun fb109d767f * update zui lib to fix $.zui.getScrollbarSize undefined. 2021-12-01 16:01:11 +08:00
liyuchun 1eb3e7ec98 * Fix bug #16903. 2021-12-01 15:50:30 +08:00
liyuchun 766fbdbb1c * Fix bug #16893. 2021-12-01 15:35:32 +08:00
liyuchun 38038eb3ad * Fix bug #16956. 2021-12-01 15:12:44 +08:00
孙广明 5fb26df4f7 Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Modify code #44987,44988,44989.

See merge request easycorp/zentaopms!712
2021-12-01 07:03:56 +00:00
liyuchun cfd5455a58 * Fix error when has no gitlab. 2021-12-01 15:03:28 +08:00
mayue a2dc25af7c * Code format. 2021-12-01 15:02:12 +08:00
mayue fc0834cadb * Modify code #44987,44988,44989. 2021-12-01 14:58:20 +08:00
孙广明 5f4896b12e Merge branch 'sprint/master_tanghucheng_for_max' into 'master'
* Code for task #45101.

See merge request easycorp/zentaopms!711
2021-12-01 06:57:34 +00:00
tanghucheng 8164998a64 * Code task #45101. 2021-12-01 14:56:45 +08:00
孙广明 9ba661dafa Merge branch 'sprint/29_zhouxin_45111' into 'master'
Finish task #45111.

See merge request easycorp/zentaopms!679
2021-12-01 06:51:36 +00:00
李玉春 340765cf74 Merge branch 'sprint/174_tianshujie_16980' into 'master'
* Fix bug #16980.

See merge request easycorp/zentaopms!710
2021-12-01 06:41:18 +00:00
liyuchun 0c66d3c5b8 * Fix error when no gitlab. 2021-12-01 14:40:49 +08:00
tianshujie 59dc2b1cce * Fix bug #16980. 2021-12-01 14:39:18 +08:00
tanghucheng df91b19a57 * Code for task #45101. 2021-12-01 14:24:32 +08:00
李玉春 2fc75a1dd4 Merge branch 'sprint/174_songchenxuan_45039' into 'master'
* Finish task #45039.

See merge request easycorp/zentaopms!704
2021-12-01 06:24:25 +00:00
李玉春 d258b05fd4 Merge branch 'sprint/174_songchenxuan_16798' into 'master'
* Fix bug #16798.

See merge request easycorp/zentaopms!708
2021-12-01 06:23:41 +00:00
李玉春 85a6828a2e Merge branch 'sprint/174_tianshujie_16801' into 'master'
* Fix bug #16801.

See merge request easycorp/zentaopms!703
2021-12-01 06:23:17 +00:00
李玉春 3d8fc0dcfe Merge branch 'sprint/174_tianshujie_16977' into 'master'
* Fix bug #16977.

See merge request easycorp/zentaopms!706
2021-12-01 06:21:29 +00:00
李玉春 876af8d939 Merge branch 'sprint/174_tianshujie_16973' into 'master'
* Fix bug #16973.

See merge request easycorp/zentaopms!707
2021-12-01 06:18:36 +00:00
李玉春 16f81f5b8a Merge branch 'sprint/174_tianshujie_16781' into 'master'
* Fix bug #16781.

See merge request easycorp/zentaopms!702
2021-12-01 06:17:55 +00:00
songchenxuan 98b5a77754 * Fix bug #16798. 2021-12-01 14:16:24 +08:00
tianshujie e73b8d316c * Fix bug #16973. 2021-12-01 14:15:20 +08:00
liyuchun aa118473b2 * Fix bug #16893. 2021-12-01 14:14:06 +08:00
tianshujie e74dd9ad80 * Fix bug #16977. 2021-12-01 14:05:59 +08:00
liyuchun 1af877e1e1 * Fix bug #16954. 2021-12-01 14:03:47 +08:00
王怡栋 9286434da5 * code for task #45297. 2021-12-01 13:59:25 +08:00
Hao Sun 76a1e73851 * update zui lib. 2021-12-01 13:58:51 +08:00
Hao Sun b6358da39f * update kanban lib. 2021-12-01 13:57:59 +08:00
liyuchun 85c9e94e53 Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-12-01 13:57:46 +08:00
liyuchun bdccb46405 * Fix bug #16918. 2021-12-01 13:57:33 +08:00
zenggang 342d52f1e5 * Adjust mr create js code 2021-12-01 05:56:55 +00:00
liyuchun c8c954a3fd * Fix bug #16911. 2021-12-01 13:53:13 +08:00
liyuchun 9deab6a19a Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-12-01 13:47:11 +08:00
liyuchun b91bd45f85 * Fix bug #16903. 2021-12-01 13:46:48 +08:00
songchenxuan 839ee66e77 * Finish task #45039. 2021-12-01 13:41:01 +08:00
zenggang deb6809979 * Fix bug#16916 2021-12-01 05:40:22 +00:00
tianshujie 2d251fb452 * Fix bug #16801. 2021-12-01 13:37:54 +08:00
tianshujie ac27fd80d8 * Fix bug #16781. 2021-12-01 13:30:10 +08:00
李玉春 4b37f6b83b Merge branch 'sprint/174_songchenxuan_45040' into 'master'
* Finish task #45040.

See merge request easycorp/zentaopms!684
2021-12-01 05:24:23 +00:00
李玉春 686d773f0b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!692
2021-12-01 05:23:47 +00:00