Commit Graph
43232 Commits
Author SHA1 Message Date
孙广明 209ed28c5c Merge branch 'sprint/221_liumengyi_login' into 'master'
* Fix bug for task #62949.

See merge request easycorp/zentaopms!4825
2022-08-05 07:05:46 +00:00
liumengyi 28bd299fee * Fix bug for task #62949. 2022-08-05 15:04:34 +08:00
tanghucheng 5d3b1f4496 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-05 14:59:12 +08:00
tanghucheng 1815b1e2e7 * Code for port. 2022-08-05 14:58:57 +08:00
王怡栋 86693cfb4f Merge branch 'sprint/221_zg_bugs' into 'master'
* Fix sprint211 problems.

See merge request easycorp/zentaopms!4818
2022-08-05 06:48:01 +00:00
王怡栋 8f66bb355b Merge branch 'sprint/master_zhouxudong_bug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4819
2022-08-05 06:46:20 +00:00
王怡栋 d450dcc900 Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #22507.

See merge request easycorp/zentaopms!4822
2022-08-05 06:45:59 +00:00
王怡栋 a1518aaf67 Merge branch 'master_liuhong_25973' into 'master'
*Fix bug #25973

See merge request easycorp/zentaopms!4823
2022-08-05 06:45:43 +00:00
王怡栋 3c7f9c969f Merge branch 'sprint/tianshujie_issue' into 'master'
* Fixed style issues with the story view page.

See merge request easycorp/zentaopms!4824
2022-08-05 06:45:21 +00:00
tianshujie 258ed79ec5 * Fixed style issues with the requirements details page. 2022-08-05 14:43:45 +08:00
zenggang a9fc847711 * Adjust code 2022-08-05 06:37:45 +00:00
tanghucheng 57900cbb5f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-05 14:35:14 +08:00
tanghucheng c679b85139 * Code for showimport. 2022-08-05 14:34:59 +08:00
sunguangming b065484875 * Code for kanban btn. 2022-08-05 14:29:56 +08:00
tianshujie 4d5875072c * Fixed style issues with the story view page. 2022-08-05 14:22:59 +08:00
lanzongjun 8adc70569f fix 2022-08-05 14:21:04 +08:00
liuhong 3f62f19b7f *Fix bug #25973 2022-08-05 06:17:05 +00:00
liumengyi 3ac5869c0f * Fix bug #22507. 2022-08-05 14:01:40 +08:00
王怡栋 12bc9c9e21 Merge branch 'sprint/221_tianshujie_issue' into 'master'
Sprint/221 tianshujie issue

See merge request easycorp/zentaopms!4820
2022-08-05 05:52:40 +00:00
tianshujie 803495a54b * Resolved issue #705,704,703,702. 2022-08-05 13:49:01 +08:00
zhouxudong f6f6dbe5a1 * Fix bug. 2022-08-05 05:34:12 +00:00
wangyidong 7e732dfae7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-05 13:23:25 +08:00
wangyidong 51df481862 * fix for getOptionMenu. 2022-08-05 13:22:57 +08:00
zenggang 262ab9e5cd * Fix sprint211 problems. 2022-08-05 05:19:47 +00:00
孙广明 c7c7d0a3af Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #26033.

See merge request easycorp/zentaopms!4817
2022-08-05 05:16:04 +00:00
liumengyi 05f3985def * Fix bug #26033. 2022-08-05 13:15:17 +08:00
孙广明 d6f9849478 Merge branch 'zhouxin_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4813
2022-08-05 05:15:09 +00:00
liyuchun 6b816acb9e Merge branch 'master' into liyuchun_unittest 2022-08-05 05:13:50 +00:00
liyuchun 809f6510c3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-05 05:12:51 +00:00
liyuchun 02b18d8174 * Fix error of zentao.sql 2022-08-05 05:12:32 +00:00
tanghucheng 3bfdc7d342 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-05 13:07:31 +08:00
tanghucheng a25170b099 * Code for lazyloading. 2022-08-05 13:06:57 +08:00
孙广明 9f323c631a Merge branch 'lyk_26002_25249' into 'master'
Lyk 26002 25249

See merge request easycorp/zentaopms!4816
2022-08-05 03:34:42 +00:00
liuyongkai eef158bcb6 * Fix bug 26002,25249 2022-08-05 03:32:47 +00:00
liuyongkai 697ecffce7 * Fix bug #26002,25249 2022-08-05 03:29:29 +00:00
tianshujie 06304fa5fb * Resolved issue #705. 2022-08-05 11:28:39 +08:00
daitingting ebfbc9df97 * Fix bug #26016. 2022-08-05 03:27:07 +00:00
王怡栋 586474de6c Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #26001, #26033.

See merge request easycorp/zentaopms!4815
2022-08-05 03:19:49 +00:00
liumengyi 1513fb7afb * Fix bug #26001. 2022-08-05 11:14:14 +08:00
liuyongkai 8837c4c100 * Fix bug $26002,25249 2022-08-05 03:08:10 +00:00
liumengyi 54bca1b907 * Fix bug #26033. 2022-08-05 11:01:01 +08:00
王怡栋 351b8f37f5 Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #25978, #25968, #26020.

See merge request easycorp/zentaopms!4814
2022-08-05 02:51:24 +00:00
王怡栋 06031a7f7e Merge branch 'sprint/221_tianshujie_25944' into 'master'
* Fix bug #25944.

See merge request easycorp/zentaopms!4811
2022-08-05 02:50:51 +00:00
liumengyi 175a703f11 * Fix bug #26020. 2022-08-05 10:49:10 +08:00
王怡栋 e74990bd86 Merge branch 'sprint/221_dongli_bug25979' into 'master'
* Fix bug #25979.

See merge request easycorp/zentaopms!4812
2022-08-05 02:49:05 +00:00
tianshujie 926f41277f * Fix bug #25944. 2022-08-05 10:48:08 +08:00
zhouxin a178209d6e * Fix bug. 2022-08-05 02:43:47 +00:00
王怡栋 da4c3895e1 Merge branch 'sprint/221_liumengyi_714' into 'master'
* Fix issue #714,#710, #706.

See merge request easycorp/zentaopms!4809
2022-08-05 02:40:22 +00:00
liumengyi b43a153974 * Fix bug #25978. 2022-08-05 10:39:33 +08:00
liumengyi f33721b4a9 * Fix bug #25978. 2022-08-05 10:38:23 +08:00