Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-17 13:02:14 +01:00
Code Issues Packages Projects Releases Activity
13,049 Commits 38 Branches 210 Tags
f8ee45f7d0ee5b6194b5d50e50737e653033065a
Commit Graph

2276 Commits

Author SHA1 Message Date
René Pfeuffer
2dc170475d Fix JavaDoc error 2024-08-30 13:44:49 +02:00
CES Marvin
ddd673650a Prepare for next development iteration 2024-08-29 09:26:05 +00:00
CES Marvin
99dba687e0 Release version 3.4.1 2024-08-29 08:36:35 +00:00
Rene Pfeuffer
a2d82372e5 Handle NullPointerException in hgrc clean-up 
We encountered NullPointerExceptions during hg repository imports. This happened, when neither authentication nor proxy definions had been given. In this case, no hgrc will be created and therefore we get the exception in the clean-up step. Now, the clean-up is only triggered, if the hgrc had been created beforehand.

To prevent further error in the clean-up, we no catch other potential exceptions and log them but do not let them break the import.

Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
 2024-08-29 08:50:51 +02:00
CES Marvin
acab8585a4 Prepare for next development iteration 2024-08-19 09:43:09 +00:00
CES Marvin
ea37d2ca20 Release version 3.4.0 2024-08-19 08:53:12 +00:00
Rene Pfeuffer
27f78d2347 Fix permission errors 
The BaseReceivePackFactory re-used the GitReceiveHook. The&#10;problem is, that the hook is not thread safe. Due to the&#10;re-usage, the repository could have been changed during&#10;processing post receive hooks.&#10;&#10;With this, the factory will always create a new receive pack.

Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
Committed-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
 2024-08-08 16:27:48 +02:00
Tarik Gürsoy
797bda4bbb Add statistics for diffs (added, deleted, modified) 
Extend the diff result from the diff command to include modified,
added and deleted file count and add DiffStats component to
ui-components.

Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com>
Pushed-by: Tarik Gürsoy<tarik.guersoy@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
Co-authored-by: Tarik Gürsoy<tarik.guersoy@cloudogu.com>
 2024-08-01 16:54:40 +02:00
CES Marvin
2254420221 Prepare for next development iteration 2024-07-05 12:20:01 +00:00
CES Marvin
f2f3cb62ed Release version 3.3.0 2024-07-05 11:34:01 +00:00
Tarik Gürsoy
bb4589e87f Manual merge instructions have been fixed 2024-07-04 10:28:53 +02:00
Laura Gorzitze
b12f4d579a Notification if external user management is activated 
A notification will be displayed when an external user
management system is activated to inform that users
created within the SCMM will not be transferred to the
external system.

Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
 2024-07-04 09:05:17 +02:00
Eduard Heimbuch
29a6b42fce Check for external merge tools during merge 
Co-authored-by: Thomas Zerr<thomas.zerr@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
 2024-06-25 05:50:04 +02:00
CES Marvin
a0db5326be Prepare for next development iteration 2024-06-24 12:35:52 +00:00
CES Marvin
bad14dfcfa Release version 3.2.2 2024-06-24 12:23:27 +00:00
Rene Pfeuffer
b98cdeb28d Fix sub repositories in mercurial 
The sub repositories did not show up in the source view.&#10;This fixes python errors for the computation of sub&#10;repositories in hg.

Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
 2024-06-19 17:46:42 +02:00
Viktor Egorov
5d446278d9 Fixed branch name limit 
Pushed-by: Viktor Egorov<viktor.egorov-extern@cloudogu.com>
Co-authored-by: Viktor<viktor.egorov@triology.de>
Co-authored-by: Thomas Zerr<thomas.zerr@cloudogu.com>
Pushed-by: Thomas Zerr<thomas.zerr@cloudogu.com>
 2024-06-10 13:21:30 +02:00
CES Marvin
0ffd80310b Prepare for next development iteration 2024-05-31 09:18:21 +00:00
CES Marvin
a0e464bed6 Release version 3.2.1 2024-05-31 09:03:24 +00:00
René Pfeuffer
2222a78baa Merge branch 'main' into develop 2024-05-30 10:40:03 +02:00
René Pfeuffer
ae53ff2494 Merge tag '2.46.3' 
Release version 2.46.3
 2024-05-30 10:39:05 +02:00
