Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-04 05:39:11 +01:00
Code Issues Packages Projects Releases Activity
12,416 Commits 40 Branches 210 Tags
369e369ea32bdd4e8ceb8ea64eaadff446cbefdb
Commit Graph

12416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Sdorra
bac3068b73 improve javadoc of requires attribute 2020-01-09 08:19:43 +01:00
Sebastian Sdorra
8236e6be7f added missing requires element to extension 2020-01-09 08:19:13 +01:00
Rene Pfeuffer
3ff28749e1 Merge with default 2020-01-08 16:43:07 +01:00
Rene Pfeuffer
67777ff52d Fix reduce error with empty diff 2020-01-08 16:42:07 +01:00
Rene Pfeuffer
71b9567437 Fix reduce error with empty diff 2020-01-08 16:35:46 +01:00
Eduard Heimbuch
0d546755a9 optimize all imports in ui-webapp and reformat with prettier 2020-01-08 15:57:13 +01:00
Eduard Heimbuch
b8d4bb6904 add redirects for old routes 2020-01-08 15:17:07 +01:00
Sebastian Sdorra
c1aa4af6e0 implemented optional dependencies 
Plugin authors could now define optional dependencies to other plugins in their pom.
Extensions which are using classes from optional dependencies must specify this
with the "requires" attribute of the extension annotation.
Extensions with "requires" attribute are not installed if one of the specified plugins,
is not installed.
 2020-01-08 14:27:11 +01:00
Sebastian Sdorra
3244e552a9 extension binder logs now to debug instead of info 2020-01-08 14:22:14 +01:00
Rene Pfeuffer
658a2bd3cd Remove empty object from parameter list 2020-01-08 14:07:50 +01:00
Rene Pfeuffer
3a2b48e3ca Add storybook for conflicts in diff 2020-01-08 14:01:02 +01:00
Rene Pfeuffer
8bdd4cf319 Make conflict marking optional 2020-01-08 13:45:18 +01:00
Eduard Heimbuch
a43ffacf03 fix a ton of typescript errors 2020-01-08 13:40:07 +01:00
Rene Pfeuffer
cf96b1b998 Hack for conflict marker 2020-01-08 12:58:13 +01:00
Eduard Heimbuch
15a9a5b09b fix links and routes 2020-01-08 12:38:21 +01:00
Rene Pfeuffer
b261709b52 Merge with default 2020-01-08 11:25:12 +01:00
Rene Pfeuffer
d6b60afeac Merge with default 2020-01-08 11:22:47 +01:00
Rene Pfeuffer
30a24eb008 Merged in feature/react-diff-view-2 (pull request #379) 
Upgrade react-diff-view to version 2.4.1
 2020-01-08 10:09:07 +00:00
Rene Pfeuffer
4f960cf2a9 Close branch feature/react-diff-view-2 2020-01-08 10:09:07 +00:00
Eduard Heimbuch
987436e335 add loading spinner and error handling for codeOverview 2020-01-08 11:01:00 +01:00
Eduard Heimbuch
c73e85e3d6 fix routes for sources and changesets // fix typing errors 2020-01-08 10:31:43 +01:00
Rene Pfeuffer
d1db083e9a Use namespace and name in logging 2020-01-08 10:14:43 +01:00
Sebastian Sdorra
71accfce1f restore missing hunk headers 2020-01-08 09:57:57 +01:00
Rene Pfeuffer
88fb31c47b Add unit test for diff command 
This new tests ensures, that changes on a feature branch will be shown
in a diff even though the integration branch has been merged into the
feature branch.
 2020-01-07 15:49:35 +01:00
Eduard Heimbuch
20c00e7222 create new codeSection // add actionBar to codeSection // change routes for sources and changesets 2020-01-07 10:30:46 +01:00
Sebastian Sdorra
cc26ffcaa8 upgrade react-diff-view to v2.4.1 2020-01-06 15:59:16 +01:00
Sebastian Sdorra
3e1828eb12 fixed storyshots with react-diff-view 2020-01-06 14:48:32 +01:00
Sebastian Sdorra
04e533d92e merge with default branch 2020-01-06 14:07:49 +01:00
Sebastian Sdorra
348e08cd33 fix broken build 2020-01-06 13:14:42 +01:00
Sebastian Sdorra
5405a2b3c8 update package.json on plugin postinstall 
This is required in order to fix autocomplete of intellij.
 2020-01-06 11:30:04 +01:00
René Pfeuffer
3a67dc4c79 Use prefix for own reducer type 2019-12-20 15:33:13 +01:00
Florian Scholdei
0100e290ae Small typo 2019-12-19 15:06:33 +01:00
Sebastian Sdorra
64c84a1c96 merge repository heads 2019-12-19 13:04:59 +01:00
Rene Pfeuffer
efe584750b Merged in feature/pr_history (pull request #378) 
Feature/pr history
 2019-12-19 10:49:51 +00:00
Rene Pfeuffer
913d370146 Close branch feature/pr_history 2019-12-19 10:49:51 +00:00
Sebastian Sdorra
dce437b82e do not mark build as unstable if iqserver is not able to analyze 2019-12-19 11:01:12 +01:00
Sebastian Sdorra
be6c3879bb update storyshots 2019-12-19 10:30:21 +01:00
Rene Pfeuffer
148095ad4c Add revisions of merged branches before merge 2019-12-19 10:30:02 +01:00
Sebastian Sdorra
37a838e1b2 merge with 2.0.0-m3 2019-12-19 10:29:29 +01:00
Sebastian Sdorra
ded08d6a1d supress false positive javasecurity:S2083 on CopyOnWrite 2019-12-19 10:23:16 +01:00
Sebastian Sdorra
f4cda2072e Merged in bugfix/remove_global_styles_radio_button (pull request #364) 
override global radio stylings and use local styles instead
 2019-12-19 09:08:41 +00:00
Sebastian Sdorra
60f5c9a9bf Close branch bugfix/remove_global_styles_radio_button 2019-12-19 09:08:41 +00:00
Sebastian Sdorra
8410aa68c6 added storybook stories for diff 2019-12-19 09:51:44 +01:00
Rene Pfeuffer
f7c4894fb2 Let merges without effect throw an exception 2019-12-19 09:47:31 +01:00
Rene Pfeuffer
1d3e51ce7b Use static create methods instead of ambiguous constructor 2019-12-19 09:27:18 +01:00
Rene Pfeuffer
fefd8b6de8 Merge with default 2019-12-19 08:46:45 +01:00
Eduard Heimbuch
39b4c59d82 add unit tests 2019-12-19 08:25:28 +01:00
Florian Scholdei
ba6f8e5b4a Small typo 2019-12-18 16:04:16 +01:00
Sebastian Sdorra
b34cc07e40 merge repository heads 2019-12-18 14:55:38 +01:00
Eduard Heimbuch
c5f7393116 rename helper class 2019-12-18 14:38:09 +01:00