Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +01:00
Code Issues Packages Projects Releases Activity
8,945 Commits 32 Branches 207 Tags
b34cc07e4023edef0bbdce02e37a76bbcf80c40c
Commit Graph

1819 Commits

Author SHA1 Message Date
Rene Pfeuffer
edcc036f62 Make reverse channel transient 2019-12-18 12:48:11 +01:00
Rene Pfeuffer
a5dc2828ad Remove unused function 2019-12-18 12:11:57 +01:00
Rene Pfeuffer
42d8d844c0 Remove unused functions 2019-12-18 11:52:08 +01:00
Rene Pfeuffer
cf9d1edb70 Make partial file attributes explicit. 2019-12-18 11:48:17 +01:00
Rene Pfeuffer
0d6dcbd6bd Merge with default 2019-12-17 14:14:34 +01:00
Eduard Heimbuch
03425b9e8a Merged in feature/assign_ui_session_id (pull request #377) 
API-Client Support for SSE and Toast Components
 2019-12-13 12:21:07 +00:00
Rene Pfeuffer
4fd2a0dd23 Small API changes 2019-12-12 16:13:36 +01:00
Rene Pfeuffer
8df43e7b4e Let background computations abort for browse command 2019-12-12 11:47:03 +01:00
Rene Pfeuffer
8129f2fad0 Add 'partial' flag to files 2019-12-11 14:41:42 +01:00
Rene Pfeuffer
a37df2c20b Fix test helper 2019-12-11 12:58:01 +01:00
Rene Pfeuffer
9a8f0a4ee7 Use interfaces for executor classes 2019-12-11 12:42:21 +01:00
Sebastian Sdorra
dd3b02bbff added subscription api to apiClient 2019-12-11 10:11:40 +01:00
Rene Pfeuffer
ce15b116bd Introduce SyncAsyncExecutor 2019-12-11 10:10:56 +01:00
René Pfeuffer
8d0249b708 Make timeout configurable 2019-12-10 18:22:40 +01:00
René Pfeuffer
6f4074c21c Update browser result after computation 2019-12-10 18:10:11 +01:00
Sebastian Sdorra
33833994d3 merge with default branch 2019-12-05 16:14:44 +01:00
Rene Pfeuffer
11391f2f64 Merge with default 2019-12-05 10:53:33 +01:00
Rene Pfeuffer
516bbe6f26 Prepare for next development iteration 2019-12-02 15:15:34 +01:00
Rene Pfeuffer
2d08ba4adc Release version 2.0.0-rc1 2019-12-02 12:52:33 +01:00
Sebastian Sdorra
854e42a609 merge with default branch 2019-11-27 15:01:09 +01:00
Rene Pfeuffer
75b43ef453 Merge with 2.0.0-m3 2019-11-25 14:35:47 +01:00
Rene Pfeuffer
1cd7983723 Merge with 2.0.0-m3 2019-11-21 07:39:28 +01:00
Rene Pfeuffer
4f43bce90e Reduce visibility of misleading install function 
This install function might be mistaken to really install this plugin,
whereas it only sets its internal status and does not really do smth.
 2019-11-20 11:14:58 +01:00
Sebastian Sdorra
9e9df35fdb upgrade resteasy, legman and hibernate-validator 
* resteasy from 3.6.2.Final to 4.4.1.Final
* legman from 1.5.1 to 1.6.0
* hibernate-validator from 5.3.6.Final to 6.1.0.Final
 2019-11-20 10:57:32 +01:00
Eduard Heimbuch
e7cb674bb5 fix anonymous email 2019-11-19 14:27:14 +01:00
Eduard Heimbuch
e432d6d210 refactor 2019-11-19 14:23:05 +01:00
Eduard Heimbuch
2ec98c2763 remove repository public flag 2019-11-19 14:04:47 +01:00
Rene Pfeuffer
f12c3920c0 Merge with 2.0.0-m3 2019-11-18 13:15:54 +01:00
Sebastian Sdorra
42ab81cf50 implement ui client session id 
This changeset introduces a client side session id, which is generated
once by the client (ui: apiClient) and is send with each request to server.
The server makes the session id available by the PrincipalCollection of the
subject.
 2019-11-13 14:03:48 +01:00
Rene Pfeuffer
d1747557b3 Make conflict exception accessible with complex context 2019-11-13 10:48:36 +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
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
Eduard Heimbuch
7cd2cb4ccb implement deleteBranchCommand for git 2019-11-11 11:15:56 +01:00
Rene Pfeuffer
c2e30a582f Remove unused mapper 2019-11-08 16:44:04 +01:00
Rene Pfeuffer
ae32b6f797 Use dedicated exception for unsupported merge strategies 2019-11-08 15:44:37 +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
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
Eduard Heimbuch
b4f1e8874a change mergeStrategy order 2019-11-06 09:54:17 +01:00
Eduard Heimbuch
7e00d22e9e merge 2.0.0-m3 2019-11-06 07:48:35 +01:00
Eduard Heimbuch
bc5948f823 add new MergeStrategies 2019-11-06 07:47:23 +01:00
Eduard Heimbuch
db46441adf move mergeResultDto + mapper to scm-core 2019-11-05 09:51:58 +01:00
Eduard Heimbuch
9df12bc35e check if mergeStrategy is supported for mergeCommand 2019-11-04 17:34:44 +01:00
Eduard Heimbuch
4b024c650c implement squash to mergeCommand 2019-11-04 15:16:37 +01:00
Eduard Heimbuch
a938fd8682 enhance logcommand 2019-10-25 12:31:18 +02:00
Rene Pfeuffer
a909c07c95 Fix suppressions 2019-10-21 14:27:57 +02:00