704 Commits

Author	SHA1	Message	Date
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
René Pfeuffer	8be8c19a26	Implement diff between two changesets for git	2018-11-06 12:04:33 +01:00
René Pfeuffer	a725e4232b	Add unit test for git diff command	2018-11-06 11:26:36 +01:00
René Pfeuffer	176cda36dc	Merge	2018-11-06 09:26:41 +01:00
René Pfeuffer	cf05235dfa	Add context to InternalRepositoryException	2018-11-06 09:14:20 +01:00
Sebastian Sdorra	dd95c9c306	implemented git repository type configuration	2018-11-06 07:59:34 +01:00
René Pfeuffer	2508a1b9b7	Implement log between two changesets for git	2018-11-05 16:42:20 +01:00
René Pfeuffer	6c1f77cc1b	Merge with 2.0.0-m3	2018-11-02 16:57:44 +01:00
Sebastian Sdorra	8a10ac27e3	update ui-bundler to 0.0.19 and smp-maven-plugin to 1.0.0-alpha-3	2018-10-29 16:38:11 +01:00
Sebastian Sdorra	95a7450e38	merge with branch 2.0.0-m3	2018-10-26 08:57:15 +02:00
Sebastian Sdorra	4104a06661	use flow typings of ui-components for plugins	2018-10-26 08:54:05 +02:00
René Pfeuffer	6eb3c38655	Create error response for already existing entities	2018-10-25 15:31:42 +02:00
René Pfeuffer	f041b4ecb6	Merge with 2.0.0-m3	2018-10-25 10:15:32 +02:00
Sebastian Sdorra	6df3aa49ac	Merged in feature/i18n_for_plugins_v2 (pull request #92) ... Feature/i18n for plugins v2	2018-10-24 09:22:47 +00:00
Sebastian Sdorra	6233e600f2	fix missing translate (t) function	2018-10-22 13:00:44 +02:00
Mohamed Karray	9cb661b460	plugin translation servlet	2018-10-20 14:40:03 +02:00
Mohamed Karray	3ac803ce82	merge	2018-10-19 11:26:14 +02:00
Mohamed Karray	9dc32fe128	add i18n Servlet	2018-10-19 11:15:37 +02:00
René Pfeuffer	b74fb814b8	Introduce default error object with context for not found exceptions	2018-10-18 13:12:16 +02:00
Sebastian Sdorra	5871bf052f	update ui-bundler	2018-10-17 16:50:40 +02:00
René Pfeuffer	8c46a7f714	Name things	2018-10-17 08:05:29 +02:00
Sebastian Sdorra	6fb99b70cd	#998 simplify api and use jgit to link new head	2018-10-15 21:32:03 +02:00
Sebastian Sdorra	24e2885524	#998 git: set repository head to default branch	2018-10-14 19:11:56 +02:00
René Pfeuffer	b4c854ee99	Use more generic collection instead of list	2018-10-11 09:55:47 +02:00
René Pfeuffer	e296812457	Remove pseudo error handling	2018-10-10 18:54:15 +02:00
René Pfeuffer	fa0f66caf1	Iterate into correct subdirectory for git browse command	2018-10-10 13:27:57 +02:00
René Pfeuffer	63669b67f0	Detect browse command for root dir correctly in git	2018-10-10 11:49:49 +02:00
René Pfeuffer	0bd9ccd3d5	Do not filter for path '/' ... Otherwise jgit's PathFilter will fail.	2018-10-10 09:30:52 +02:00
René Pfeuffer	83640b9d44	Merge with 2.0.0-m3	2018-10-10 08:54:23 +02:00
Sebastian Sdorra	e71e875e4d	Merged in feature/harmonize_branches_in_changesets (pull request #81) ... Add branch to changeset collections	2018-10-09 09:10:20 +00:00
Sebastian Sdorra	768309cea4	use develop branch instead of default	2018-10-09 08:52:33 +02:00
Sebastian Sdorra	8de89928b3	remove unused imports	2018-10-09 08:50:20 +02:00
Sebastian Sdorra	ed9f5fc69e	implement new browse api for git	2018-10-08 14:39:11 +02:00
René Pfeuffer	de6b94fa4c	Remove code duplication	2018-10-02 13:44:22 +02:00