Sebastian Sdorra
f9a42e883d
Merged in bugfix/warning_button_color (pull request #383 )
...
Fix text colors for warning button
2020-01-13 10:05:07 +00:00
Sebastian Sdorra
772e16d943
Close branch bugfix/warning_button_color
2020-01-13 10:05:07 +00:00
Rene Pfeuffer
a7195331a3
Fix text colors for warning button
2020-01-10 17:10:57 +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
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
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
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
Rene Pfeuffer
cf96b1b998
Hack for conflict marker
2020-01-08 12:58:13 +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
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
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
