Commit Graph
225 Commits
Author SHA1 Message Date
sunguangming 7f7f461677 * [bug#49219,done,1h] fix bug. 2024-06-13 00:40:10 +00:00
caoyanyi acc26ba24d Merge remote-tracking branch 'remotes/origin/release-20.0'
# Conflicts:
#	db/update20.0.beta2.sql
#	lib/zin/func.php
#	lib/zin/wg/fileselector/v1.php
#	lib/zin/wg/upload/v1.php
#	module/action/model.php
#	module/backup/js/index.ui.js
#	module/block/lang/vi.php
#	module/block/ui/recentprojectblock.html.php
#	module/block/zen.php
#	module/common/lang/vi.php
#	module/custom/lang/vi.php
#	module/execution/js/kanban.ui.js
#	module/execution/ui/story.html.php
#	module/kanban/js/view.ui.js
#	module/metric/test/calc/project/hour/ac_of_weekly_all_in_waterfall.php
#	module/metric/test/calc/project/rate/cv_in_waterfall.php
#	module/metric/test/calc/project/rate/cv_weekly_in_waterfall.php
#	module/mr/control.php
#	module/mr/ui/browsebyexecution.html.php
#	module/product/zen.php
#	module/programplan/zen.php
#	module/project/model.php
#	module/repo/lang/de.php
#	module/repo/lang/en.php
#	module/repo/lang/fr.php
#	module/repo/lang/zh-cn.php
#	module/space/ui/createapplication.html.php
#	module/testcase/ui/view.html.php
#	module/upgrade/model.php
#	www/js/zui3/zen-editor/p-0aaccc7e.js
#	www/js/zui3/zen-editor/p-276dd30f.js
#	www/js/zui3/zen-editor/p-2b13cc9a.js
#	www/js/zui3/zen-editor/p-38d18c5d.js
#	www/js/zui3/zen-editor/p-3f6cad83.js
#	www/js/zui3/zen-editor/p-51e3a048.js
#	www/js/zui3/zen-editor/p-617d463f.js
#	www/js/zui3/zen-editor/p-62c0132e.js
#	www/js/zui3/zen-editor/p-6d22490c.js
#	www/js/zui3/zen-editor/p-a563f50b.js
#	www/js/zui3/zen-editor/p-bf31230c.js
#	www/js/zui3/zen-editor/p-c6c95773.js
#	www/js/zui3/zen-editor/p-d83dd3f0.js
#	www/js/zui3/zen-editor/p-d8bedd14.js
#	www/js/zui3/zen-editor/p-eaaa4129.js
#	www/js/zui3/zen-editor/zen-editor.esm.js
#	www/js/zui3/zui.zentao.css
#	www/js/zui3/zui.zentao.js
2024-05-06 09:17:49 +08:00
liugang 1c13a31e99 * Rename $lang->colon to $lang->hyphen. 2024-04-28 14:35:26 +08:00
dingguodong 926744bf4f - Remove vi.php. 2024-04-17 09:11:48 +08:00
sunhao e188906f53 * zin: fix panel form max width. 2024-04-12 10:31:02 +08:00
xieqiyu 50ca6df94f * Fix the bug of import jira data from file. 2023-12-12 15:03:25 +08:00
xieqiyu 288c7af94d * Fix the bug of import jira data. 2023-12-12 11:15:27 +08:00
xieqiyu d7f44c8a6e * Add the void return for the model file. 2023-12-08 14:52:59 +08:00
xieqiyu 52eb5ccc8c * Optimize the code. 2023-12-07 16:03:29 +08:00
xieqiyu 29a10d461d * Refactor convert::getJiraDataFromDB method. 2023-12-07 15:30:30 +08:00
xieqiyu cfc98ac713 * Refactor convert::getIssueData method. 2023-12-07 15:21:47 +08:00
xieqiyu 23eaa5e58a * Refactor convert::importJiraFile method. 2023-12-07 14:58:31 +08:00
xieqiyu 19fc144adc * Refactor convert::importJiraAction method. 2023-12-07 14:22:04 +08:00
xieqiyu 2d4039fda3 * Refactor convert::importJiraIssueLink method. 2023-12-07 14:12:02 +08:00
xieqiyu 8b576b4c77 * Refactor convert::importJiraBuild method. 2023-12-06 16:24:06 +08:00
xieqiyu ca8de70f1d * Change function type. 2023-12-06 15:37:13 +08:00
xieqiyu 979fa61fd7 * Refactor convert::importJiraIssue method. 2023-12-06 15:36:30 +08:00
caoyanyi 8e17266f28 * Update commit link info. 2023-12-06 13:42:44 +08:00
xieqiyu 0fb41a9058 * Refactor methods of convert. 2023-12-06 13:31:11 +08:00
xieqiyu 3125a6a4b9 * Refactor convert::importJiraProject method. 2023-12-06 11:14:08 +08:00
xieqiyu 2c20fd3fe2 * Refactor convert::importJiraUser method. 2023-12-06 10:01:07 +08:00
xieqiyu c41e44c9f4 * Refactor the model file of convert. 2023-12-06 09:42:28 +08:00
xieqiyu a57e441d78 * Refactor convert::getJiraDataFromFile method. 2023-12-06 09:04:29 +08:00
xieqiyu d2eafee4f8 * Refactor the model file of convert. 2023-12-05 15:54:08 +08:00
xieqiyu 1f15036a87 * Refactor the module of convert. 2023-12-05 14:50:02 +08:00
xieqiyu 0b2c0345a9 * Refactor the module of convert. 2023-12-05 14:32:43 +08:00
xieqiyu a571791c08 * Refactor the control of convert. 2023-12-05 14:03:27 +08:00
xieqiyu fc3bc1b628 * Code for task#107100. 2023-12-05 13:45:23 +08:00
xieqiyu 97d1418464 * Code for task#107099. 2023-12-05 13:35:37 +08:00
caoyanyi a33ad4ad71 * Update copyright year. 2023-12-05 13:32:52 +08:00
xieqiyu f7ae9bf675 * Code for task#107098. 2023-12-05 13:32:43 +08:00
liugang 0a67de155e * Replace lang->user->xxxAB with lang->user->abbr->xxx. 2023-11-28 10:58:11 +08:00
dingguodong 0b7c7329e5 * Replace leftjoin to leftJoin. 2023-08-24 16:49:54 +08:00
liugang 122cde6a05 * convert: remove return message. 2023-08-04 11:15:07 +08:00
liugang 1b41b3ade2 * convert: set back url. 2023-08-01 16:25:57 +08:00
liugang 4ee385fee1 + convert: refactor the import jira page by zin. 2023-08-01 16:16:40 +08:00
liugang 5bd93fdba1 - convert: remove unused code. 2023-08-01 16:15:41 +08:00
liugang 15410f2a7e + convert: refactor the mapJira2Zentao page by zin. 2023-08-01 15:09:01 +08:00
liugang f735ff6d66 + convert: refactor the initJiraUser page by zin. 2023-08-01 15:06:50 +08:00
liugang d6354258b3 * convert: refactor the importJira method. 2023-08-01 15:05:41 +08:00
liugang 55de5e2081 * convert: refactor the initJiraUser method. 2023-08-01 15:05:17 +08:00
liugang f378423db2 * convert: refactor the mapJira2Zentao method. 2023-08-01 15:04:31 +08:00
liugang 2622335896 + convert: set back url. 2023-08-01 15:02:00 +08:00
liugang 563dfd10d5 * convert: display notice message below the dbName control. 2023-08-01 14:50:35 +08:00
刘刚 3bc6a85b3c revert b913ce3884
revert * convert: display the notice message below the dbName control.
2023-08-01 14:47:14 +08:00
liugang b913ce3884 * convert: display the notice message below the dbName control. 2023-08-01 14:45:42 +08:00
liugang d9834b4764 - convert: remove html tags from lang items. 2023-08-01 14:43:24 +08:00
liugang 1341753035 * convertModel: replace PDO with dbh. 2023-07-31 14:49:19 +08:00
liugang f6032f422a * convert: refactor the import notice method. 2023-07-31 14:48:51 +08:00
liugang 214cabfa75 + convert: refactor the importnotice page by zin. 2023-07-31 14:46:05 +08:00