Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-08 00:22:11 +01:00
Code Issues Packages Projects Releases Activity
5,985 Commits 34 Branches 209 Tags
bb28e53d1b3ca8df94c41d5cc151ac5fef643ae1
Commit Graph

5985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
René Pfeuffer
bb28e53d1b Set owner permission in new repository for logged in user 2018-11-08 16:28:36 +01:00
Sebastian Sdorra
cf519a7545 Merged in feature/merge_api (pull request #106) 
Feature merge api
 2018-11-08 15:08:07 +00:00
Sebastian Sdorra
c04f6ff616 Close branch 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
3c70ca7aa5 Add JavaDoc for API 2018-11-08 14:35:35 +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
e88b4041a7 Merged in feature/validation_reflection (pull request #105) 
Use reflection for validation
 2018-11-08 09:37:36 +00:00
Sebastian Sdorra
792ae31f28 Close branch feature/validation_reflection 2018-11-08 09:37:36 +00:00
Sebastian Sdorra
2201f2436e Merged in feature/errorhandling (pull request #99) 
Feature Error Handling
 2018-11-08 09:36:18 +00:00
Sebastian Sdorra
72619946a4 Close branch feature/errorhandling 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
René Pfeuffer
a95815ed18 Merge with 2.0.0-m3 2018-11-07 17:42:20 +01:00
René Pfeuffer
c1b6f64ecf Fix build breaker 2018-11-07 17:39:56 +01:00
René Pfeuffer
b5389023cf Merge with 2.0.0-m3 2018-11-07 16:43:26 +01:00
René Pfeuffer
5bbb4c5267 Use reflection for parameter validation messages 2018-11-07 16:36:54 +01:00
René Pfeuffer
f7348d8882 Incorporate comments from peer review 2018-11-07 16:10:32 +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
291e6115f9 Close branch 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
Sebastian Sdorra
7127cc4cda Close branch feature/diff_two_revisions 2018-11-07 13:54:23 +00:00
Sebastian Sdorra
8154ad8f59 Merged in feature/fix_error_display_for_repo_edit (pull request #100) 
Fixes persistent displaying of errors happened while editing Repos/Groups/Users
 2018-11-07 13:47:24 +00:00
Sebastian Sdorra
9ec09c10d5 Close branch feature/fix_error_display_for_repo_edit 2018-11-07 13:47:24 +00:00
Sebastian Sdorra
4c732564a0 Merged in feature/git-config (pull request #103) 
Repository type configuration + abstraction for global configuration
 2018-11-07 13:46:22 +00:00
Sebastian Sdorra
2adebd7ca0 Close branch feature/git-config 2018-11-07 13:46:22 +00:00
Philipp Czora
b05c8892a1 Merged 2.0.0-m3 2018-11-07 14:14:03 +01: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
Sebastian Sdorra
e9396f4947 fixed missing validation update on change 2018-11-07 13:39:38 +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
Philipp Czora
4caa9c1da0 Merged in feature/ui_userprofile (pull request #98) 
Implemented Profile component
 2018-11-07 12:11:43 +00:00
Philipp Czora
7ca88e7839 Close branch feature/ui_userprofile 2018-11-07 12:11:43 +00:00
Philipp Czora
8a23537e68 Removed unused i18n line 2018-11-07 13:10:29 +01:00
Philipp Czora
74382f26b7 Moved Profile component to top level; added error message 2018-11-07 12:55:09 +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
4cdf3e468c Add merge command to repository service api 2018-11-07 08:38:26 +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