Commit Graph

8325 Commits

Author SHA1 Message Date
Rene Pfeuffer
7af882fe8e Insert some logging 2019-10-08 16:19:30 +02:00
Rene Pfeuffer
ffcb96820e Merge with 2.0.0-m3 2019-10-08 10:49:15 +02:00
Rene Pfeuffer
24e18b4414 Use no-op filter as default for lfs 2019-10-07 18:45:12 +02:00
Rene Pfeuffer
a1da5eaddb Simplify 2019-10-07 18:25:31 +02:00
Florian Scholdei
fbf05a60d8 use new label and helpText prop when given 2019-10-07 14:22:49 +02:00
Florian Scholdei
51818d8ffb add label and helpText option for MemberNameTagGroup component 2019-10-07 14:15:27 +02:00
Sebastian Sdorra
e74697375d Merged in feature/clone_with_preselected_branch (pull request #331)
Checkout target branch while cloning repository
2019-10-07 08:47:02 +00:00
Sebastian Sdorra
4a4ea1e20d Close branch feature/clone_with_preselected_branch 2019-10-07 08:47:02 +00:00
René Pfeuffer
100c73c336 Add missing test repository 2019-10-06 19:41:23 +02:00
René Pfeuffer
3ac267c2ab Add missing test repository 2019-10-06 16:57:45 +02:00
René Pfeuffer
3dea971e10 Checkout target branch while cloning repository
This will prevent the checkout of a wrong initial branch and therefore
safe some unnecessary io
2019-10-06 16:29:50 +02:00
René Pfeuffer
9120d492ab LFS upload POC 2019-10-04 19:46:16 +02:00
Eduard Heimbuch
d83bc4ea86 Merged in feature/collapsed_panel (pull request #328)
feature/collapsed_panel
2019-10-02 10:57:47 +00:00
Eduard Heimbuch
8f8c703524 Close branch feature/collapsed_panel 2019-10-02 10:57:47 +00:00
Florian Scholdei
71dc029166 add handling for binary files, correct typo 2019-10-02 10:26:43 +02:00
Rene Pfeuffer
6a7d2430ca Merged in bugfix/firefox_56_login (pull request #329)
do not use function as fetch argument, use the resulting object
2019-10-02 08:21:18 +00:00
Rene Pfeuffer
94f3a3e2d8 Close branch bugfix/firefox_56_login 2019-10-02 08:21:18 +00:00
Rene Pfeuffer
ddb47edba3 Merge with 2.0.0-m3 2019-10-02 10:07:08 +02:00
Rene Pfeuffer
458d2fb4ee Make AvailablePlugin immutable 2019-10-02 10:05:07 +02:00
Florian Scholdei
d0877875dd remove bottom border for collapsed panels 2019-10-02 09:38:02 +02:00
Eduard Heimbuch
0b68fa1d0c Merged in feature/collapse_diffs (pull request #327)
Feature/collapse diffs
2019-10-02 06:25:16 +00:00
Eduard Heimbuch
35c4a138b4 Close branch feature/collapse_diffs 2019-10-02 06:25:16 +00:00
Sebastian Sdorra
5c37e869ec Merged in bugfix/merge_with_unrelated_histories (pull request #318)
Check for unrelated histories
2019-10-02 06:22:22 +00:00
Sebastian Sdorra
b71bea61b3 Close branch bugfix/merge_with_unrelated_histories 2019-10-02 06:22:22 +00:00
Sebastian Sdorra
8174019931 merge with 2.0.0-m3 2019-10-02 07:47:44 +02:00
Sebastian Sdorra
a632350d32 added message to NoCommonHistoryException 2019-10-02 07:43:17 +02:00
Rene Pfeuffer
d5a1423e87 Merged in feature/abort_plugin_installation (pull request #326)
Feature/abort plugin installation
2019-10-02 05:04:10 +00:00
Rene Pfeuffer
d5ed5c7f3c Close branch feature/abort_plugin_installation 2019-10-02 05:04:10 +00:00
René Pfeuffer
303448f371 Render modal dialog above page 2019-10-01 18:15:13 +02:00
René Pfeuffer
dc6e5e537d Cleanup 2019-10-01 18:03:34 +02:00
René Pfeuffer
ea1c11a96a Cleanup MultiPluginAction 2019-10-01 17:57:38 +02:00
Sebastian Sdorra
34177be6f7 merge with 2.0.0-m3 2019-10-01 17:09:53 +02:00
Rene Pfeuffer
3abf9815f3 Externalize modal dialogs 2019-10-01 17:03:27 +02:00
Sebastian Sdorra
151049657a Merged in bugfix/postpone_writing_to_stream (pull request #322)
Postpone writing to output stream in diff command
2019-10-01 12:52:25 +00:00
Sebastian Sdorra
c9966081d4 Close branch bugfix/postpone_writing_to_stream 2019-10-01 12:52:25 +00:00
Sebastian Sdorra
273b5fd2c6 Merged in feature/cat_with_lfs (pull request #324)
cat with lfs
2019-10-01 12:12:04 +00:00
Sebastian Sdorra
35b8740e00 Close branch feature/cat_with_lfs 2019-10-01 12:12:04 +00:00
Sebastian Sdorra
6605cc2b6b remove unused imports 2019-10-01 13:58:33 +02:00
Rene Pfeuffer
7f657e5360 Simplifications 2019-10-01 13:21:08 +02:00
Rene Pfeuffer
e0c40c645a Replace p with div
Buttons can have divs for themselves, which will lead to an error
otherwise because a p must not contain divs.
2019-10-01 10:31:55 +02:00
Rene Pfeuffer
e6d32a1468 Replace hard reload with refresh 2019-10-01 10:27:06 +02:00
Rene Pfeuffer
92af956c5e Add unique keys for react 2019-10-01 09:55:00 +02:00
Rene Pfeuffer
a511b39713 Enhance error message 2019-10-01 09:41:56 +02:00
Florian Scholdei
fb6d66978e add margin bottom for collapse button, add className option for level component 2019-10-01 09:36:27 +02:00
Rene Pfeuffer
aded308138 Error handling for plugin installation/uninstallaion 2019-10-01 09:33:48 +02:00
Florian Scholdei
c518236b57 remove some large doubled margin 2019-09-30 17:01:40 +02:00
Florian Scholdei
4c8d28b9bf correct trans file used 2019-09-30 16:47:06 +02:00
Florian Scholdei
d406efb7bb add collapse all diffs by once button, implement level component 2019-09-30 16:45:56 +02:00
Florian Scholdei
bef64e9831 add defaultCollapse option to force toggling all DiffFile components by once, remove toggle option and icon for binary files 2019-09-30 15:29:47 +02:00
Florian Scholdei
765667bf20 use icon component instead 2019-09-30 15:11:45 +02:00