Commit Graph
117 Commits
Author SHA1 Message Date
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tanghucheng 76f830aad6 * Set memory_limit and max_execution_time for import. 2022-11-07 10:12:28 +08:00
tanghucheng 48cc91b414 * Update picker select style for showimport. 2022-11-04 15:52:03 +08:00
tanghucheng bdf77c8831 * Fix bug #29282. 2022-11-04 13:57:51 +08:00
王怡栋 b7247e2652 Merge branch 'master_feedback_1267' into 'master'
* Resolved feedback #1267.

See merge request easycorp/zentaopms!5955
2022-11-01 05:31:51 +00:00
liuhong 1da094b1a0 * Resolved feedback #1267. 2022-10-31 07:25:25 +00:00
liuhong f9e5e9858a * Adjust code #1049 for story export. 2022-10-31 07:00:40 +00:00
liuhong 056eb5fe9d * Adjust code for feedback #1049. 2022-10-30 04:22:57 +00:00
liuhong 07fd9dc9aa * Fix feedback #1049. 2022-10-30 03:59:56 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tanghucheng f5e4fbbe9c * Set memory_limit for export. 2022-10-24 10:17:41 +08:00
wangyuting2 05f6ade106 * Finish task #71569. 2022-10-20 08:30:23 +00:00
wangyuting2 aebe15c2ad * Fix bug. 2022-10-20 00:54:13 +00:00
tanghucheng 21a17f9e0e * Remove \n for import bug. 2022-10-20 07:54:53 +08:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
lanzongjun 0ca53357c1 showimport mailto init 2022-10-11 14:11:00 +08:00
zenggang 78b8da1ba8 * Fix bug#28268 2022-10-08 08:09:12 +00:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
sunguangming 89a72fc20e * Code for bug export bug. 2022-09-29 13:53:54 +08:00
王怡栋 a728c2e90c Merge branch 'fixbug' into 'master'
* Fix bug #27891,27610.

See merge request easycorp/zentaopms!5535
2022-09-26 00:38:39 +00:00
tanghucheng 142da875c3 * Fix bug #27891,27610. 2022-09-26 08:36:57 +08:00
王怡栋 423dfcd7e9 Merge branch 'cyy_bug' into 'master'
* Modify edit multi task.

See merge request easycorp/zentaopms!5512
2022-09-23 05:50:19 +00:00
曹延义 2b13096af4 * Fix bug #27615 and adjust code. 2022-09-23 13:43:05 +08:00
tanghucheng fdb61161d3 * Fix export error for task #69596,69595. 2022-09-23 10:48:06 +08:00
liuyongkai 5795f3a7f9 * Fix export excel bugs. 2022-09-22 06:21:47 +00:00
sunguangming a9241fb173 * Finish task #69595. 2022-09-21 14:16:24 +08:00
sunguangming a7da5afcfe * Code for task #69020. 2022-09-20 09:44:22 +08:00
sunguangming d0f27c1ef0 * Fix #69020 bug. 2022-09-20 09:24:29 +08:00
sunguangming ebe4a88493 * Finish task #69020. 2022-09-19 16:36:48 +08:00
sunguangming 404f87c73d * Finish task #69020. 2022-09-19 14:55:56 +08:00
tanghucheng 714dffe615 * Fix bug for bug export. 2022-09-14 14:42:44 +08:00
王怡栋 17aec51cbe Merge branch 'master' into 'importExport'
# Conflicts:
#   module/port/model.php
2022-09-07 02:30:00 +00:00
唐胡成 25613fe0c6 Update model.php 2022-09-06 09:05:22 +00:00
wangyuting2 2fa3bb0892 * Finish task #67872. Fix bug #26826. 2022-09-06 15:26:21 +08:00
tanghucheng 7ceeee8ae7 * Add judge edition for port. 2022-09-06 10:42:20 +08:00
tanghucheng f82ca09e99 * Compatible workflow fields for import|export. 2022-08-31 11:15:59 +08:00
tanghucheng a90b732c36 * Fix bug #26886. 2022-08-25 15:46:38 +08:00
tanghucheng 1808127ba7 * Fix bug for port. 2022-08-25 11:10:31 +08:00
lanzongjun 3d87534f3c * fix bug #26819 2022-08-25 09:07:01 +08:00
lanzongjun f5c4011039 * fix bug #26819 2022-08-25 08:57:55 +08:00
tanghucheng a1b16e0132 * Fix bug #26265. 2022-08-23 21:03:50 +08:00
王怡栋 b1516dbc92 Merge branch 'importExport' into 'master'
* Fix bug #65908.

See merge request easycorp/zentaopms!5063
2022-08-23 01:58:31 +00:00
王怡栋 c259250003 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #65923

See merge request easycorp/zentaopms!5054
2022-08-23 01:54:36 +00:00
tanghucheng b9d031bda1 * Fix bug #65908. 2022-08-23 09:27:56 +08:00
lanzongjun f5395d3cdb * finish task #65923 2022-08-22 15:58:47 +08:00
tanghucheng 17f08b4b70 * Fix bug #26714. 2022-08-22 10:46:13 +08:00
tanghucheng 68f35f5262 * Fix bug #26520,26520. 2022-08-16 13:58:19 +08:00
tanghucheng af4bd538f1 * Fix bug for port. 2022-08-15 14:56:57 +08:00
tanghucheng 2bc6e7a1e8 * Sort execution and project gantt menu . 2022-08-15 14:28:31 +08:00