Commit Graph
391 Commits
Author SHA1 Message Date
hufangzhou 087278d57b * Finish task #117721, add branch sort. 2024-05-11 08:45:56 +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
liumengyi 7611f4d200 * Fix bug #48623. 2024-04-28 16:37:21 +08:00
liumengyi b38ccdbf05 - Fix bug #48623, always show the merge button. 2024-04-28 16:01:44 +08:00
liyang 354c300c86 * Modify unit test directory structure and data generation method. 2024-04-22 14:25:50 +08:00
dingguodong 926744bf4f - Remove vi.php. 2024-04-17 09:11:48 +08:00
wangyuting 150af53038 * Fix workflow extra batch form bug. 2024-03-27 09:23:13 +08:00
xieqiyu a277f3f862 * Code for task#113756. 2024-03-19 11:08:13 +08:00
liyang db4e126402 * Remove debugging code. 2024-03-06 14:42:10 +08:00
tianshujie 648fd3c6bd * Fix bug #43015. 2024-01-30 15:37:48 +08:00
sunguangming 3fcfed5f81 * Fix bug #45370. 2024-01-29 11:18:31 +08:00
liumengyi f00956c666 * Fix bug #45409. 2024-01-29 10:08:51 +08:00
liumengyi fb5afcbc74 * Optimize code, remove keys. 2024-01-25 10:14:57 +08:00
caoyanyi db4f7d4125 * Adjust page title for branch. 2024-01-25 08:56:01 +08:00
liyang 61f3e146ec * Fix Bug #45196. 2024-01-25 08:53:46 +08:00
sunhao 3ad93ae2c4 * Use exclamation-sign icon instead of info-sign in confirm model. 2024-01-24 10:53:10 +08:00
tianshujie c4079c3357 * Fix bug #43015. 2024-01-19 11:17:33 +08:00
daitingting 5e0fb16fd3 * Fix bug #43238. 2024-01-11 01:41:46 +00:00
daitingting cb87226e3a * Fix bug #43235. 2024-01-10 09:00:44 +00:00
tianshujie 666f36dcb0 * Fix bug #43018. 2024-01-10 16:32:51 +08:00
wangyidong bdffe473fb * Fix bug #42951. 2024-01-10 10:28:29 +08:00
sunhao 68b7c2e97c * Rename .form-grid to .form-horz. 2024-01-03 17:04:19 +08:00
wangyuting e027f0761d * Fix check box abnormally selected bug. the bug #42051. 2024-01-03 09:12:20 +08:00
wangyuting 42b20ebc66 * Fix branch unit test bug. 2023-12-27 09:53:43 +08:00
wangyidong 95489d76a1 * Fix bug #41756. 2023-12-23 16:43:28 +08:00
wangyidong 2d0ef491e5 * Fix bug #42052. 2023-12-23 10:32:04 +08:00
liumengyi 0174b7172b * Fix bug #41854, remove branchPicker box if the product is normal. 2023-12-18 11:07:29 +08:00
sunhao f73a05dbb4 * Fix click dropmenu item not load page as expected. 2023-12-08 11:16:03 +08:00
caoyanyi 8e17266f28 * Update commit link info. 2023-12-06 13:42:44 +08:00
caoyanyi a33ad4ad71 * Update copyright year. 2023-12-05 13:32:52 +08:00
liumengyi 9dbea47e94 * Fix bug of error parameter type. 2023-11-13 16:35:52 +08:00
liumengyi f305bbf968 * Remove , at the end of row in the lastest children in branch. 2023-11-13 16:33:47 +08:00
caoyanyi 6ea6983436 * Adjust dtable sort params. 2023-11-10 15:02:33 +08:00
liugang 2e28d02e82 * branchModel: refactor the showBranch method. 2023-11-08 09:46:47 +08:00
liumengyi aa39428c49 * Update drop menu in heading. 2023-10-31 15:13:35 +08:00
liumengyi ac195c0bba * Fix error of changing branch. 2023-10-31 09:26:59 +08:00
tianshujie cbbfe8d4bf * Set default value of the sort table. 2023-10-19 10:49:54 +08:00
tianshujie de66ea6ba2 + Add table sort to branch::manage. 2023-10-19 10:42:43 +08:00
tianshujie 734738074c * Parameter types compatible with the setParamsForLink method. 2023-10-09 14:02:04 +08:00
caoyanyi e3b1cd6e5c - Remove unused param for branch model. 2023-09-22 14:44:10 +08:00
caoyanyi 14b6704c89 * Adjust sonar issue for branch. 2023-09-22 09:33:57 +08:00
tianshujie 5c8b6bbc30 * Refactor linkBranch4Project method and case. 2023-09-22 09:07:50 +08:00
tianshujie c452ce5ad8 * Refactor getByProducts method and case. 2023-09-21 17:27:26 +08:00
caoyanyi 5d4851beb4 * Adjust merge branch picker style. 2023-09-21 17:21:16 +08:00
caoyanyi b2275511be * Refactoring branch getPairsByProjectProduct method. 2023-09-21 17:05:13 +08:00
caoyanyi 275b5331f9 * Refactoring branch checkBranchData method. 2023-09-21 16:55:28 +08:00
tianshujie c295ecde16 * Remove the checkbox for the main branch. 2023-09-21 16:40:13 +08:00
tianshujie 5371a41cde * Refactor unlinkBranch4Project method. 2023-09-21 15:59:14 +08:00
caoyanyi 76fb93501b * Change unit test data build. 2023-09-21 15:57:25 +08:00
caoyanyi ae84a3c23f * Adjust unit test case and linkage. 2023-09-21 15:50:41 +08:00