Commit Graph
42710 Commits
Author SHA1 Message Date
王怡栋 31cbe228b3 Merge branch 'sprint/220_tianshujie_bug25448' into 'master'
Sprint/220 tianshujie bug25448

See merge request easycorp/zentaopms!4715
2022-07-28 07:57:35 +00:00
王怡栋 6446c442de Merge branch 'sprint/220_liumengyi_25838' into 'master'
* Fix bug #25838.

See merge request easycorp/zentaopms!4714
2022-07-28 07:53:05 +00:00
tianshujie 744da8aa6b * Fix bug #25448. 2022-07-28 15:52:45 +08:00
王怡栋 a448cae025 Merge branch 'sprint220_zg_23205' into 'master'
* Fix bug#23205,25799

See merge request easycorp/zentaopms!4712
2022-07-28 07:52:38 +00:00
liumengyi 51197d23c9 * Fix bug #25838. 2022-07-28 15:50:52 +08:00
王怡栋 cbd56f4fb7 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4706
2022-07-28 07:50:28 +00:00
zenggang 1b5b6d7e5e * Fix bug#25799 2022-07-28 07:21:35 +00:00
胡方舟 10fd1f9e92 Merge branch 'sprint/220_liumengyi_25806' into 'master'
* Fix bug #25806.

See merge request easycorp/zentaopms!4713
2022-07-28 07:20:20 +00:00
liumengyi e8d7949d25 * Fix bug #25806. 2022-07-28 15:16:06 +08:00
王怡栋 3763cd530f Merge branch 'sprint/hufangzhou_25820' into 'master'
* Fix bug #25820.

See merge request easycorp/zentaopms!4710
2022-07-28 06:58:06 +00:00
王怡栋 ad5a294047 Merge branch 'sprint/220_liumengyi_25812' into 'master'
* Fix bug #25812.

See merge request easycorp/zentaopms!4711
2022-07-28 06:57:44 +00:00
zenggang dfae2ec61f * Fix bug#23205 2022-07-28 06:55:51 +00:00
liumengyi 1553d91324 * Fix bug #25812. 2022-07-28 14:52:53 +08:00
tianshujie c11bae3c96 * Fix bug #25813. 2022-07-28 14:48:14 +08:00
hufangzhou ba2a0bc08f * Fix bug #25820. 2022-07-28 14:46:27 +08:00
王怡栋 36a8fb9deb Merge branch 'sprint/hufangzhou_fixxuan' into 'master'
* Fix xuan.

See merge request easycorp/zentaopms!4708
2022-07-28 06:32:39 +00:00
王怡栋 1c2cc0a5c1 Merge branch 'sprint/220_liumengyi_25814' into 'master'
* Fix bug for change tab.

See merge request easycorp/zentaopms!4709
2022-07-28 06:32:13 +00:00
wangyidong 14534ee6f6 * fix bug #25459. 2022-07-28 14:27:09 +08:00
tianshujie 961de62c13 * Fixed the issue of create and edit kanban page newlines. 2022-07-28 14:21:48 +08:00
liumengyi a7568986c1 * Fix bug for change tab. 2022-07-28 14:21:28 +08:00
zhouxudong 116daf8cd6 * Fix bug. 2022-07-28 06:18:48 +00:00
hufangzhou a6196b5c7b * Fix xuan. 2022-07-28 14:16:33 +08:00
zhouxudong 63bb63d9cf * Fix bug #25417. 2022-07-28 06:15:33 +00:00
王怡栋 4397257ae2 Merge branch 'sprint/master_zhouxudong_25819' into 'master'
* Fix bug #25819.

See merge request easycorp/zentaopms!4704
2022-07-28 05:57:55 +00:00
王怡栋 5ec5c071f3 Merge branch 'sprint/220_tianshujie_fixbug' into 'master'
Sprint/220 tianshujie fixbug

See merge request easycorp/zentaopms!4707
2022-07-28 05:47:21 +00:00
tianshujie dbcb3c9f1b * Fix bug #25465. 2022-07-28 13:44:04 +08:00
tianshujie d515c08c5e * Fix bug #25683. 2022-07-28 13:42:31 +08:00
zhouxudong 409825287f * Fix bug. 2022-07-28 05:41:12 +00:00
tianshujie 6336149a1e * Fix bug #25766. 2022-07-28 13:33:38 +08:00
孙广明 9cffdad887 Merge branch 'sprint/220_liumengyi_25814' into 'master'
* Fix bug #25814.

See merge request easycorp/zentaopms!4703
2022-07-28 05:24:06 +00:00
liumengyi c9753f5490 * Fix bug #25814. 2022-07-28 13:22:32 +08:00
李玉春 580bb4dc22 Merge branch 'cyy_gitea' into 'master'
Cyy gitea

See merge request easycorp/zentaopms!4702
2022-07-28 05:11:07 +00:00
sunguangming 019bf42e4d * Fix bug #25814. 2022-07-28 13:10:11 +08:00
zhouxudong d7606aa700 * Fix bug #25819. 2022-07-28 05:03:24 +00:00
tianshujie 0f75b6ef36 * Fix bug #25808. 2022-07-28 13:03:09 +08:00
caoyanyi abc3542cf3 * Modify repo list. 2022-07-28 13:01:32 +08:00
liumengyi 95c7c2ccfc * Fix bug #25814. 2022-07-28 13:01:06 +08:00
caoyanyi d9b1d038eb * Modify page style and some bug. 2022-07-28 11:31:24 +08:00
孙广明 5477a01f12 Merge branch 'fix_cfd_issue' into 'master'
* Fix cfd issue.

See merge request easycorp/zentaopms!4701
2022-07-28 03:03:09 +00:00
mayue 12fa7ecaec * Fix cfd issue. 2022-07-28 11:01:24 +08:00
王怡栋 6376fb58e0 Merge branch 'sprint/master_zhouxudong_25748' into 'master'
* Fix bug #25748.

See merge request easycorp/zentaopms!4698
2022-07-28 02:05:44 +00:00
王怡栋 9db987f0aa Merge branch 'sprint/220_liumengyi_fixbug' into 'master'
* Finish task #62494, and fix bug #25797.

See merge request easycorp/zentaopms!4699
2022-07-28 02:05:11 +00:00
liumengyi ad763d0fd5 * Optimize code for task #62494. 2022-07-28 10:04:05 +08:00
liumengyi 1375165c73 * Optimize code for task #62494. 2022-07-28 10:02:43 +08:00
liumengyi e13315a151 * Finish task #62494. 2022-07-28 09:57:02 +08:00
liumengyi 60b32e04da * Fix bug #25797. 2022-07-28 09:54:42 +08:00
caoyanyi 558412c237 * Modify repo pull in tmp. 2022-07-28 09:47:10 +08:00
王怡栋 f970d5654b Merge branch 'sprint/hufangzhou_25621' into 'master'
* Fix bug #25621.

See merge request easycorp/zentaopms!4697
2022-07-28 00:53:08 +00:00
王怡栋 d6ea8aea86 Merge branch 'master_xieqiyu_25004' into 'master'
* Fix bug#25004.

See merge request easycorp/zentaopms!4676
2022-07-28 00:52:40 +00:00
zhouxudong 2e6ef972b0 * Fix bug #25748. 2022-07-28 00:47:37 +00:00