Commit Graph
36422 Commits
Author SHA1 Message Date
孙广明 8b1444de59 Merge branch 'sunhuawei_fixbug_13786' into 'master'
*Fix bug#13786.

See merge request easycorp/zentaopms!2579
2022-03-28 06:24:20 +00:00
孙华伟 f437bbf1d1 *Fix bug#13786. 2022-03-28 14:17:23 +08:00
hufangzhou 0856a25781 * Fix bug #15653. 2022-03-28 14:15:47 +08:00
Hao Sun 0cf598f418 * bug #21174, fix markdown preview not work as expected. 2022-03-28 14:09:23 +08:00
tanghucheng 84b1d62b54 * Fix bug #21004. 2022-03-28 14:07:31 +08:00
tanghucheng d8bdde7892 * Fix bug#21058. 2022-03-28 13:58:17 +08:00
tianshujie cd2e539a6d * Fix bug #21212. 2022-03-28 13:56:04 +08:00
xieqiyu f72da77a5d * Code for bug#20875. 2022-03-28 13:52:42 +08:00
tanghucheng ab4053b372 * Fix bug#21208. 2022-03-28 13:50:48 +08:00
sunjun 487c2a6694 *Fixbug #13852 2022-03-28 13:43:53 +08:00
孙广明 85490db2dd Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #16895,20941,20942.

See merge request easycorp/zentaopms!2561
2022-03-28 05:11:11 +00:00
李玉春 d726d5bfbb Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2574
2022-03-28 05:10:26 +00:00
zhouxudong d689db05a7 * Fix bug #11919. 2022-03-28 13:10:11 +08:00
孙广明 97bcdf6255 Merge branch 'autotest_ly' into 'master'
update test data

See merge request easycorp/zentaopms!2575
2022-03-28 05:07:46 +00:00
liyang 7d64f6eeb1 update test data 2022-03-28 13:04:51 +08:00
王怡栋 76688d1718 Merge branch 'sprint/fixbug_hufangzhou_17995' into 'master'
* Fix bug #17995.

See merge request easycorp/zentaopms!2573
2022-03-28 05:03:35 +00:00
王怡栋 47686bb70b Merge branch 'sprint/fixbug_hufangzhou_17974' into 'master'
* Fix bug #17974.

See merge request easycorp/zentaopms!2565
2022-03-28 05:03:05 +00:00
tianshujie b125b0fc2c * Fix bug #21186. 2022-03-28 11:20:38 +08:00
李玉春 a3b7732866 Merge branch 'sprint/scx_fixapibug' into 'master'
*Fix api bug.

See merge request easycorp/zentaopms!2568
2022-03-28 03:17:03 +00:00
李玉春 c6e89fc7c1 Merge branch 'fixbug_cyy' into 'master'
* Fix bug #20156.

See merge request easycorp/zentaopms!2570
2022-03-28 03:16:18 +00:00
mayue 779f02c9ec * Optimize code. 2022-03-28 11:14:39 +08:00
李玉春 b9e4882cd8 Merge branch 'devops24_51139' into 'master'
Finish task#51139

See merge request easycorp/zentaopms!2560
2022-03-28 03:13:31 +00:00
tianshujie 0194c5b3c7 * Fix bug #21186. 2022-03-28 11:13:23 +08:00
zhouxudong 5129df89d2 * Fix bug #11919. 2022-03-28 11:11:31 +08:00
zhouxudong 0f999761c9 * Fix bug #11919. 2022-03-28 11:10:21 +08:00
hufangzhou 504d19ee92 * Fix bug #17995. 2022-03-28 11:09:12 +08:00
李玉春 a04046f4b2 Merge branch 'mayue_optimizeCode' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!2571
2022-03-28 02:59:37 +00:00
李玉春 0a6130a20b Merge branch 'sunhuawei_fixbug_21124' into 'master'
*Fix bug#21124.

See merge request easycorp/zentaopms!2572
2022-03-28 02:59:07 +00:00
mayue 0a562d579a * Optimize code. 2022-03-28 10:58:58 +08:00
mayue 1dc8f123df * Optimize code. 2022-03-28 10:56:14 +08:00
孙华伟 92a4949c6e *Fix bug#21124. 2022-03-28 10:55:05 +08:00
caoyanyi 99ad50eb3e * Fix bug #20156. 2022-03-28 10:53:03 +08:00
朱金勇 a0a1995807 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master'
* Modify auto test of product.

See merge request easycorp/zentaopms!2569
2022-03-28 02:49:39 +00:00
liumengyi 1405901308 * Modify auto test of product. 2022-03-28 10:48:08 +08:00
tanghucheng dd13984197 * Fix bug #21211. 2022-03-28 10:42:08 +08:00
songchenxuan 682152224c *Fix api bug. 2022-03-28 10:41:38 +08:00
mayue 4ec9ec4869 * Optimize code. 2022-03-28 10:38:25 +08:00
mayue 1842ec83a2 * Fix bug #18310. 2022-03-28 10:36:24 +08:00
tanghucheng 447f0360c5 * Fix bug #21009,21211. 2022-03-28 10:36:22 +08:00
朱金勇 9c675f316c Merge branch 'sprint/sunhao/bug19123' into 'master'
* try to redirect to index/index when access iframe page directly.

See merge request easycorp/zentaopms!2557
2022-03-28 02:32:57 +00:00
朱金勇 6b03905a08 Merge branch 'sprint/sunhao/theme_blue' into 'master'
* fix version switcher button style for theme "blue".

See merge request easycorp/zentaopms!2562
2022-03-28 02:32:40 +00:00
朱金勇 0901a14d5d Merge branch 'app_zhengrunyu' into 'master'
* Change api for story.

See merge request easycorp/zentaopms!2535
2022-03-28 02:32:18 +00:00
zhengrunyu 646579d1f6 * Change api for story. 2022-03-28 10:30:30 +08:00
tanghucheng 34ea88a332 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into fixbug 2022-03-28 10:26:09 +08:00
hufangzhou 3a38d4787d * Fix bug #17974. 2022-03-28 10:19:44 +08:00
xieqiyu f500822991 * Fix bug#20875. 2022-03-28 10:11:39 +08:00
孙广明 20f060bcaf Merge branch 'sprint/autoTest_liumengyi_product' into 'master'
* Add auto test of product.

See merge request easycorp/zentaopms!2563
2022-03-28 02:05:44 +00:00
liumengyi 0bc904fe27 * Add auto test of product. 2022-03-28 10:03:43 +08:00
sunjun 79016f3bf7 *Fixbug #13852 2022-03-28 10:00:29 +08:00
Hao Sun 42d64882f0 * fix version switcher button style for theme "blue". 2022-03-28 09:59:36 +08:00