Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-18 13:32:10 +01:00
Code Issues Packages Projects Releases Activity
9,000 Commits 38 Branches 210 Tags
8bdd4cf3191c545119cd475c560fbcd10fd83e89
Commit Graph

9000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Eduard Heimbuch
3ea788c3e3 fix unit test 2019-12-18 14:33:50 +01:00
Rene Pfeuffer
7d3d615264 Merged in feature/git_browse_performance (pull request #375) 
Git browse performance
 2019-12-18 13:28:22 +00:00
Rene Pfeuffer
a88dc19efa Close branch feature/git_browse_performance 2019-12-18 13:28:22 +00:00
Eduard Heimbuch
83cc1c4a6f return revision on merge 2019-12-18 13:17:30 +01:00
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
Sebastian Sdorra
8fa43da1ea fixed typescript optional chaining with eslint and prettier 2019-12-18 11:29:59 +01:00
Eduard Heimbuch
dc6d9cc5eb return revision on merge 2019-12-18 11:03:07 +01:00
Rene Pfeuffer
6b93099048 Merge with default 2019-12-17 14:16:00 +01:00
Rene Pfeuffer
0d6dcbd6bd Merge with default 2019-12-17 14:14:34 +01:00
Rene Pfeuffer
5ea149c262 Adapt tests to new state layout 2019-12-17 13:34:28 +01:00
Rene Pfeuffer
45b989cd1a Always show file size 
The file size is always present and not updated
in the background
 2019-12-17 13:03:05 +01:00
Rene Pfeuffer
a61799723b Fix typo 2019-12-17 12:42:31 +01:00
Rene Pfeuffer
f257a8eeb8 Fix formatting 2019-12-17 12:42:05 +01:00