Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-21 23:12:11 +01:00
Code Issues Packages Projects Releases Activity
8,697 Commits 38 Branches 210 Tags
0abb2e108defe83bb509a9fc4de81093ce0212e6
Commit Graph

8697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduard Heimbuch
0abb2e108d Merged in bugfix/missing_styles (pull request #353) 
create separate styles bundle
 2019-11-18 13:20:16 +00:00
Eduard Heimbuch
142a55d66c Close branch bugfix/missing_styles 2019-11-18 13:20:16 +00:00
Eduard Heimbuch
c6ba50b3b5 fix path for loading migration styles 2019-11-18 14:18:37 +01:00
Rene Pfeuffer
1ac39d1355 Merged in bugfix/anon_after_session_expired (pull request #351) 
Don't use anonymous access after access token expires
 2019-11-18 12:42:05 +00:00
Rene Pfeuffer
bf98c59050 Close branch bugfix/anon_after_session_expired 2019-11-18 12:42:05 +00:00
Sebastian Sdorra
436252b7a9 Merged in bugfix/anon_not_deletable (pull request #354) 
Prohibit deletion of _anonymous
 2019-11-18 12:28:50 +00:00
Sebastian Sdorra
02ecef61a3 Close branch bugfix/anon_not_deletable 2019-11-18 12:28:50 +00:00
Sebastian Sdorra
999a3476e6 move to scm-webapp 2019-11-18 13:28:28 +01:00
Rene Pfeuffer
fdfb033f6a Fix import 2019-11-18 13:25:08 +01:00
Rene Pfeuffer
f12c3920c0 Merge with 2.0.0-m3 2019-11-18 13:15:54 +01:00
Eduard Heimbuch
babbc67653 Prohibit deletion of _anonymous user as long as the anonymous access is still enabled 2019-11-18 12:06:52 +01:00
Sebastian Sdorra
2c85a137a5 implement client side xsrf protection 2019-11-18 11:45:48 +01:00
Sebastian Sdorra
5ea3c53613 create separate styles bundle 2019-11-18 10:56:40 +01:00
Rene Pfeuffer
78e5c1e21d Merged in feature/pr_approval (pull request #352) 
Feature/pr approval
 2019-11-15 11:35:27 +00:00
Rene Pfeuffer
f5b7d9f8f9 Close branch feature/pr_approval 2019-11-15 11:35:27 +00:00
Rene Pfeuffer
cc4c4f0822 Fix browse of empty repository 
In an empty hg repository the Changeset c is null. This leads to an
NullPointerException in the original code. So we check whether we have
a Changeset and otherwise use the old functionality.
 2019-11-15 09:50:28 +01:00
Rene Pfeuffer
2f5095e76a Handle missing blobs in blob store for lfs pointers 2019-11-15 09:33:38 +01:00
Eduard Heimbuch
5038c42869 merge 2.0.0-m3 2019-11-15 08:56:25 +01:00
Rene Pfeuffer
d1747557b3 Make conflict exception accessible with complex context 2019-11-13 10:48:36 +01:00
Florian Scholdei
9132167a6c Add title option to Button and remove IconButton 2019-11-12 17:30:37 +01:00
Florian Scholdei
6d2bdb6f29 Add IconButton 2019-11-12 14:48:32 +01:00
Florian Scholdei
ad063675f3 Merge with upstream 2019-11-12 14:31:10 +01:00
Eduard Heimbuch
234d98aee7 Don't use anonymous access after access token expires 2019-11-12 13:49:37 +01:00
Rene Pfeuffer
f0f134daeb Merged in feature/delete_source_branch (pull request #350) 
Feature/delete source branch
 2019-11-12 07:50:07 +00:00
Rene Pfeuffer
875b33d5c8 Close branch feature/delete_source_branch 2019-11-12 07:50:07 +00:00
Eduard Heimbuch
cc03af197f Merged in bugfix/merge_with_conflict (pull request #348) 
Remove unused mapper
 2019-11-12 07:48:20 +00:00
Eduard Heimbuch
b14fb1d852 Close branch bugfix/merge_with_conflict 2019-11-12 07:48:20 +00:00
Rene Pfeuffer
8ed874c103 Use dedicated exception for default branch deletion 2019-11-11 16:51:46 +01:00
Rene Pfeuffer
f7e42db850 Rename method 2019-11-11 16:50:39 +01:00
Rene Pfeuffer
8e4606cff1 Merge with 2.0.0-m3 2019-11-11 16:33:40 +01:00
Sebastian Sdorra
0168234534 Merged in feature/create_branch_without_clone (pull request #349) 
Create new branches without clone of git repository
 2019-11-11 15:08:27 +00:00
Sebastian Sdorra
6a2bf9d32a Close branch feature/create_branch_without_clone 2019-11-11 15:08:27 +00:00
Eduard Heimbuch
73efd244ab add BranchCommand to git + hg repositoryServiceProvider 2019-11-11 11:53:28 +01:00
Eduard Heimbuch
782b201e55 cleanup 2019-11-11 11:21:51 +01:00
Eduard Heimbuch
39d41a56c5 implement deleteBranchCommand for hg 2019-11-11 11:16:33 +01:00
Eduard Heimbuch
7cd2cb4ccb implement deleteBranchCommand for git 2019-11-11 11:15:56 +01:00
Rene Pfeuffer
1695d13a98 Create new branches without clone of git repository 2019-11-11 10:30:11 +01:00
Rene Pfeuffer
c2e30a582f Remove unused mapper 2019-11-08 16:44:04 +01:00
Rene Pfeuffer
73cdab4ddc Merged in feature/merge_with_squash (pull request #347) 
Feature/merge with squash
 2019-11-08 15:41:45 +00:00
Rene Pfeuffer
520c0d6ecf Close branch feature/merge_with_squash 2019-11-08 15:41:45 +00:00
Rene Pfeuffer
ae32b6f797 Use dedicated exception for unsupported merge strategies 2019-11-08 15:44:37 +01:00
Rene Pfeuffer
52ccce1aaa Secure test 2019-11-08 15:43:51 +01:00
Rene Pfeuffer
8e0026962d Fix typo 2019-11-08 14:10:27 +01:00
Eduard Heimbuch
313ec7fe5d fix dependencies after removing mergeResource 2019-11-08 13:10:31 +01:00
Eduard Heimbuch
b1216a898b remove mergeResource and move dryRun to review-plugin 2019-11-08 11:46:13 +01:00
Eduard Heimbuch
a41f490871 refactor after review 2019-11-08 08:36:00 +01:00
Eduard Heimbuch
e736ae6c50 cleanup 2019-11-07 13:42:45 +01:00
Eduard Heimbuch
ec6b4493c8 use strategy pattern for mergeStrategies 2019-11-07 11:50:28 +01:00
Eduard Heimbuch
de09097203 cleanup 2019-11-07 08:14:15 +01:00
Eduard Heimbuch
cf90654e24 implement fast forward if possible 2019-11-06 15:26:20 +01:00