Commit Graph
37311 Commits
Author SHA1 Message Date
tianshujie 56d8a1ad05 * Fix bug #21641. 2022-04-12 14:17:20 +08:00
tianshujie 7f117b9a44 * Fix bug #18781. 2022-04-12 14:12:32 +08:00
李玉春 8772488231 Merge branch 'cyy_11026' into 'master'
* Fix bug #11026.

See merge request easycorp/zentaopms!2851
2022-04-12 02:13:53 +00:00
孙广明 a3858d1512 Merge branch 'master_xieqiyu_14595' into 'master'
* Fix bug#14595.

See merge request easycorp/zentaopms!2871
2022-04-12 01:41:18 +00:00
孙广明 2b02f4dd38 Merge branch 'fixbug_sunjun_21618' into 'master'
Fixbug sunjun 21618

See merge request easycorp/zentaopms!2859
2022-04-12 01:40:59 +00:00
孙广明 71ce874dc3 Merge branch 'fixbugs_zhouxin_21654' into 'master'
* Fix bug #21654.

See merge request easycorp/zentaopms!2873
2022-04-12 01:40:47 +00:00
zhouxin 1571548411 * Fix bug #21654. 2022-04-12 01:34:40 +00:00
zhujinyong 4f8d2791ed * Reset cookie. 2022-04-12 09:12:07 +08:00
sunjun c36f432e1a *Fixbug_sunjun_21618 2022-04-12 08:35:31 +08:00
李玉春 bf520a0fce Merge branch 'devops25_52069' into 'master'
Fix bug#21331

See merge request easycorp/zentaopms!2867
2022-04-12 00:16:02 +00:00
xieqiyu 68097e7725 * Fix bug#14595. 2022-04-11 17:36:44 +08:00
孙广明 46d3ac142f Merge branch 'fixbugs_zhouxin_17354' into 'master'
* Fix bug #17354.

See merge request easycorp/zentaopms!2870
2022-04-11 09:25:29 +00:00
孙广明 6ea181d050 Merge branch 'fixbugs_zhouxin_21320' into 'master'
* Fix bug #21320.

See merge request easycorp/zentaopms!2839
2022-04-11 09:25:00 +00:00
孙广明 bccf6e5248 Merge branch 'master_xieqiyu_18080' into 'master'
* Fix bug#18080.

See merge request easycorp/zentaopms!2837
2022-04-11 09:24:46 +00:00
xieqiyu a60f498ea8 * Modify review code. 2022-04-11 17:23:59 +08:00
孙广明 4a1d446587 Merge branch 'fixbug_sunjun_21521' into 'master'
*Fixbug_sunjun_21521

See merge request easycorp/zentaopms!2856
2022-04-11 09:23:14 +00:00
孙广明 1eb763eb04 Merge branch 'master_xieqiyu_19197' into 'master'
* Fix bug#19197.

See merge request easycorp/zentaopms!2868
2022-04-11 09:22:54 +00:00
孙广明 39fd0e4700 Merge branch 'master_xieqiyu_15697' into 'master'
* Fix bug#15697.

See merge request easycorp/zentaopms!2864
2022-04-11 09:22:36 +00:00
孙广明 c7dc63ff11 Merge branch 'master_xieqiyu_18072' into 'master'
* Fix bug#18072.

See merge request easycorp/zentaopms!2852
2022-04-11 09:21:34 +00:00
朱金勇 214fcd9443 Merge branch 'sprint/autoTest_liumengyi_programplan' into 'master'
* Add auto test of programplan.

See merge request easycorp/zentaopms!2869
2022-04-11 09:06:25 +00:00
zenggang 07573e3e8f * Adjust code 2022-04-11 09:05:29 +00:00
liumengyi 184bdc992c * Add auto test of programplan. 2022-04-11 16:57:38 +08:00
zhouxin c6b4f06bf4 * Fix bug #17354. 2022-04-11 08:54:22 +00:00
zenggang 2ce98e4622 * Fix bug#21331 2022-04-11 08:41:13 +00:00
王怡栋 b56588d33e Merge branch 'sprint/fixbug_hufangzhou_21646' into 'master'
* Fix bug #21646.

See merge request easycorp/zentaopms!2865
2022-04-11 08:24:00 +00:00
王怡栋 a41d152809 Merge branch 'sunhuawei_hideDefaultBranch' into 'master'
*Hide change default branch feature.

See merge request easycorp/zentaopms!2866
2022-04-11 08:23:11 +00:00
hufangzhou 5745d42b1f * Fix bug #21646. 2022-04-11 16:10:32 +08:00
xieqiyu c7894fdb78 * Fix bug#15697. 2022-04-11 16:07:45 +08:00
王怡栋 6f87b3858c Merge branch 'sprint/fixbug_hufangzhou_19789' into 'master'
* Fix bug #19789.

See merge request easycorp/zentaopms!2858
2022-04-11 08:03:37 +00:00
王怡栋 7703a83278 Merge branch 'mayue_fix_bug#17286' into 'master'
* Fix bug #17286.

See merge request easycorp/zentaopms!2860
2022-04-11 08:02:55 +00:00
王怡栋 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
朱金勇 167dcc90a0 Merge branch 'autotest_ly' into 'master'
update execution data

See merge request easycorp/zentaopms!2863
2022-04-11 07:59:43 +00:00
liyang c64f590257 update execution data 2022-04-11 15:58:18 +08:00
王怡栋 24e2021b9a Merge branch 'sprint/fixbug_hufangzhou_18296' into 'master'
* Fix bug #18296.

See merge request easycorp/zentaopms!2861
2022-04-11 07:56:46 +00:00
hufangzhou 1c9afbdbc4 * Fix bug #18296. 2022-04-11 15:54:10 +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