Commit Graph
2978 Commits
Author SHA1 Message Date
wangyidong d4c95e6e9c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 09:14:41 +08:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
zhouxin d55a19884c * Fix bug #25995. 2022-08-03 08:25:11 +00:00
liugang 1712298192 * Finish task #63383. 2022-08-03 14:37:01 +08:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
liumengyi a90490cc26 * Finish task #62939. 2022-08-02 09:05:55 +08:00
王怡栋 cbd56f4fb7 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4706
2022-07-28 07:50:28 +00:00
zhouxudong 63bb63d9cf * Fix bug #25417. 2022-07-28 06:15:33 +00:00
王怡栋 5ec5c071f3 Merge branch 'sprint/220_tianshujie_fixbug' into 'master'
Sprint/220 tianshujie fixbug

See merge request easycorp/zentaopms!4707
2022-07-28 05:47:21 +00:00
tianshujie dbcb3c9f1b * Fix bug #25465. 2022-07-28 13:44:04 +08:00
liumengyi c9753f5490 * Fix bug #25814. 2022-07-28 13:22:32 +08:00
liumengyi 95c7c2ccfc * Fix bug #25814. 2022-07-28 13:01:06 +08:00
liumengyi 60b32e04da * Fix bug #25797. 2022-07-28 09:54:42 +08:00
王怡栋 378fb33899 Merge branch 'sprint/xuanxuan_112' into 'master'
Sprint/xuanxuan 112

See merge request easycorp/zentaopms!4687
2022-07-27 08:59:23 +00:00
tianshujie fd1868a287 * Fix bug #25465. 2022-07-27 16:22:07 +08:00
王怡栋 8eb24df570 Merge branch 'sprint220_zg_61964' into 'master'
Sprint220 zg 61964

See merge request easycorp/zentaopms!4663
2022-07-27 02:05:06 +00:00
xieqiyu 94c72b04e1 * Fix bug#25708. 2022-07-27 08:29:42 +08:00
chaideqing 9fc68cfe73 * bug view remove toTask in xuanxuan 2022-07-26 16:39:39 +08:00
zenggang 7973da34a6 * Finish task#61964 2022-07-26 06:03:35 +00:00
孙广明 867f5467d9 * Fix bug #25678. 2022-07-26 13:20:41 +08:00
zhouxudong cf6845878f * Fix bug. 2022-07-26 02:21:28 +00:00
chaideqing 3fc3cf64e0 * remove zentao card's top-right button 2022-07-26 09:12:42 +08:00
liumengyi ba22c27e28 * Fix bug #24181. 2022-07-22 10:35:37 +08:00
tianshujie 03f9bca910 * Fix bug #25465. 2022-07-21 08:46:07 +08:00
liumengyi 9ed05fad25 * Optimize code for task #61173. 2022-07-20 15:59:50 +08:00
liumengyi d161817441 * Optimize code for task #61173. 2022-07-20 15:56:59 +08:00
liumengyi 13eda1d631 * Finish task #61173. 2022-07-20 10:28:01 +08:00
liyuchun fc61e1c142 * Fix bug #25251. 2022-07-15 06:49:47 +00:00
王怡栋 7e682c99c2 Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110

See merge request easycorp/zentaopms!4563
2022-07-15 03:17:39 +00:00
李玉春 51b2242326 Liyuchun fixbug 2022-07-15 03:14:43 +00:00
guofeilong dafb0452d3 * Fix bug #23351 2022-07-14 05:50:28 +00:00
guofeilong 618d44374a Fix bug #23351 in bug and task batchcreate 2022-07-14 05:37:00 +00:00
sunjun cdef8e07bf fixbug_25177 2022-07-14 03:16:05 +00:00
zhouxudong 73dd8c3eeb * Fix bug about kanban actions. 2022-07-13 07:17:04 +00:00
hufangzhou d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +08:00
chaideqing 69f20c1205 * replace xhtml to html when click card 2022-07-13 10:54:12 +08:00
sunjun b905ccead6 sprint_60477 2022-07-13 01:38:10 +00:00
sunjun e8dc136b0e sprint_60477 2022-07-12 08:14:48 +00:00
xieqiyu 658a187e47 * Fix bug of story and bug action in execution. 2022-07-12 14:05:40 +08:00
chaideqing 3532e82841 * fix card show blank above header 2022-07-11 15:29:26 +08:00
wangyidong 43c9570c98 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-08 17:36:59 +08:00
wangyidong bb0fdc74c9 * code for bug #24927. 2022-07-08 17:35:06 +08:00
孙广明 77ec1c0bac Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59543.

See merge request easycorp/zentaopms!4433
2022-07-08 07:10:47 +00:00
liumengyi f9b24fb48c * Fix bug of task #23123. 2022-07-08 13:52:33 +08:00
liumengyi 26b430660a * Fix bug #23123. 2022-07-08 13:29:56 +08:00
xieqiyu 375b0c2a6f * Code for task#59543. 2022-07-08 13:25:39 +08:00
tianshujie 3213065954 * Fix bug #24802. 2022-07-08 13:05:07 +08:00
孙广明 118e1f7854 Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban

See merge request easycorp/zentaopms!4420
2022-07-08 01:20:53 +00:00
tianshujie be1ca95624 * Fix bug #24977. 2022-07-08 08:15:42 +08:00
刘刚 6d59cccaec Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24865.

See merge request easycorp/zentaopms!4419
2022-07-08 00:01:15 +00:00