Commit Graph
36547 Commits
Author SHA1 Message Date
孙华伟 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
liyuchun b9820565c9 * Fix bug #16895,20941,20942. 2022-03-28 09:57:31 +08:00
zenggang ae463ddd27 * Finish task#51139 2022-03-28 01:44:26 +00:00
tianshujie db388f5d74 * Fix bug #17359. 2022-03-28 09:42:50 +08:00
sunjun e0363ea6aa *Fixbug #13852 2022-03-28 09:32:14 +08:00
王怡栋 c2a4bd5cbf Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-28 08:47:13 +08:00
孙广明 21d4a48642 Merge branch 'liyuchun_fixbug' into 'master'
Fix bug #17252,17367.

See merge request easycorp/zentaopms!2539
2022-03-28 00:42:01 +00:00
孙广明 e736c8d8c0 Merge branch 'autotest_ly' into 'master'
add project and product data

See merge request easycorp/zentaopms!2559
2022-03-28 00:41:34 +00:00
liyang ce6fd25ee2 add project and product data 2022-03-28 08:39:33 +08:00
李玉春 7e0cf1500e Merge branch 'fixbug_cyy' into 'master'
* Fix bug #19745.

See merge request easycorp/zentaopms!2555
2022-03-28 00:38:56 +00:00
Hao Sun 56e9a9ce9d * try to redirect to index/index when access iframe page directly. 2022-03-25 20:48:18 +08:00
李玉春 5d0e802a49 Merge branch 'devops24_51136' into 'master'
Finish task#51136

See merge request easycorp/zentaopms!2554
2022-03-25 09:35:43 +00:00
tanghucheng 08f9c25798 * Fix bug #21177. 2022-03-25 15:58:03 +08:00
zenggang 0867f72e20 * Finish task#51136 2022-03-25 07:56:31 +00:00
孙广明 2ea79a7e21 Merge branch 'autotest_ly' into 'master'
update story data

See merge request easycorp/zentaopms!2552
2022-03-25 07:34:01 +00:00
孙广明 0d6d80e6f2 Merge branch 'sprint/autoTest_liumengyi_product' into 'master'
* Add auto test of product.

See merge request easycorp/zentaopms!2551
2022-03-25 07:33:06 +00:00
liyang 5cc3608d29 update story data 2022-03-25 15:30:29 +08:00
liumengyi 2af66dd17f * Fix bug. 2022-03-25 15:29:40 +08:00
liumengyi bda014f73b * Add auto test of product. 2022-03-25 15:28:29 +08:00
zhouxudong 92648cadc8 * Fix bug #11919. 2022-03-25 15:23:15 +08:00
李玉春 f481b0fd9a Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2550
2022-03-25 07:11:11 +00:00
tianshujie d3e63841fa * Fix bug #20559. 2022-03-25 15:00:30 +08:00
孙广明 8acea5b35c Merge branch 'master_xieqiyu_20878' into 'master'
* Fix bug#20878.

See merge request easycorp/zentaopms!2547
2022-03-25 06:59:00 +00:00
朱金勇 530f055e7b Merge branch 'sgm_storytest' into 'master'
* Remove unused code and fix bug.

See merge request easycorp/zentaopms!2545
2022-03-25 06:29:10 +00:00
朱金勇 d097a892cf Merge branch 'sprint/sunhao/bug11279' into 'master'
* bug #11279, fix hotkey up/down with datetimepicker not work in batch action page.

See merge request easycorp/zentaopms!2540
2022-03-25 06:28:32 +00:00
朱金勇 dbdbe26be7 Merge branch 'sprint/scx_getproductsbyproject' into 'master'
* Get products by projectID.

See merge request easycorp/zentaopms!2541
2022-03-25 06:28:12 +00:00
孙广明 4b50d187e4 * Remove unused code and fix bug. 2022-03-25 14:25:26 +08:00
孙广明 06c255995c Merge branch 'mayue_fix_bug#17402' into 'master'
* Fix bug#17402.

See merge request easycorp/zentaopms!2543
2022-03-25 06:23:58 +00:00
mayue 59af75b136 * Optimize code. 2022-03-25 14:21:22 +08:00
王怡栋 45ba41e14e Merge branch 'fixbug' into 'master'
* Fix bug #21034,21059.

See merge request easycorp/zentaopms!2542
2022-03-25 06:16:55 +00:00
王怡栋 b1b05f4fc0 Merge branch 'sprint/fixbug_hufangzhou_markdown' into 'master'
* Update the library of parse markdown.

See merge request easycorp/zentaopms!2544
2022-03-25 06:16:30 +00:00