Commit Graph
443 Commits
Author SHA1 Message Date
sunguangming c459e08f1f Merge branch 'master' into story 2024-05-29 15:44:14 +08:00
liumengyi 7ca8621db6 * Fix bug #50254, get files from results. 2024-05-29 09:50:06 +08:00
liumengyi 16e0780c3d * Fix bug #50263, check http_referer. 2024-05-29 09:50:04 +08:00
xieqiyu 4ce0041a84 * [refac] Modify the issue of code review. 2024-05-29 09:50:04 +08:00
daitingting 5542fa40d5 * Fix bug #50143. 2024-05-29 09:50:04 +08:00
liumengyi 39b11ac64c * Fix bug #50254, get files from results. 2024-05-28 17:27:48 +08:00
liumengyi 1ba522fbe0 * Fix bug #50263, check http_referer. 2024-05-28 10:09:20 +08:00
xieqiyu b815d562d4 * [refac] Modify the issue of code review. 2024-05-28 09:32:34 +08:00
daitingting 0745f89e47 * Fix bug #50143. 2024-05-27 09:31:49 +00:00
sunguangming 7442f47097 Merge branch 'master' into story 2024-05-24 14:07:06 +08:00
sunguangming a294acef09 Merge branch 'master' into story 2024-05-24 13:49:56 +08:00
liumengyi c378ff1a22 * Fix bug #50073. 2024-05-23 14:22:15 +08:00
liumengyi fdd682f4f2 * Fix bug #50073. 2024-05-23 11:22:10 +08:00
xieqiyu 8c5316efb7 * Fix the bug of upload images when batch create bug. 2024-05-22 13:48:07 +08:00
xieqiyu 78538dfd13 * Fix the bug of upload images when batch create bug. 2024-05-22 13:17:26 +08:00
sunguangming 24d3d7fb0a Merge branch 'master' into story 2024-05-22 11:27:49 +08:00
liumengyi f6c5085b00 * Fix bug #49572, don't set release label to build. 2024-05-20 14:30:58 +08:00
sunguangming 1cfbf7d74b Merge branch 'master' into story 2024-05-15 15:04:13 +08:00
sunguangming 28b2b78698 Merge branch 'master' into story 2024-05-09 15:04:07 +08:00
wangyuting ec449f2039 * Fix product object is null bug. 2024-05-09 15:01:03 +08: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
hufangzhou 0180a8b6fa * Fix bug #48293. 2024-04-25 17:04:26 +08:00
hufangzhou d47e91c07e * Fix bug #48293. 2024-04-24 11:20:10 +08:00
tianshujie bced2b76b4 Merge remote-tracking branch 'origin/release-20.0' 2024-04-23 17:12:24 +08:00
sunguangming d50a96315a * Modify code style. 2024-04-22 16:45:06 +08:00
liumengyi b7e28d5c83 * Add label for the release in the builds. 2024-04-22 15:42:30 +08:00
caoyanyi 7400302e94 Merge branch 'release-20.0' 2024-04-22 10:23:21 +08:00
sunguangming 540da8a879 * Finish task #116686. 2024-04-22 10:21:19 +08:00
sunguangming 0423a573a9 * Filter story pairs. 2024-04-19 11:01:13 +08:00
xieqiyu efa83c1529 * Fix bug#47990. 2024-04-19 10:01:26 +08:00
tianshujie 3b0492258f + Add injection and identify field for bug list page. 2024-04-18 13:57:54 +08:00
tianshujie b311b42d61 + Add injection and identify field for edit a bug page. 2024-04-18 13:49:14 +08:00
liumengyi 5b13019649 * Fix bug #47976. 2024-04-18 10:43:11 +08:00
liumengyi 0aa2ba9af5 * Fix bug #47926, set module owner as assignedTo. 2024-04-17 16:52:46 +08:00
tianshujie 062c8d021d * Add injection and identify field for the create, view, export bug. 2024-04-17 15:51:25 +08:00
liumengyi 2d71727b88 + Fix bug of undefined param, add projectExecutionPairs for bug::edit. 2024-04-07 16:44:54 +08:00
liumengyi 1f3905730f * Fix bug #45151. 2024-04-07 16:21:34 +08:00
wangyuting 07f89106a8 * Fix workflow extra editor field bug. 2024-03-26 16:54:39 +08:00
wangyuting 555362002e * add workflow extra field to bug batchedit page. 2024-03-26 14:32:30 +08:00
wangyuting c889f757cb * Fix editor bug for bug edit page. 2024-03-25 10:32:26 +08:00
tianshujie 5274f4e718 * Finish task #113758. 2024-03-18 16:19:54 +08:00
caoyanyi 1de446f6ce * Merge for release branch. 2024-03-15 14:59:57 +08:00
xieqiyu 3a0f95382f * Code for task#112299. Refactor bug module. 2024-03-12 16:29:24 +08:00
songchenxuan d83dcc198c * Fix api bug. 2024-03-11 16:51:43 +08:00
liumengyi 81b2a02e5e * Fix bug #46600, set objectType empty to get all builds, and if the branch is empty string, it isn't in the branch and fix undefined error. 2024-03-06 14:42:09 +08:00
liumengyi 73ddfdd862 * Fix bug #42306, show branch field only if the execution is releated to a branch product. 2024-02-22 16:17:26 +08:00
wangyuting 4c49d09f1a * Fix resolvedBuild is empty bug. bug #45945. 2024-02-19 14:22:19 +08:00
xieqiyu e8f9fd1dbf * Fix bug#45874. 2024-02-19 09:39:08 +08:00
caoyanyi 541c7c1d8e * Adjust bug operate picture cannot display error. 2024-02-05 17:11:45 +08:00