Commit Graph
360 Commits
Author SHA1 Message Date
tianshujie 49e5da21d7 * [bug#52870,done,0.3h] add divider for execution name. 2024-07-19 10:17:36 +08:00
sunguangming 2275b6c8f5 * [bug#51744,done,0.5h] fix bug. 2024-07-01 08:51:14 +08:00
liumengyi 8716476fc3 * [story#57486,doing,1h] filter wait releases. 2024-06-28 09:32:13 +08:00
sunguangming f83f00f61f Merge branch 'main' into feature/epic 2024-06-20 07:04:51 +00:00
xieqiyu 29363dae9b * [task#120516,done,1h] The bug cannot be seen in the resolved build after change the bug resolved build. 2024-06-12 10:53:00 +08:00
刘刚 187e9bc6d8 Merge branch 'ztflow-zhouxin-main#zhouxin' of zentao/zentaopms (#59) 2024-06-11 06:47:32 +00:00
zhouxin dd6f2289a1 * [bug#47595,done,1h] filter closed execution when create bug. 2024-06-11 14:27:54 +08:00
liuruogu 5fa7d0c77f * [bug#49630,done,0.3h,0h] Fix moduleID is empty for testcase to bug page. 2024-06-11 10:43:43 +08:00
tanghucheng efa54e3be1 * [task#1h,3h] Fix bug action. 2024-06-06 18:40:38 +08:00
xieqiyu 3f3ca3524c * [task#120128,doing,0.5h] Resolve import bug errors. 2024-06-06 15:07:27 +08:00
liumengyi 43d1e5b71f * [bug#50623,done,0.2h] append story if story exists. 2024-06-05 14:44:56 +08:00
liumengyi 8a5421f2af + [bug#50445,done,0.5h] append bug story to stories. 2024-06-05 10:03:25 +08:00
liumengyi 1e86174527 * Fix bug #50467. 2024-06-03 08:35:45 +08:00
sunguangming 5f6ab12db7 Merge branch 'release20.1' into epic 2024-05-31 17:28:02 +08:00
liumengyi 1beb5c4050 * Fix bug #50467. 2024-05-31 14:29:26 +08:00
xieqiyu 25a562924f * [bug#50185] Only get main branch stories when create bug select main branch in execution. 2024-05-31 10:04:16 +08:00
xieqiyu 3e75a6c2ee * [bug#50185] Only get main branch stories when create bug select main branch in execution. 2024-05-31 08:55:28 +08:00
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