Commit Graph
30583 Commits
Author SHA1 Message Date
liyuchun c3b824d946 * Fix bug #16997. 2021-12-02 09:06:23 +08:00
liyuchun d68810fd4a * Fix bug #16893. 2021-12-02 08:54:51 +08:00
李玉春 fd0fb325fa Merge branch 'sprint/174_songchenxuan_16967' into 'master'
Sprint/174 songchenxuan 16967

See merge request easycorp/zentaopms!713
2021-12-02 00:34:22 +00:00
孙广明 128af31eda Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master'
*Finish task #fixbug.

See merge request easycorp/zentaopms!718
2021-12-02 00:21:59 +00:00
songchenxuan 0e97d5b419 * Fix bug #16967. 2021-12-02 08:17:13 +08:00
孙广明 178af23bb1 Merge branch 'sprint/175_liyuchun_bug' into 'master'
* Fix error.

See merge request easycorp/zentaopms!717
2021-12-02 00:16:15 +00:00
songchenxuan 97b2e63ea0 * Fix bug #16967. 2021-12-02 08:14:58 +08:00
zhengrunyu f274c52e33 *Finish task #fixbug. 2021-12-02 08:14:09 +08:00
李玉春 0b0aa04db1 Merge branch 'sprint/174_tianshujie_issue' into 'master'
* Modify the problem of function demonstration.

See merge request easycorp/zentaopms!714
2021-12-01 09:29:36 +00:00
liyuchun 71d27fc151 * Fix error. 2021-12-01 17:23:44 +08:00
tianshujie 92ad301e29 * Fix bug #16988. 2021-12-01 17:16:52 +08:00
tianshujie 41da1fdb7e * Fix the problem of graying out the maintenance product. 2021-12-01 17:05:45 +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
tianshujie 86ccece2ca * Modify the problem of function demonstration. 2021-12-01 16:32:10 +08:00
liyuchun d11f6e9b6f * Fix bug #16901. 2021-12-01 16:29:36 +08:00
songchenxuan 85ec2d1cc9 * Fix bug #16967. 2021-12-01 16:11:35 +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