943 Commits

Author	SHA1	Message	Date
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	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	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	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
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
René Pfeuffer	5a1f15b8c8	Fix usage of default branch	2018-10-02 13:41:20 +02:00
René Pfeuffer	4b7940ac50	Cleanup computation of default branch	2018-10-02 13:20:52 +02:00
René Pfeuffer	d14d029919	Fix peer review issues	2018-10-01 15:02:23 +02:00
René Pfeuffer	aed4c60296	Add missing unit tests	2018-10-01 12:58:53 +02:00
René Pfeuffer	8f139c8d4a	Reduce code duplication for json object modification	2018-09-28 16:53:09 +02:00
René Pfeuffer	0356af9ced	Fix head ref computation	2018-09-28 16:19:41 +02:00
René Pfeuffer	3dd632888b	Fix optional mapping	2018-09-28 16:09:09 +02:00
René Pfeuffer	6361ae35c1	Add config links for git, hg and svn	2018-09-28 14:17:48 +02:00
René Pfeuffer	4be4a902a3	Merge with 2.0.0-m3	2018-09-28 13:38:20 +02:00
René Pfeuffer	6819d6a0fe	Remove unnecessary HEAD resolving	2018-09-28 13:17:42 +02:00
René Pfeuffer	964f2eab2e	Remove duplication	2018-09-28 11:18:36 +02:00
René Pfeuffer	e35ec519cb	Add method to retrieve branch name from repository	2018-09-28 10:14:04 +02:00
Sebastian Sdorra	11fca51f5f	fix missing checkout/clone description on repository information page	2018-09-27 12:17:36 +02:00
René Pfeuffer	9f80840c43	Add branch to changeset collections ... Branch information is added to a changeset collection and therefore removed from single changesets for git repositories. Mercurial repositories now also set the default branch in changesets.	2018-09-26 13:19:38 +02:00
René Pfeuffer	2eb685c5d0	Delete EscapeUtil and dependencies	2018-09-19 10:47:26 +02:00
René Pfeuffer	88506b0633	Remove unnecessary annotations	2018-09-18 08:58:03 +02:00
René Pfeuffer	a5dcc8cf8a	Merge with 2.0.0-m3	2018-09-14 17:47:45 +02:00
René Pfeuffer	4d60ebd54e	Use constants for repository types	2018-09-14 10:31:16 +02:00
René Pfeuffer	e88639ab81	Implement permission filters as decorator for servlets	2018-09-14 10:21:00 +02:00