Commit Graph
32185 Commits
Author SHA1 Message Date
王怡栋 004b18989b Merge branch 'sprint/fixbug_hufangzhou_19260' into 'master'
* Fix bug #19260.

See merge request easycorp/zentaopms!2849
2022-04-11 08:02:24 +00:00
mayue 61bb5b08e8 * Fix bug #17286. 2022-04-11 16:01:45 +08:00
王怡栋 68085fc030 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2862
2022-04-11 08:00:17 +00:00
hufangzhou 1c9afbdbc4 * Fix bug #18296. 2022-04-11 15:54:10 +08:00
Zongjun Lan 6af3e182b0 * fix bug error params 2022-04-11 15:48:46 +08:00
Zongjun Lan b6b1925c28 * fix bug error params 2022-04-11 15:45:34 +08:00
tianshujie c00b2a9cc6 * Fix bug #21638. 2022-04-11 15:41:09 +08:00
mayue 145b1766f7 * Fix bug #17286.* Fix bug #17286.* Fix bug #17286.* Fix bug #17286.* Fix bug #17286.* Fix bug #17286.* Fix bug #17286.* Fix bug #17286. 2022-04-11 15:37:10 +08:00
朱金勇 1547d004d7 Merge branch 'app_zry' into 'master'
* Fix api for review story.

See merge request easycorp/zentaopms!2857
2022-04-11 07:29:38 +00:00
zhengrunyu e799829a19 * Fix bug 21553. 2022-04-11 15:24:42 +08:00
sunjun ce5044b2a5 *Fixbug_sunjun_21618 2022-04-11 14:53:31 +08:00
sunjun 75a70acec3 *Fixbug_sunjun_21618 2022-04-11 14:50:59 +08:00
hufangzhou 7d807a5694 * Fix bug #19789. 2022-04-11 14:40:07 +08:00
tianshujie f1c24db544 * Fix bug #16350. 2022-04-11 14:16:45 +08:00
李玉春 e7974cb64e Merge branch 'shunhuawei_fixbug_21488' into 'master'
*Fix bug#21488.

See merge request easycorp/zentaopms!2819
2022-04-11 06:14:56 +00:00
李玉春 ecf6797cb2 Merge branch 'sprint/master_zhouxudong_15146' into 'master'
Sprint/master zhouxudong 15146

See merge request easycorp/zentaopms!2855
2022-04-11 06:14:39 +00:00
zhouxin d79f9f22e4 * Fix bug #21320. 2022-04-11 06:14:00 +00:00
周旭东 36e1809e7c Update control.php 2022-04-11 06:11:03 +00:00
xieqiyu 93cb0c08bf * Fix bug#15146. 2022-04-11 14:07:49 +08:00
孙广明 74af01c97a Merge branch 'fixbugs_zhouxin_21434' into 'master'
* Fix bug #21434.

See merge request easycorp/zentaopms!2854
2022-04-11 06:05:17 +00:00
sunjun 8b96fe80bf *Fixbug_sunjun_21521 2022-04-11 14:00:16 +08:00
zhouxin 28a842da55 * Fix bug #21434. 2022-04-11 05:58:43 +00:00
朱金勇 b19df074ab Merge branch 'sprint/scx_updateLang' into 'master'
* Translate lang.

See merge request easycorp/zentaopms!2848
2022-04-11 05:57:47 +00:00
朱金勇 dec9924838 Merge branch 'sgm_testtask' into 'master'
Sgm testtask

See merge request easycorp/zentaopms!2853
2022-04-11 05:57:26 +00:00
孙广明 a8674ddc91 * Add testtask test. 2022-04-11 13:52:02 +08:00
zhouxin 26de46de0a * Fix bug #20812. 2022-04-11 13:52:02 +08:00
xieqiyu a1021a3a74 * Fix bug#19709. 2022-04-11 13:52:02 +08:00
zenggang c61209f40a * Fix bug#20630 2022-04-11 13:52:02 +08:00
孙华伟 fb57638d07 *Hide change default branch feature. 2022-04-11 13:47:26 +08:00
xieqiyu ff1f998bf7 * Fix bug#19197. 2022-04-11 13:24:35 +08:00
tianshujie f2aa066bdc * Fix bug #19261. 2022-04-11 13:19:18 +08:00
xieqiyu 4ff65cf031 * Fix bug#18072. 2022-04-11 13:18:41 +08:00
tianshujie 1a861ef225 * Fix bug #18710. 2022-04-11 13:15:41 +08:00
caoyanyi 51fd81a02e * Fix bug #11026. 2022-04-11 13:03:28 +08:00
孙广明 4cc6f833e1 Merge branch 'sprint/185_fixbug_zhangzilong_19365' into 'master'
* Fix bug #19365.

See merge request easycorp/zentaopms!2850
2022-04-11 03:22:16 +00:00
孙华伟 ce97fdbc7f Update edit.html.php 2022-04-11 03:21:49 +00:00
王怡栋 ddd6157733 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-11 11:18:50 +08:00
王怡栋 709d88226b * fix for case rate of story. 2022-04-11 11:17:31 +08:00
hufangzhou c214a1f5e3 * Fix bug #19260. 2022-04-11 11:14:24 +08:00
songchenxuan 419c95e8f9 * Translate lang. 2022-04-11 11:10:32 +08:00
王怡栋 2a3c1acea3 Merge branch 'sprint/fixbug_hufangzhou_21184' into 'master'
* Fix bug #21184.

See merge request easycorp/zentaopms!2841
2022-04-11 03:10:10 +00:00
tianshujie c1232cef69 * Fix bug #21633. 2022-04-11 10:49:00 +08:00
孙广明 ccd84601f3 Merge branch 'sprint/tianshujie_bug21210' into 'master'
* Fix bug #21210.

See merge request easycorp/zentaopms!2843
2022-04-11 02:22:55 +00:00
孙广明 d561fb5dd4 Merge branch 'sprint/tianshujie_bug21631' into 'master'
* Fix bug #21631.

See merge request easycorp/zentaopms!2842
2022-04-11 02:22:00 +00:00
tianshujie edc9f9a75a * Fix bug #21631. 2022-04-11 10:17:52 +08:00
hufangzhou df4c83b23a * Fix bug #21184. 2022-04-11 10:08:13 +08:00
mayue 7efe1e3726 * Fix bug #16601. 2022-04-11 10:05:00 +08:00
zhouxudong 5e5f3c50d1 * Fix bug #15146. 2022-04-11 09:50:59 +08:00
李玉春 8847f7863d Merge branch 'mayue_fix_bug#21616' into 'master'
* Fix bug #21616.

See merge request easycorp/zentaopms!2836
2022-04-11 01:47:15 +00:00
mayue 2cdf6f1e98 * Fix bug #21616. 2022-04-11 09:44:40 +08:00