Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-20 22:42:16 +01:00
Code Issues Packages Projects Releases Activity
7,075 Commits 38 Branches 210 Tags
e7a6a2c2c787dfdffcd7d891192f43ea3ff16784
Commit Graph

7075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
René Pfeuffer
e7a6a2c2c7 Close branch bugfix/show_error_on_missing_branch 2019-03-12 15:37:33 +00:00
René Pfeuffer
c8b19a9d66 Add revision to context 2019-03-12 15:44:23 +01:00
René Pfeuffer
f814e664cd Handle revision not found for svn 2019-03-12 15:44:13 +01:00
René Pfeuffer
dbc20f3560 Merge with 2.0.0-m3 2019-03-12 15:20:03 +01:00
René Pfeuffer
be83f87b14 Remove dead code 2019-03-12 15:10:59 +01:00
René Pfeuffer
6ebbfa97a3 Start entity types with a capital char 2019-03-12 15:10:43 +01:00
Sebastian Sdorra
c1875994bf merge repository heads 2019-03-12 13:59:45 +01:00
Sebastian Sdorra
cd302a3768 fix handling of post authentication filters for protocol request 
do not call PushStateDispatcher in the HttpProtocolServletAuthenticationFilter,
because the HttpProtocolServlet already does this.
 2019-03-12 13:58:46 +01:00
Sebastian Sdorra
d54b5360e2 identify ui requests as ajax requests 2019-03-12 13:55:34 +01:00
René Pfeuffer
289a792152 Merged in bugfix/momentjs_german_locale (pull request #215) 
fix german locale for DateFromNow
 2019-03-12 10:11:41 +00:00
René Pfeuffer
251459671a Close branch bugfix/momentjs_german_locale 2019-03-12 10:11:41 +00:00
Sebastian Sdorra
a5da481593 fix german locale for DateFromNow 2019-03-12 10:44:58 +01:00
Mohamed Karray
77fb869ce4 fix there is no error on missing revision 2019-03-11 18:42:10 +01:00
René Pfeuffer
856f564c8d Merge with upstream 2019-03-11 16:49:53 +01:00
René Pfeuffer
9d03d756b8 Fix case 2019-03-11 16:39:46 +01:00
René Pfeuffer
e5fe28942a Add global admin permission 2019-03-11 16:39:27 +01:00
Mohamed Karray
20abd2b410 Merged in bugfix/no_technical_id_in_repo_exception (pull request #209) 
Use namespace and name for exceptions instead of technical id
 2019-03-11 14:46:12 +00:00
Mohamed Karray
dcd45cdc1e Close branch bugfix/no_technical_id_in_repo_exception 2019-03-11 14:46:12 +00:00
Mohamed Karray
d52a617b29 merge 2019-03-11 15:38:40 +01:00
Sebastian Sdorra
c7f6f60e1e Merged in bugfix/check_revisions_in_dry_run (pull request #212) 
Fix NPE in dry run for missing branches
 2019-03-11 14:31:13 +00:00
Sebastian Sdorra
eaec25609e Close branch bugfix/check_revisions_in_dry_run 2019-03-11 14:31:13 +00:00
René Pfeuffer
087aa35617 Attach merge link only when user has push permission 2019-03-11 14:19:23 +01:00
René Pfeuffer
28d7467e18 Throw not found exceptions for log between branches 2019-03-11 14:17:03 +01:00
René Pfeuffer
90635f9743 Add logging for missing permission 2019-03-11 10:55:50 +01:00
René Pfeuffer
ec2aff6aa9 Fix NPE in dry run for missing branches 2019-03-11 09:07:57 +01:00
René Pfeuffer
3c22ad2393 Merged in feature/extensionPoint_Readme (pull request #210) 
add extension points to
 2019-03-08 15:04:51 +00:00
René Pfeuffer
83e31516a2 Close branch feature/extensionPoint_Readme 2019-03-08 15:04:51 +00:00
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
Mohamed Karray
c02bf1120c fix Redirect to repo redirection url 2019-03-07 17:49:20 +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
Mohamed Karray
ab79b94bc0 add extension points to 
- redirect the repo route
- add a repo top level navigation
 2019-03-06 17:24:50 +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