Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-18 02:00:22 +01:00
Code Issues Packages Projects Releases Activity
9,042 Commits 42 Branches 215 Tags
bee0b68f37059ebbc5b3818fd7e8906ed0354ae1
Commit Graph

9042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduard Heimbuch
bee0b68f37 cleanup fetch content in sourcesView 2020-01-15 08:25:59 +01:00
Eduard Heimbuch
3f518c501a fix fetch content multiple times for same file 2020-01-15 08:01:12 +01:00
Eduard Heimbuch
0888006a74 refactor code section 2020-01-14 18:07:57 +01:00
Eduard Heimbuch
e0e2ccec02 cleanup 2020-01-13 15:21:07 +01:00
Eduard Heimbuch
86695c769a fix branch encoding in uri 2020-01-13 15:16:06 +01:00
Eduard Heimbuch
d769c82afa refactor codeViewSwitcher 2020-01-13 15:13:01 +01:00
Eduard Heimbuch
0e544d694f fetch changesets for selected branch // fetch changesets for default branch if trying to fetch changesets for specific revision 2020-01-13 14:49:17 +01:00
Sebastian Sdorra
3011b4d3e8 merge with default branch 2020-01-13 09:34:19 +01:00
Rene Pfeuffer
dd3949b817 Hide toggle when there are no hunks to display 2020-01-10 13:54:04 +01:00
Eduard Heimbuch
8ed379ecbf Merged in feature/merge_diff (pull request #380) 
Merge conflicts
 2020-01-10 10:35:53 +00:00
Eduard Heimbuch
1b9417d9b7 Close branch feature/merge_diff 2020-01-10 10:35:53 +00:00
Rene Pfeuffer
82ea53dc62 Merge with default 2020-01-10 10:22:43 +01:00
Eduard Heimbuch
df73b502d9 fix style in CodeViewSwitcher 2020-01-10 09:50:11 +01:00
Eduard Heimbuch
b24af52dfc fix branch selector bug 2020-01-10 09:31:32 +01:00
Eduard Heimbuch
184b6e6e98 fix changesets routes for pagination 2020-01-10 09:19:09 +01:00
Sebastian Sdorra
bbb2af7ebc update storyshot snapshots 2020-01-09 17:06:55 +01:00
Sebastian Sdorra
779a2004a0 use new version of gitdiff-parser, to fix wrong type of binary diffs 2020-01-09 16:49:03 +01:00
Rene Pfeuffer
917a2ba1d6 Add story for diffs with binary files 2020-01-09 16:31:28 +01:00
Rene Pfeuffer
1762a383be Merged in feature/optional_dependencies (pull request #382) 
Feature/optional dependencies
 2020-01-09 14:10:18 +00:00
Rene Pfeuffer
0ff4e22d87 Close branch feature/optional_dependencies 2020-01-09 14:10:18 +00:00
Sebastian Sdorra
c0e82b1299 fixed mutliple versions of hibernate-validator 
SCM-WebApp had multiple copies of hibernate-validator 5.3.6 and 6.1.0.
We use now only 6.1.0.
 2020-01-09 14:15:42 +01:00
Eduard Heimbuch
28f1319935 expose baseurl in SourceExtensions for breadcrumb 2020-01-09 13:43:04 +01:00
Eduard Heimbuch
6f6e6f60d4 remove contextPath on switching view to changesets 2020-01-09 10:05:12 +01:00
Eduard Heimbuch
bdb02cdfd1 remove obsolete context props 2020-01-09 09:52:09 +01:00
Eduard Heimbuch
4e23fd95ab add breadcrumb to fileViewer 2020-01-09 09:34:40 +01:00
Sebastian Sdorra
6b62f0aab6 throw more specific PluginLoadException instead of generic RuntimeException 2020-01-09 08:20:47 +01:00
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