Commit Graph
44098 Commits
Author SHA1 Message Date
王怡栋 dbe42f9aa1 Merge branch 'master_xieqiyu_fixStoryBug' into 'master'
Master xieqiyu fix story bug

See merge request easycorp/zentaopms!5079
2022-08-24 02:49:17 +00:00
李玉春 00ada6310a Merge branch 'sprint/231_tianshujie_css' into 'master'
* Modify name beyond hidden style.

See merge request easycorp/zentaopms!5075
2022-08-24 02:26:51 +00:00
tianshujie 0df81d9a3b * Fix bug #26817. 2022-08-24 10:19:19 +08:00
xieqiyu 840e0dd810 * Delete unused code. 2022-08-24 10:10:04 +08:00
xieqiyu 1db00037b4 * * Modify update sql of change story status. 2022-08-24 10:05:49 +08:00
孙广明 ee058ad83c Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Modify text-overflow style.

See merge request easycorp/zentaopms!5078
2022-08-24 01:25:59 +00:00
王怡栋 03ea51fe76 Merge branch 'sprint/231_dongli_64973' into 'master'
* Finish task #64972,64973,64969.

See merge request easycorp/zentaopms!5076
2022-08-24 01:14:44 +00:00
dongli 0e393e120b * Remove useless spaces. 2022-08-24 01:10:59 +00:00
liumengyi b323432098 * Modify text-overflow style. 2022-08-24 09:00:09 +08:00
王怡栋 5bbf28e974 Merge branch 'master_xieqiyu_60722' into 'master'
* Finish task#60722.

See merge request easycorp/zentaopms!5070
2022-08-24 00:56:02 +00:00
王怡栋 882b3820d9 Merge branch 'max43_tanghucheng' into 'master'
* Fix bug #26265.

See merge request easycorp/zentaopms!5073
2022-08-24 00:55:30 +00:00
tianshujie a63dd2500f * Modify name beyond hidden style. 2022-08-24 08:55:16 +08:00
dongli 17a439cac3 * Finish task #64972,64973,64969. 2022-08-24 00:55:13 +00:00
王怡栋 0036bac572 Merge branch 'master_liuhong_26000' into 'master'
*Fix bug #26000.

See merge request easycorp/zentaopms!5047
2022-08-24 00:46:46 +00:00
xieqiyu e81b8552fe * Add lang of requirement. 2022-08-23 22:01:22 +08:00
xieqiyu a36eb814db * Add story type for submit review. 2022-08-23 21:52:11 +08:00
tanghucheng a1b16e0132 * Fix bug #26265. 2022-08-23 21:03:50 +08:00
dongli f3b8e63376 * Finsh task #64972,64973,64969. 2022-08-23 10:46:03 +00:00
liuhong 329238d8cd *Fix bug #26000. 2022-08-23 09:23:09 +00:00
孙广明 c7090f6892 Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Correct the translation.

See merge request easycorp/zentaopms!5071
2022-08-23 09:18:57 +00:00
liumengyi 6f187e3a23 * Correct the translation. 2022-08-23 17:16:49 +08:00
xieqiyu 6e531700ee * Finish task#60722. 2022-08-23 16:56:58 +08:00
李玉春 3e487df2b3 Merge branch 'sprint/231_tianshujie_65808' into 'master'
* Finish task #65808, #65807.

See merge request easycorp/zentaopms!5067
2022-08-23 08:26:36 +00:00
liumengyi 277ee237d9 * Optimize code for task #65808, #65807. 2022-08-23 16:25:38 +08:00
王怡栋 f814ff44fa Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #65904

See merge request easycorp/zentaopms!5069
2022-08-23 08:25:06 +00:00
liumengyi c95ecbd1a6 * Optimize code for task #65808. 2022-08-23 16:19:20 +08:00
tianshujie 3a99afd287 * Finish task #65808,65807. 2022-08-23 16:12:52 +08:00
lanzongjun a658491395 * fix bug #65904 2022-08-23 15:57:06 +08:00
liumengyi 06c64d7e6f * Optimize code for task #65808, #65807. 2022-08-23 15:48:47 +08:00
tianshujie 44d270da18 * Finish task #65808. 2022-08-23 15:48:20 +08:00
tianshujie fda29bc600 Merge branch 'sprint/231_tianshujie_65808' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/231_tianshujie_65808 2022-08-23 15:40:43 +08:00
tianshujie 15eface39c * Finish task #65808. 2022-08-23 15:40:29 +08:00
孙广明 cae4f4b2c7 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of update story datetable.

See merge request easycorp/zentaopms!5064
2022-08-23 07:28:19 +00:00
孙广明 ff0560288d Merge branch 'sprint/max43_mayue_bug#26655' into 'master'
* Fix bug #26655.

See merge request easycorp/zentaopms!5066
2022-08-23 07:28:05 +00:00
xieqiyu 1590364db3 * Fix bug of link story. 2022-08-23 15:23:17 +08:00
dongli a825fa54ae * Finish task #64972,64973. 2022-08-23 07:15:16 +00:00
liumengyi fb98e38d42 * Optimize code for task #65807. 2022-08-23 15:03:41 +08:00
tianshujie 5cfc47639a Merge branch 'sprint/231_tianshujie_65808' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/231_tianshujie_65808 2022-08-23 15:03:29 +08:00
tianshujie dca2784559 * Finish task #65808. 2022-08-23 15:02:57 +08:00
dongli 57528ecba5 * Finish task #64972,64973. 2022-08-23 06:59:18 +00:00
liumengyi b016635bd8 * Fix bug for task #65807. 2022-08-23 14:53:24 +08:00
liumengyi 545d74f7d0 * Optimize code for task #65808, #65807. 2022-08-23 14:50:40 +08:00
tianshujie 976de6e849 * Fix the problem of error reporting in the contribution task list. 2022-08-23 14:17:43 +08:00
mayue e98b4939c7 * Fix bug #26655. 2022-08-23 14:15:12 +08:00
liumengyi cc92f9d3ef * Optimize code. 2022-08-23 13:54:29 +08:00
liumengyi 617122882a * Finish task #65807. 2022-08-23 13:45:44 +08:00
tianshujie 4e1ca8bd60 * Finish task #65808. 2022-08-23 13:40:34 +08:00
孙广明 7b4002c1d1 Merge branch 'sprint/max43_mayue_bug#26200' into 'master'
* Fix bug #26200.

See merge request easycorp/zentaopms!5058
2022-08-23 03:02:25 +00:00
mayue 6336e232fb * Optimize code. 2022-08-23 11:01:31 +08:00
xieqiyu bd510fe0d4 * Fix bug of update story datetable. 2022-08-23 10:11:31 +08:00