Commit Graph
3022 Commits
Author SHA1 Message Date
tanghucheng 004561024f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-21 17:37:48 +08:00
tianshujie 03f9bca910 * Fix bug #25465. 2022-07-21 08:46:07 +08:00
tanghucheng d0694aae7e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-20 16:02:00 +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
tanghucheng 18e857217f * Code for port. 2022-07-19 17:25:30 +08:00
tanghucheng d9cec2568a * Code for bug config. 2022-07-18 14:45:09 +08:00
tanghucheng 1baa908ff1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-17 17:58:45 +08:00
tanghucheng 05c0195520 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-15 16:04:55 +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
tanghucheng effd521db5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-14 15:49:38 +08: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
tanghucheng 6c70b338d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-14 13:04:12 +08:00
sunjun cdef8e07bf fixbug_25177 2022-07-14 03:16:05 +00:00
tanghucheng c22da9fe5b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-13 22:55:21 +08:00
zhouxudong 73dd8c3eeb * Fix bug about kanban actions. 2022-07-13 07:17:04 +00:00
tanghucheng 6056bebedc Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-13 14:38:40 +08:00
hufangzhou d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +08:00
tanghucheng 6cfd29c5b2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-13 13:19:44 +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
tanghucheng 817ebdaf5d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-11 08:44:42 +08:00
tanghucheng 39b0ffe0f3 * Code for export story. 2022-07-10 21:15:17 +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
tanghucheng 6eb8428c4b * Fix bug config. 2022-07-08 15:34:31 +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
tanghucheng 525e444cd5 * Fix bug config and execl config. 2022-07-08 13:33:54 +08:00
tanghucheng ce1620363e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-08 13:33:44 +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
tanghucheng ad32cd3092 * Fix getRows and set config for bug. 2022-07-08 11:00:47 +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
xieqiyu 38dcc95cb4 * Code for task#59543. 2022-07-07 18:08:59 +08:00
liuruogu 63fe5c2750 * Fix bug #24865. 2022-07-07 09:23:56 +00:00
xieqiyu 2f81269858 * Code for task#59543. 2022-07-07 16:13:55 +08:00
liumengyi e709c4bbda * Finish task #59480, #59481. 2022-07-07 14:12:45 +08:00
王怡栋 10b95d1e48 Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban

See merge request easycorp/zentaopms!4398
2022-07-07 05:10:07 +00:00
xieqiyu ef190dc83e * Code for task#59543. Update create bug and batch create bug. 2022-07-07 11:42:54 +08:00