8654 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rene Pfeuffer	520c0d6ecf	Close branch feature/merge_with_squash	2019-11-08 15:41:45 +00:00
Rene Pfeuffer	ae32b6f797	Use dedicated exception for unsupported merge strategies	2019-11-08 15:44:37 +01:00
Rene Pfeuffer	52ccce1aaa	Secure test	2019-11-08 15:43:51 +01:00
Rene Pfeuffer	8e0026962d	Fix typo	2019-11-08 14:10:27 +01:00
Eduard Heimbuch	313ec7fe5d	fix dependencies after removing mergeResource	2019-11-08 13:10:31 +01:00
Eduard Heimbuch	b1216a898b	remove mergeResource and move dryRun to review-plugin	2019-11-08 11:46:13 +01:00
Eduard Heimbuch	a41f490871	refactor after review	2019-11-08 08:36:00 +01:00
Eduard Heimbuch	e736ae6c50	cleanup	2019-11-07 13:42:45 +01:00
Eduard Heimbuch	ec6b4493c8	use strategy pattern for mergeStrategies	2019-11-07 11:50:28 +01:00
Eduard Heimbuch	de09097203	cleanup	2019-11-07 08:14:15 +01:00
Eduard Heimbuch	cf90654e24	implement fast forward if possible	2019-11-06 15:26:20 +01:00
Eduard Heimbuch	b4f1e8874a	change mergeStrategy order	2019-11-06 09:54:17 +01:00
Eduard Heimbuch	7e00d22e9e	merge 2.0.0-m3	2019-11-06 07:48:35 +01:00
Eduard Heimbuch	bc5948f823	add new MergeStrategies	2019-11-06 07:47:23 +01:00
Sebastian Sdorra	4e053b1aa0	Merged in feature/modify_for_svn (pull request #342) ... Feature/modify for svn	2019-11-05 13:30:25 +00:00
Sebastian Sdorra	c18c64c15a	Close branch feature/modify_for_svn	2019-11-05 13:30:25 +00:00
Eduard Heimbuch	db46441adf	move mergeResultDto + mapper to scm-core	2019-11-05 09:51:58 +01:00
Eduard Heimbuch	9df12bc35e	check if mergeStrategy is supported for mergeCommand	2019-11-04 17:34:44 +01:00
Eduard Heimbuch	4b024c650c	implement squash to mergeCommand	2019-11-04 15:16:37 +01:00
Sebastian Sdorra	a532426958	refactor SvnModifyCommand to be more readable	2019-11-04 12:16:22 +01:00
Sebastian Sdorra	3aea20370a	fixed returning null for getScmRepository from SimpleSvnWorkDirFactory	2019-11-04 12:03:19 +01:00
Sebastian Sdorra	e4c8783c61	return null if commit was not merged into requested branch	2019-11-04 11:46:27 +01:00
Eduard Heimbuch	d5bd83fafb	fix encoding and decoding for branches including slashes	2019-11-01 13:52:53 +01:00
Eduard Heimbuch	557856185a	small fix	2019-11-01 10:18:13 +01:00
Eduard Heimbuch	d7d7c87d16	Merged in feature/fix_sonar_and_lifecycle (pull request #345) ... Feature/fix sonar and lifecycle	2019-11-01 09:13:35 +00:00
Eduard Heimbuch	b9fd0b3011	Close branch feature/fix_sonar_and_lifecycle	2019-11-01 09:13:35 +00:00
Eduard Heimbuch	33cce15e33	fix navLink Highlighting for sourceext	2019-11-01 09:40:20 +01:00
Eduard Heimbuch	5a9cbbc073	use i18n for missing extension warning / fix encoding for branches containing slashes	2019-11-01 09:29:57 +01:00
Sebastian Sdorra	c9defc7595	added missing tests for language select of DateFromNow	2019-10-30 15:46:03 +01:00
Sebastian Sdorra	55efed92f9	fix DateFromNow i18n without provided locales	2019-10-30 15:29:49 +01:00
Sebastian Sdorra	8b632fdb37	fix wrong localization of dates for locales with regions such as de_DE	2019-10-30 15:26:43 +01:00
Sebastian Sdorra	f5fb4fb11a	fix sonarqube warning about js array sort	2019-10-30 14:52:46 +01:00
Sebastian Sdorra	e878f86b46	update apache tika to version 1.22	2019-10-30 14:18:00 +01:00
Sebastian Sdorra	3a4c4b0986	update commons-codec to version 1.13	2019-10-30 14:17:15 +01:00
Sebastian Sdorra	7252d10b95	update apache shiro to version 1.4.1	2019-10-30 14:14:30 +01:00
Sebastian Sdorra	6fe2765edb	update jackson to version 2.10.0	2019-10-30 14:13:14 +01:00
Sebastian Sdorra	8e9aaea292	update jetty to version 9.4.22.v20191022	2019-10-30 13:59:25 +01:00
Sebastian Sdorra	7c1c067798	Merged in feature/enhance_ui_experience (pull request #344) ... Feature/enhance ui experience	2019-10-30 12:09:17 +00:00
Sebastian Sdorra	1a1570fba0	Close branch feature/enhance_ui_experience	2019-10-30 12:09:17 +00:00
Eduard Heimbuch	4f17bc6b1c	refactor backend for modifyCommand / add sourceExtension for plugins	2019-10-30 12:59:54 +01:00
Florian Scholdei	3c239aea4e	Update storyshots	2019-10-29 17:21:40 +01:00
Florian Scholdei	b74865f4df	Correct className type	2019-10-29 16:44:35 +01:00
Florian Scholdei	289b3a3d21	Add styling of group memberlist	2019-10-29 16:41:35 +01:00
Florian Scholdei	b5d30e53e4	Fix border-radius for modal in case no .modal-foot exists	2019-10-29 16:15:25 +01:00
Florian Scholdei	cd4874f4d3	Specify card-columns to select css properties more clearly	2019-10-29 14:35:23 +01:00
Florian Scholdei	37b8a50e98	Pass new title option	2019-10-29 14:33:52 +01:00
Florian Scholdei	e74f8a4d4e	Remove doubled field/column	2019-10-29 14:32:27 +01:00
Florian Scholdei	f496279592	Add title option comparable to label for InputFields	2019-10-29 14:31:47 +01:00
Florian Scholdei	ec488c1880	Remove unused field grouping	2019-10-29 14:20:14 +01:00
Florian Scholdei	73c4b21429	Hide proxy excludes list when empty	2019-10-29 14:18:47 +01:00