Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity
7,921 Commits 32 Branches 207 Tags
e9f56f201bd18a81e3ff97653d1b51a5ac656a36
Commit Graph

1281 Commits

Author SHA1 Message Date
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
da9db10701 implemented global configuration for subversion 2018-11-06 16:39:28 +01:00
Sebastian Sdorra
9c043145a2 implemented global configuration for mercurial 2018-11-06 16:39:11 +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
René Pfeuffer
8b03a2c9a4 Merge with 2.0.0-m3 2018-11-01 12:03:49 +01:00
Rene Pfeuffer
ab2a622ac6 Fix list items 2018-11-01 11:09:42 +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
Mohamed Karray
4ffea849d7 merge 2018-10-26 16:38:28 +02:00
Mohamed Karray
0360694052 fix show diff in git format for svn repo 2018-10-26 16:26:55 +02: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
Mohamed Karray
c214c9e1e4 fix git diff format 2018-10-25 13:36:40 +02:00
René Pfeuffer
f041b4ecb6 Merge with 2.0.0-m3 2018-10-25 10:15:32 +02:00
Mohamed Karray
7dfcc60530 copy the SvnDiffGenerator 2018-10-24 13:07:11 +02:00
Mohamed Karray
4ca2452d5d copy the SvnDiffGenerator 2018-10-24 13:03:51 +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
bf1effb9c0 Remove special RepositoryNotFoundException 2018-10-18 16:08:49 +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
7845443d62 Naming things.... 2018-10-11 16:32:06 +02:00
René Pfeuffer
b4c854ee99 Use more generic collection instead of list 2018-10-11 09:55:47 +02:00