Commit Graph
28083 Commits
Author SHA1 Message Date
王怡栋 2631dd6743 Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite 2022-01-21 10:40:23 +08:00
Wenrui LI 2702a886da * query group by vision when authorizing user. 2022-01-21 10:18:05 +08:00
王怡栋 634355dce2 Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite 2022-01-20 18:24:11 +08:00
Wenrui LI acbcfb8f52 * filter project by vision for doclib creation. 2022-01-20 14:47:18 +08:00
Wenrui LI 1e715c26f7 * filter docs for all doc block. 2022-01-20 14:26:38 +08:00
Wenrui LI f451f2865b * filter doclib by vision. 2022-01-20 14:22:51 +08:00
王怡栋 31e3b2ed08 Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite 2022-01-20 11:09:56 +08:00
王怡栋 7a409f61be * adjust for lite kanban. 2022-01-20 11:09:00 +08:00
朱金勇 23f87de831 Merge branch 'lite_tanghucheng' into 'lite'
* Finish task #47942.

See merge request easycorp/zentaopms!1507
2022-01-20 00:45:45 +00:00
tanghucheng 59f26f0470 * Finish task #47942. 2022-01-19 17:22:05 +08:00
Wenrui LI 9b78d18465 * tweak group and privs for lite vision, task #47917,47916. 2022-01-19 16:45:58 +08:00
tanghucheng 79e6a7e263 * Finish task #47922. 2022-01-19 15:40:26 +08:00
zhujinyong 3baf9213a2 * Fix rnd vision. 2022-01-19 14:34:55 +08:00
王怡栋 f8e0c430cd * adjust for kanban in lite. 2022-01-19 13:41:29 +08:00
zhujinyong 2e85ff6e08 Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite 2022-01-19 09:08:22 +08:00
zhujinyong 8ed8e31da9 * Fix doc menu for lite. 2022-01-19 09:08:07 +08:00
王怡栋 03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +08:00
hufangzhou 9b139eb1a9 * Fix bug #18687. 2022-01-18 16:24:18 +08:00
tianshujie 29e8966c33 * Fix drag sort issue. 2022-01-18 16:18:15 +08:00
王怡栋 3954c3469d Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1487
2022-01-18 08:11:01 +00:00
孙广明 7299915e89 * Fix bug. 2022-01-18 16:08:13 +08:00
tianshujie daf29be42b * Fix bug #18520. 2022-01-18 16:01:25 +08:00
tianshujie 236ffe6056 * Fix bug #18666. 2022-01-18 15:40:54 +08:00
hufangzhou 0f9fa42664 * Fix bug #18673. 2022-01-18 15:31:10 +08:00
王怡栋 0ea97815a5 Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1482
2022-01-18 07:12:25 +00:00
孙广明 7f278b4c79 * Fix bug. 2022-01-18 15:10:57 +08:00
王怡栋 535340e47d Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18671.

See merge request easycorp/zentaopms!1479
2022-01-18 07:04:39 +00:00
tianshujie eee8de32a9 * Fix bug #18469. 2022-01-18 15:01:38 +08:00
王怡栋 7ad2f4569c Merge branch 'sgm_fixbug' into 'master'
* Fix tutorial bug.

See merge request easycorp/zentaopms!1476
2022-01-18 06:49:05 +00:00
liumengyi c587ac5863 * Fix bug #18671. 2022-01-18 14:46:38 +08:00
孙广明 e3a56327e4 Merge branch 'sprint/182_tianshujie_18664' into 'master'
* Fix bug #18664.

See merge request easycorp/zentaopms!1478
2022-01-18 06:24:06 +00:00
tianshujie f579b6c7b2 * Fix bug #18664. 2022-01-18 14:23:06 +08:00
孙广明 b4438d5b5a Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18665.

See merge request easycorp/zentaopms!1477
2022-01-18 06:20:06 +00:00
liumengyi 18bafcb49d * Fix bug #18665. 2022-01-18 14:19:10 +08:00
孙广明 431f7d100e Merge branch 'xieqiyu_fixbug' into 'master'
* Fix bug: Branch error when click header.

See merge request easycorp/zentaopms!1474
2022-01-18 06:05:48 +00:00
孙广明 b09d6a161b Merge branch 'sprint/182_tianshujie_18663' into 'master'
* Fix bug #18663.

See merge request easycorp/zentaopms!1475
2022-01-18 06:05:34 +00:00
孙广明 50f042f29d * Fix tutorial bug. 2022-01-18 14:04:46 +08:00
tianshujie 0c1ebe9beb * Fix bug #18663. 2022-01-18 14:04:42 +08:00
xieqiyu e35fa62b97 * Fix bug: Branch error when click header. 2022-01-18 14:01:46 +08:00
王怡栋 3c16c97cd7 Merge branch 'sgm_fixbug' into 'master'
* Fix tutorial bug.

See merge request easycorp/zentaopms!1473
2022-01-18 05:59:54 +00:00
孙广明 1b7f4cd8c7 * Fix tutorial bug. 2022-01-18 13:56:05 +08:00
孙广明 9b20857b8b Merge branch 'sprint/182_tianshujie_18643' into 'master'
* Fix bug #18643.

See merge request easycorp/zentaopms!1471
2022-01-18 05:41:01 +00:00
tianshujie 0f26e7d982 * Fix bug #18643. 2022-01-18 13:38:46 +08:00
王怡栋 d19fa0e6ef Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1470
2022-01-18 05:37:41 +00:00
孙广明 c9948abdec * Fix bug. 2022-01-18 13:35:06 +08:00
王怡栋 3f370bad4c Merge branch 'sgm_fixbug' into 'master'
* Fix kanban bug.

See merge request easycorp/zentaopms!1469
2022-01-18 05:25:33 +00:00
孙广明 625f3e6d59 * Fix kanban bug. 2022-01-18 13:24:11 +08:00
孙广明 266341191b Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18629.

See merge request easycorp/zentaopms!1468
2022-01-18 05:21:16 +00:00
liumengyi 42a352dc20 * Fix bug #18629. 2022-01-18 13:18:44 +08:00
liumengyi a7c944d3e5 * Fix bug #18629. 2022-01-18 13:16:20 +08:00