Commit Graph
36398 Commits
Author SHA1 Message Date
tianshujie c7225ac3d6 * Fix bug #14433. 2022-03-28 17:19:29 +08:00
孙广明 81a934d34c Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master'
* Add auto test of kanban.

See merge request easycorp/zentaopms!2594
2022-03-28 09:18:21 +00:00
liumengyi 737be004b1 * Add auto test of kanban. 2022-03-28 17:16:42 +08:00
朱金勇 7d6e2bac72 Merge branch 'sprint/sunhao/bug21174' into 'master'
* bug #21174, fix markdown preview not work as expected.

See merge request easycorp/zentaopms!2577
2022-03-28 09:01:06 +00:00
朱金勇 863f39ea81 Merge branch 'sprint/sunhao/bug19123' into 'master'
* bug #19123, skip to check iframe when url has "_single" param for debug mode.

See merge request easycorp/zentaopms!2584
2022-03-28 09:00:49 +00:00
朱金勇 0bb360f80c Merge branch 'sprint/sunhao/bug20927' into 'master'
* bug #20927, limit affixed header in kanban container.

See merge request easycorp/zentaopms!2585
2022-03-28 09:00:40 +00:00
朱金勇 e1e5d8caff Merge branch 'sprint/sunhao/bug20928' into 'master'
* bug #20928, support to affix region scrollbar in kanban.

See merge request easycorp/zentaopms!2591
2022-03-28 09:00:30 +00:00
李玉春 e6319bec6d Merge branch 'sunhuawei_fixbug_14756' into 'master'
*Fix bug#14756.

See merge request easycorp/zentaopms!2592
2022-03-28 08:58:57 +00:00
孙广明 11b4d993dd Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2588
2022-03-28 08:57:08 +00:00
李玉春 b87ce16ef3 Merge branch 'mayue_fix_bug_#18310' into 'master'
* Fix bug #18310.

See merge request easycorp/zentaopms!2567
2022-03-28 08:55:16 +00:00
tianshujie 93e2945604 * Modify the code format. 2022-03-28 16:54:19 +08:00
孙华伟 d8d1e2e3ee *Fix bug#14756. 2022-03-28 16:47:35 +08:00
tianshujie 6617f8747c * Fix bug #19397. 2022-03-28 16:46:15 +08:00
Hao Sun c39e01875c * bug #20928, support to affix region scrollbar in kanban. 2022-03-28 16:41:39 +08:00
mayue 1a7d18a377 * Optimize code. 2022-03-28 16:38:59 +08:00
孙广明 38f92da961 Merge branch 'autotest_ly' into 'master'
add build test

See merge request easycorp/zentaopms!2587
2022-03-28 08:21:32 +00:00
李玉春 382e4493f1 Merge branch 'sprint/master_zhouxudong_11919' into 'master'
Sprint/master zhouxudong 11919

See merge request easycorp/zentaopms!2582
2022-03-28 08:12:30 +00:00
liyang 19828f54f0 add build test 2022-03-28 16:11:25 +08:00
tianshujie a2676be2ff * Fix bug #19980. 2022-03-28 16:07:39 +08:00
Hao Sun cd4c0ae708 * bug #20927, limit affixed header in kanban container. 2022-03-28 15:50:08 +08:00
Hao Sun f4188b48a2 * skip to request on orders not changed in kanban. 2022-03-28 15:49:44 +08:00
Hao Sun 710121485f * bug #19123, skip to check iframe when url has "_single" param for debug mode. 2022-03-28 15:41:55 +08:00
tianshujie 7680057485 * Fix bug #18755. 2022-03-28 15:32:41 +08:00
tianshujie e882826e0c * Modify the logic of the query stories stage. 2022-03-28 15:12:15 +08:00
zhouxudong 5607b4f6c8 * Fix bug #11919. 2022-03-28 15:12:12 +08:00
孙广明 8b8dccd9cd Merge branch 'mayue_optimize_code' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!2581
2022-03-28 07:06:34 +00:00
mayue 7fc0cd6230 * Optimize code. 2022-03-28 15:02:28 +08:00
王怡栋 ceb70f1ad1 Merge branch 'fixbug' into 'master'
* Fix bug #21177,21009,21211.

See merge request easycorp/zentaopms!2558
2022-03-28 07:01:13 +00:00
王怡栋 4cc935e4e4 Merge branch 'sprint/fixbug_hufangzhou_15653' into 'master'
* Fix bug #15653.

See merge request easycorp/zentaopms!2578
2022-03-28 07:00:25 +00:00
tanghucheng 7b09af074b * Fix bug #21008. 2022-03-28 14:37:44 +08:00
孙广明 0aa0f12057 Merge branch 'master_xieqiyu_20875' into 'master'
* Fix bug#20875.

See merge request easycorp/zentaopms!2564
2022-03-28 06:37:08 +00:00
孙广明 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
孙广明 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