Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-06 12:20:56 +01:00
Code Issues Packages Projects Releases Activity
6,283 Commits 42 Branches 214 Tags
3bb85463885bda502f5426e1ea747ca7e796983e
Commit Graph

6283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
René Pfeuffer
3bb8546388 Close branch feature/changes-for-cas-plugin 2018-12-18 14:57:00 +00:00
Sebastian Sdorra
13e3d54100 added constructor with predefined store 2018-12-18 14:55:38 +01:00
Sebastian Sdorra
4c0f993293 added jaxb adapter for instant objects 2018-12-18 09:26:51 +01:00
Sebastian Sdorra
3daf4f7674 implemented in-memory version of DataStore for testing 2018-12-17 14:58:51 +01:00
Sebastian Sdorra
af7e776fdd added getParentKey() to AccessToken interface 2018-12-17 13:06:11 +01:00
Sebastian Sdorra
6f29aed9df fixed broken AuthenticationResourceTest 2018-12-14 08:33:45 +01:00
Sebastian Sdorra
306482094d move AccessTokenCookieIssue from scm-webapp to scm-core 2018-12-14 08:29:30 +01:00
Sebastian Sdorra
d6efec8fe3 use url safe base64 encoding 2018-12-14 08:28:28 +01:00
Maren Süwer
8ecb64a8aa Merged in feature/label_bug (pull request #128) 
implemented ie11 bug solution
 2018-12-12 10:13:56 +00:00
Maren Süwer
602e432dac Close branch feature/label_bug 2018-12-12 10:13:56 +00:00
Maren Süwer
586a203168 renaming 2018-12-12 10:58:22 +01:00
Maren Süwer
adaa5850ef Merged in feature/move-diff-to-ui-components (pull request #129) 
Feature/move diff to ui components
 2018-12-12 09:25:34 +00:00
Maren Süwer
db8bba628f Close branch feature/move-diff-to-ui-components 2018-12-12 09:25:34 +00:00
Florian Scholdei
48bfd17808 implemented ie11 bug solution 2018-12-12 09:26:21 +01:00
Sebastian Sdorra
675f417d45 fix resultHasMediaType for camel case media types 2018-12-11 15:14:59 +01:00
Sebastian Sdorra
c3727eb9c2 create a separate LoadingDiff component 2018-12-11 14:13:32 +01:00
Sebastian Sdorra
b22cb46ac2 reimplement diff and move it to ui-components 2018-12-11 13:25:35 +01:00
Sebastian Sdorra
ee3e3d4ecc Merged in feature/merge_conflictResolution (pull request #126) 
Feature/merge conflictResolution
 2018-12-11 09:00:26 +00:00
Sebastian Sdorra
8807c8f7b3 Close branch feature/merge_conflictResolution 2018-12-11 09:00:26 +00:00
Sebastian Sdorra
858d2816da fix wrong i18n key and added step 6 the push 2018-12-11 09:53:40 +01:00
Maren Süwer
f834dd5297 update information 2018-12-10 15:56:21 +01:00
Maren Süwer
5902dfab6a refactor 2018-12-10 15:47:46 +01:00
Maren Süwer
e636d409ed correct error throwing in apiclient and add extension point 2018-12-10 15:36:52 +01:00
Maren Süwer
caa3d3b62d Merged in feature/move-to-ui-components (pull request #125) 
Feature/move to ui components
 2018-12-10 14:07:45 +00:00
Maren Süwer
f4d4d58c93 Close branch feature/move-to-ui-components 2018-12-10 14:07:45 +00:00
Sebastian Sdorra
50ba6af6ba use media-content instead of media-left again 2018-12-10 15:06:50 +01:00
Sebastian Sdorra
822a5382ce update ProfileInfo and ChangesetDetails for new avatar components 2018-12-10 14:55:42 +01:00
Sebastian Sdorra
d1da23dd92 merge with 2.0.0-m3 2018-12-10 14:36:10 +01:00
Sebastian Sdorra
c5a625571d merge with branch feature/incomming_endpoint 2018-12-10 14:35:21 +01:00
Sebastian Sdorra
8d27449c86 merge with 2.0.0-m3 2018-12-10 14:06:44 +01:00
Sebastian Sdorra
3d36d07e1d Merged in feature/merge_endpoint (pull request #122) 
Feature merge endpoint
 2018-12-10 12:20:12 +00:00
Sebastian Sdorra
2a45f250ed Close branch feature/merge_endpoint 2018-12-10 12:20:12 +00:00
René Pfeuffer
868d1302d3 Merge with remote 2018-12-10 12:04:41 +01:00
René Pfeuffer
a54faf1233 Do not merge with fast forward 2018-12-10 12:01:13 +01:00
René Pfeuffer
0e333002db Create local branch for target during merge 2018-12-10 11:43:27 +01:00
Sebastian Sdorra
b08c291e82 merge with 2.0.0-m3 2018-12-10 11:34:06 +01:00
René Pfeuffer
8b518d320d Fix checkout of target branch 2018-12-10 08:59:19 +01:00
Sebastian Sdorra
97c4b0998b move changesets and avatar components to ui-components 2018-12-10 08:45:59 +01:00
Maren Süwer
040035e084 renaming 2018-12-10 08:42:29 +01:00
Maren Süwer
cc11f56bfa use new created error to fix test 2018-12-10 08:11:09 +01:00
René Pfeuffer
9bf802c095 Map not supported media type exceptions 2018-12-07 14:36:56 +01:00
Maren Süwer
6193c1edda update apiclient for 409 errors 2018-12-07 14:26:06 +01:00
René Pfeuffer
e3b36c6a5f Merge with 2.0.0-m3 2018-12-07 14:01:42 +01:00
René Pfeuffer
438339ae49 Unbind scm protocol after test 2018-12-07 13:33:58 +01:00
René Pfeuffer
8b97e00b36 Fix unit test 2018-12-07 13:28:21 +01:00
René Pfeuffer
8d622f548d Merged in bugfix/store_directory (pull request #124) 
fix the repository store directory location
 2018-12-07 11:56:54 +00:00
René Pfeuffer
ee75b50f18 Close branch bugfix/store_directory 2018-12-07 11:56:54 +00:00
René Pfeuffer
133655418f Merge with 2.0.0-m3 2018-12-07 12:55:14 +01:00
René Pfeuffer
830c155b3d Fix transport protocol 2018-12-07 10:10:50 +01:00
René Pfeuffer
261e41f8bf Handle not existing revisions in merge 2018-12-07 08:49:37 +01:00