Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-31 03:39:14 +01:00
Code Issues Packages Projects Releases Activity
7,045 Commits 40 Branches 210 Tags
9f10a2cff2bb55852ac6823d80bad5b047350da0
Commit Graph

7045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Sdorra
9f10a2cff2 merge repository heads 2019-03-08 09:10:03 +01:00
Sebastian Sdorra
b18a93ae2b merge with branch feature/diff_annotations 2019-03-08 09:09:26 +01:00
Sebastian Sdorra
67eed493b1 close branch feature/diff_annotations 2019-03-08 09:08:48 +01:00
Sebastian Sdorra
28778624b5 fixes wrong type definition 2019-03-08 09:06:39 +01:00
René Pfeuffer
b0f95fbcc6 Expose conflict errors 2019-03-08 08:58:09 +01:00
Sebastian Sdorra
b9b544b7f0 pass function to toggle collpase state to FileControlFactory 2019-03-08 08:27:20 +01:00
Sebastian Sdorra
57454f9aa9 adds option to request focus for a textarea 2019-03-08 08:10:34 +01:00
Sebastian Sdorra
7729960a00 merge with 2.0.0-m3 2019-03-08 08:07:47 +01:00
René Pfeuffer
67431b1e2b Merge with 2.0.0-m3 2019-03-07 17:20:02 +01:00
René Pfeuffer
13695a8671 Keep protocol in variable 
We encountered many test failures in Jenkins due to git saying that it
cannot handle scm://. This is a try and error approach.
 2019-03-07 17:19:08 +01:00
René Pfeuffer
7ff192b8b1 Close branch feature/diff_annotations 2019-03-07 12:11:56 +00:00
René Pfeuffer
230caf9cbd Merged in feature/diff_annotations (pull request #211) 
Feature/diff annotations
 2019-03-07 12:11:56 +00:00
Sebastian Sdorra
3440a0b5db Merged in feature/changes_for_ssh_plugin (pull request #208) 
Changes for ssh plugin
 2019-03-07 10:24:58 +00:00
Sebastian Sdorra
9be12d8ac8 Close branch feature/changes_for_ssh_plugin 2019-03-07 10:24:58 +00:00
Sebastian Sdorra
77d79610d2 moves more git specific classes from ssh-plugin to git-plugin 2019-03-07 10:34:13 +01:00
René Pfeuffer
7adbc4df51 Add some unit test 2019-03-06 16:01:15 +01:00
René Pfeuffer
e6894490e5 Remove ssh from class names 
The classes do not have anything to do with ssh.
 2019-03-06 15:34:51 +01:00
Sebastian Sdorra
b1335b17ee makes only the title clickable for collapse instead the whole panel header 2019-03-06 15:03:08 +01:00
Sebastian Sdorra
c672b6603e adds file annotations and file controls to diff 2019-03-06 14:57:17 +01:00
Mohamed Karray
186738ad14 Merged in bugfix/delete_repository_permissions (pull request #207) 
Fix deletion of permissions after modification
 2019-03-05 17:17:29 +00:00
Mohamed Karray
2416a063ec Close branch bugfix/delete_repository_permissions 2019-03-05 17:17:29 +00:00
René Pfeuffer
a1e43ee571 Simplify interpreter 2019-03-05 17:57:38 +01:00
Sebastian Sdorra
75fe4de478 added option to disable scrollToTop 2019-03-05 16:31:41 +01:00
René Pfeuffer
a16bb0d0af Wrap parser and handler into interpreter 2019-03-05 15:01:57 +01:00
René Pfeuffer
dd71fb4c3b Expose ScmCommandProtocol as extension point 
This is necessary so that multiple providers (git, hg, ...) can
implement this. The using class has to find the matching implementation.
 2019-03-05 14:20:31 +01:00
René Pfeuffer
ebb21ee308 Modify test to test base, not specific class 
This was necessary after extracting base class.
 2019-03-05 13:47:46 +01:00
René Pfeuffer
0c46d639da Extract base class for ReceivePackFactory implementations 2019-03-05 13:29:57 +01:00
René Pfeuffer
08c35fa0ce Merge with 2.0.0-m3 2019-03-05 08:58:43 +01:00
René Pfeuffer
4e6dd62cb5 Merged in feature/ui-error-handling (pull request #203) 
Feature/ui error handling
 2019-03-04 16:12:30 +00:00
René Pfeuffer
3b4af52af9 Close branch feature/ui-error-handling 2019-03-04 16:12:30 +00:00
René Pfeuffer
eca982e796 fIX config error if link is missing 2019-03-04 16:47:44 +01:00
René Pfeuffer
03aa639aa1 Clarify german texts 2019-03-04 15:54:10 +01:00
René Pfeuffer
adcfb3ee5a Do not map not found exception manually 2019-03-04 14:27:07 +01:00
René Pfeuffer
768915c75a Do not map not found exception manually 2019-03-04 14:09:48 +01:00
René Pfeuffer
ffbf9e4fba Add independent classes from ssh plugin 2019-03-04 13:22:40 +01:00
René Pfeuffer
5abc8f1790 Merge with 2.0.0-m3 2019-03-04 11:53:22 +01:00
Philipp Czora
6c06352de2 Added ui error handling for 403 errors 2019-03-04 11:49:12 +01:00
Philipp Czora
f68398e599 Minor refactoring 2019-03-04 11:19:33 +01:00
Philipp Czora
adf92db9b2 Also render violations (if present) 2019-03-04 11:09:12 +01:00
René Pfeuffer
dadfe4a8af Fix media type for validation error 2019-03-04 08:44:41 +01:00
René Pfeuffer
8e9df1ce34 Add more error messages 2019-03-01 15:43:33 +01:00
René Pfeuffer
b537a2a2ba Fix deletion of permissions after modification 
Permissions could not be deleted, when they were modified (eg. change
of role or of verbs).
 2019-03-01 14:10:39 +01:00
Philipp Czora
9b6063c4c5 Merged in bugfix/administer_permissions (pull request #205) 
Add permission for permissions
 2019-03-01 12:28:08 +00:00
Philipp Czora
e0b9aa0bb3 Close branch bugfix/administer_permissions 2019-03-01 12:28:08 +00:00
Philipp Czora
5c3fe360a7 Merged in bugfix/keep_repository_permissions (pull request #206) 
Keep permissions on repository update
 2019-03-01 12:26:26 +00:00
Philipp Czora
b26c3a4ab3 Close branch bugfix/keep_repository_permissions 2019-03-01 12:26:26 +00:00
Philipp Czora
5d375b7fb4 Added error descriptions & removed collapsability (according to review) 2019-03-01 13:16:54 +01:00
René Pfeuffer
b604f32b2b Keep permissions on repository update 2019-03-01 11:37:23 +01:00
René Pfeuffer
4229eefca7 Add permission for permissions 2019-03-01 11:30:58 +01:00
René Pfeuffer
b1633aee97 Use constant 2019-03-01 10:22:37 +01:00