CES Marvin
87a727b587 Release version 2.46.3 2024-05-29 12:02:24 +00:00
René Pfeuffer
ea4a148d86 Fix determination of default branch for git config on push 2024-05-29 10:40:28 +02:00
René Pfeuffer
e79ad2b1b8 Prepare for next development iteration 2024-05-29 10:34:19 +02:00
CES Marvin
c663879137 Prepare for next development iteration 2024-05-23 11:38:26 +00:00
CES Marvin
458d72002c Release version 3.2.0 2024-05-23 10:50:27 +00:00
Viktor Egorov
c8ef99cf07 Add option to hide whitepace changes in diffs 
Co-authored-by: Florian Scholdei<florian.scholdei@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>


Reviewed-by: Florian Scholdei <florian.scholdei@cloudogu.com>
 2024-05-14 11:33:48 +02:00
CES Marvin
56f335468d Prepare for next development iteration 2024-04-09 08:38:52 +00:00
CES Marvin
a896fc08c9 Release version 3.1.0 2024-04-09 07:52:08 +00:00
Laura Gorzitze
8d12862ff8 Display all tags for changeset 
Display of all tags (as links to the  overview of the specific tag) of a given changeset in the changeset detail view.
 2024-03-11 17:09:59 +01:00
Rene Pfeuffer
658ccdf006 Improve import of LFS files for pull and mirror 
Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
Committed-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
 2024-03-11 11:13:42 +01:00
CES Marvin
d12052d61b Prepare for next development iteration 2024-03-07 17:25:36 +00:00
CES Marvin
6b99d66d26 Release version 3.0.4 2024-03-07 16:45:23 +00:00
CES Marvin
b7eaad4c3d Release version 2.46.2 2024-03-05 08:40:39 +00:00
Laura Gorzitze
98a6fd185e Prepare for next development iteration 2024-03-04 14:45:54 +01:00
Viktor Egorov
c42def0f7f Sort global config and repository config the same way 
Adds a new option to configuration entry binding to improve sorting
and sorts global and repository configuration likewise.

Pushed-by: Viktor Egorov<viktor.egorov-extern@cloudogu.com>
Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
Co-authored-by: vegorov<viktor.egorov@triology.de>
 2024-03-04 08:01:13 +01:00
CES Marvin
5d280a1531 Prepare for next development iteration 2024-02-08 09:32:25 +00:00
CES Marvin
adf53ec641 Release version 3.0.3 2024-02-08 08:50:57 +00:00
CES Marvin
7543bd7c8e Prepare for next development iteration 2024-02-07 13:38:59 +00:00
CES Marvin
de3b468e3a Release version 3.0.2 2024-02-07 12:57:01 +00:00
Laura Gorzitze
d8e1f2d739 Cleanup Code 
Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
 2024-02-06 14:54:00 +01:00
CES Marvin
b34a989c57 Prepare for next development iteration 2024-02-02 15:14:42 +00:00
CES Marvin
a8b3c80df0 Release version 3.0.1 2024-02-02 14:33:24 +00:00
CES Marvin
d8081ed074 Prepare for next development iteration 2024-01-29 15:44:46 +00:00
CES Marvin
3c5d8244d8 Release version 3.0.0 2024-01-29 15:29:36 +00:00
Eduard Heimbuch
22cb98d3d5 Bump gradle-smp-plugin to 0.16.3 2024-01-29 13:36:30 +01:00
Eduard Heimbuch
ab790514cb Bump gradle-smp-plugin to 0.16.2 2024-01-15 18:55:01 +01:00
Eduard Heimbuch
cf4d9cf20f 3.x 
Committed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com>
Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
Pushed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com>
Committed-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
 2023-11-30 17:02:44 +01:00
CES Marvin
6f55210812 Prepare for next development iteration 2023-11-22 11:15:19 +00:00
CES Marvin
fc7c125d78 Release version 2.48.1 2023-11-22 10:26:59 +00:00