570 Commits

Author	SHA1	Message	Date
René Pfeuffer	00ab764dab	Store repository id in native config file ... Hooks can read this repository type dependant config file and handle the changes for the correct repository id	2018-11-26 17:22:17 +01:00
René Pfeuffer	c8fc673ce0	Remove hooks for internal repository id	2018-11-23 16:12:35 +01:00
René Pfeuffer	0f7e49d20f	Bring constant home	2018-11-23 15:52:21 +01:00
René Pfeuffer	3d671caada	Let dao create repository base directory before native creation	2018-11-23 15:04:59 +01:00
René Pfeuffer	e8558e07ec	Use repository dao to find repository for given directory in hooks	2018-11-23 10:13:47 +01:00
René Pfeuffer	20f5e7be1f	Cleanup usage of InitialRepositoryLocationResolver and RepositoryLocationResolver	2018-11-22 17:06:29 +01:00
Mohamed Karray	f081cdda18	merge	2018-11-22 07:32:12 +01:00
Mohamed Karray	e772f75e2e	remove the repository directory from the config ui components	2018-11-22 07:29:41 +01:00
Mohamed Karray	8aaea44f1a	use relative path for repository directory	2018-11-22 07:05:17 +01:00
René Pfeuffer	024bcfaf87	Merged in feature/ui-abstraction-repository-config (pull request #110) ... Feature/ui abstraction repository config	2018-11-21 13:06:41 +00:00
Mohamed Karray	bb1c84ba24	modify metadata.xml only if needed ... introduce a defaultRepositoryDirectory in the XmlRepositoryDatabase Bugfix: modify repository with changed location	2018-11-21 12:01:13 +01:00
Mohamed Karray	39e5c19251	merge	2018-11-15 11:28:33 +01:00
Mohamed Karray	f8ae7cedf7	Refactor the repository store implementation in order to store repositories in specific paths.	2018-11-15 10:04:16 +01:00
Maren Süwer	5bb4f04667	renaming GlobalConfiguration to Configuration	2018-11-13 13:09:02 +01:00
René Pfeuffer	716b49a039	Merge with 2.0.0-m3	2018-11-13 10:36:31 +01:00
Sebastian Sdorra	1002db3a4b	disable default ui linking for plugins, enable it only for core plugins	2018-11-10 14:19:04 +01:00
René Pfeuffer	96c2114e53	Reduce SecurityFilter to user injection and enable SecurityInterceptor ... Remove all the unnecessary stuff and all endpoints that would be no longer secure.	2018-11-09 16:06:31 +01:00
René Pfeuffer	232e4fc072	Delete wrong throws JavaDoc declarations	2018-11-08 17:01:57 +01:00
René Pfeuffer	78da8c743f	Put repository in git context to create proper exceptions	2018-11-08 16:42:45 +01:00
Sebastian Sdorra	cf519a7545	Merged in feature/merge_api (pull request #106) ... Feature merge api	2018-11-08 15:08:07 +00:00
René Pfeuffer	6bddf9951f	Make commit message configurable	2018-11-08 14:59:00 +01:00
René Pfeuffer	97d158ab35	Naming	2018-11-08 14:39:30 +01:00
René Pfeuffer	8d057f7745	Hide details	2018-11-08 14:37:18 +01:00
René Pfeuffer	42f0632a23	Add check for merged file to unit test	2018-11-08 14:03:09 +01:00
René Pfeuffer	720862296e	Use logged in user for author as default	2018-11-08 13:30:05 +01:00
Sebastian Sdorra	2201f2436e	Merged in feature/errorhandling (pull request #99) ... Feature Error Handling	2018-11-08 09:36:18 +00:00
René Pfeuffer	6f7aa24700	Use jav nio to create temp directory	2018-11-08 10:00:21 +01:00
René Pfeuffer	5ca8d4d049	Extract methods to emphasize flow	2018-11-08 09:53:35 +01:00
René Pfeuffer	0714d5f960	Extract methods to emphasize flow	2018-11-08 09:32:43 +01:00
René Pfeuffer	1037d8d266	Merge with 2.0.0-m3	2018-11-08 09:21:41 +01:00
Sebastian Sdorra	c59ba9e149	Merged in feature/log_two_revisions (pull request #104) ... Feature log two revisions	2018-11-07 14:07:50 +00:00
Sebastian Sdorra	73c402890c	Merged in feature/diff_two_revisions (pull request #101) ... Feature diff between two revisions	2018-11-07 13:54:23 +00:00
René Pfeuffer	2f91531d05	Assert existence of pool directory	2018-11-07 14:04:00 +01:00
René Pfeuffer	8771f68081	Set author for merge	2018-11-07 14:02:02 +01:00
René Pfeuffer	2d04e6c2f0	Specify not mergeable files in merge result	2018-11-07 13:34:35 +01:00
René Pfeuffer	26d5e6e062	Set merge message	2018-11-07 13:17:21 +01:00
René Pfeuffer	d5da106038	Implement merge using api of class Git	2018-11-07 12:52:40 +01:00
René Pfeuffer	e377ce5988	Implement first steps for actual merge	2018-11-07 11:52:49 +01:00
René Pfeuffer	04c5d6f84a	Fix deletion of temporary clone directory	2018-11-07 11:13:21 +01:00
René Pfeuffer	e2766d494a	Register SimpleGitWorkdirFactory in guice context	2018-11-07 10:38:01 +01:00
René Pfeuffer	62c20b071b	Fix reminders of dry run	2018-11-07 10:33:47 +01:00
René Pfeuffer	33642352ea	Start with a simple factory instead of a complex pool	2018-11-07 10:28:27 +01:00
Sebastian Sdorra	b029efb5c9	update ui-extensions to fix unit tests	2018-11-07 09:45:12 +01:00
René Pfeuffer	fc3e08d612	Include dry run in merge command	2018-11-07 08:32:27 +01:00
René Pfeuffer	23783d43f6	Fix build breaker	2018-11-07 08:19:38 +01:00
René Pfeuffer	6863337faf	Implement first steps for merge	2018-11-06 17:14:27 +01:00
Sebastian Sdorra	f5f96042b3	use global configuration abstraction to implement global configuration for git	2018-11-06 16:38:49 +01:00
René Pfeuffer	e0cc99a3d8	Implement simple merge dry run	2018-11-06 14:40:55 +01:00
René Pfeuffer	cccadef5cc	Refactor unit test	2018-11-06 12:40:44 +01:00
René Pfeuffer	adce24fcd7	Enhance unit test	2018-11-06 12:36:36 +01:00