Commit Graph
36603 Commits
Author SHA1 Message Date
李玉春 8b24143995 Merge branch 'fixbug_sunjun_21258' into 'master'
*Fixbug #21258

See merge request easycorp/zentaopms!2606
2022-03-29 05:54:21 +00:00
hufangzhou df4c62e876 * Fix bug #18696. 2022-03-29 13:47:11 +08:00
liyuchun 1fcbef1a79 * Fix bug #13194. 2022-03-29 13:45:36 +08:00
孙广明 0fe342e621 Merge branch 'master_xieqiyu_16137' into 'master'
* Fix bug#16137,#16136.

See merge request easycorp/zentaopms!2604
2022-03-29 05:26:06 +00:00
孙广明 dd871db635 Merge branch 'autotest_ly' into 'master'
update story data

See merge request easycorp/zentaopms!2607
2022-03-29 05:25:35 +00:00
liyang 5460fc9b9b update story data 2022-03-29 13:23:28 +08:00
zhouxin 376de6d824 * Fix bug #16707. 2022-03-29 04:28:39 +00:00
李玉春 91b8835642 Merge branch 'sprint/tianshujie_bug21028' into 'master'
Sprint/tianshujie bug21028

See merge request easycorp/zentaopms!2605
2022-03-29 03:30:23 +00:00
tianshujie 93d7e2dd1d * Fix bug #14873. 2022-03-29 11:27:25 +08:00
朱金勇 53468f156f Merge branch 'sprint/scx_checkapi' into 'master'
* Check locate if api.

See merge request easycorp/zentaopms!2603
2022-03-29 03:19:25 +00:00
songchenxuan 310a946e0a * Check locate if api. 2022-03-29 11:17:08 +08:00
zhouxin 603ae3bfdc * Fix bug #16707. 2022-03-29 03:14:50 +00:00
sunjun a2e9c28f6e *Fixbug #21258 2022-03-29 11:12:02 +08:00
朱金勇 aa0e80bf2d Merge branch 'app_zry' into 'master'
* Fix bug for change story.

See merge request easycorp/zentaopms!2601
2022-03-29 03:08:40 +00:00
zhengrunyu 3ef215e240 * Fix bug for change story. 2022-03-29 11:06:14 +08:00
xieqiyu 731f96d1a5 * Fix bug#16137,#16136. 2022-03-29 10:57:12 +08:00
zenggang f6e4a00c25 * Fix bug#21092 2022-03-29 02:11:46 +00:00
tianshujie a3c6f30f55 * Fix bug #21028,21030. 2022-03-29 09:57:50 +08:00
朱金勇 fe3cbd34d1 Merge branch 'app_zhengrunyu' into 'master'
* Add api for close bug and confirm bug.

See merge request easycorp/zentaopms!2599
2022-03-29 01:48:20 +00:00
孙广明 851fe62a79 Merge branch 'master_xieqiyu_11308' into 'master'
* Fix bug#11308,#20582.

See merge request easycorp/zentaopms!2596
2022-03-29 01:42:44 +00:00
zhengrunyu 4c5be242cd * Add api for close bug and confirm bug. 2022-03-29 09:41:17 +08:00
liyuchun 9f74fe748f * Fix bug #20804,20946. 2022-03-29 09:34:09 +08:00
zhujinyong be75d25da7 * Fix api doc. 2022-03-29 09:25:15 +08:00
李玉春 a2da8e12f0 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2597
2022-03-29 01:12:21 +00:00
tianshujie 7b6e89c8d6 * Fix bug #21213. 2022-03-29 09:07:47 +08:00
tianshujie 778bc04e51 * Fix bug #21228. 2022-03-29 08:55:51 +08:00
李玉春 b26b17ca35 Merge branch 'cyy_11655' into 'master'
* Fix bug #11655 and add repo create check.

See merge request easycorp/zentaopms!2590
2022-03-29 00:54:42 +00:00
李玉春 146d424c25 Merge branch 'devops24_51178' into 'master'
Finish task#51178

See merge request easycorp/zentaopms!2586
2022-03-29 00:52:51 +00:00
李玉春 9b388cc312 Merge branch 'fixbug_sunjun_13852' into 'master'
Fixbug sunjun 13852

See merge request easycorp/zentaopms!2576
2022-03-29 00:50:37 +00:00
sunjun b411be89ec *Fixbug #13852 2022-03-29 08:44:48 +08:00
tianshujie 6ccc84e419 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_fixbug 2022-03-29 08:35:17 +08:00
孙广明 9e5a49c640 * Code for story test. 2022-03-29 08:25:48 +08:00
xieqiyu 01a7b6391b * Fix bug#11308,#20582. 2022-03-29 08:22:45 +08:00
zenggang 16b0c95790 * Adjust code 2022-03-28 09:53:17 +00:00
孙广明 b81a361d26 * Code for stort test. 2022-03-28 17:36:54 +08:00
caoyanyi 589dbaff70 * Fix bug #12791. 2022-03-28 17:25:36 +08:00
孙广明 ebd31dd515 Merge branch 'fixbugs_zhouxin_14512' into 'master'
* Fix bug #14512.

See merge request easycorp/zentaopms!2583
2022-03-28 09:23:39 +00:00
tianshujie c7225ac3d6 * Fix bug #14433. 2022-03-28 17:19:29 +08:00
zhouxin 6bc82e81c1 * Fix bug #14512. 2022-03-28 09:19:14 +00: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
sunjun 0ce312f107 *Fixbug #13852 2022-03-28 17:02:25 +08:00
tanghucheng 12c3fd80dd * Code for bug #21058. 2022-03-28 17:01:56 +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