diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-12-21 19:18:24 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-12-21 19:18:24 +0300 |
| commit | 52e094204e6278bd2f8c386b0391d7dfae6c8500 (patch) | |
| tree | 7f447ea67c960735e8982f28541b66fce66072c8 /changelog | |
| parent | b7dac26434fc8c7c23f6acca1c7141edc3253c3b (diff) | |
| parent | 3401e4a5985e7ae2a7d36579e3e7099af957a6ec (diff) | |
Merge remote-tracking branch 'origin/2.7' into master
Diffstat (limited to 'changelog')
| -rw-r--r-- | changelog/2.7.4_2020-12-21/4329 (renamed from changelog/unreleased/4329) | 0 | ||||
| -rw-r--r-- | changelog/2.7.4_2020-12-21/7672 (renamed from changelog/unreleased/7672) | 0 | ||||
| -rw-r--r-- | changelog/2.7.4_2020-12-21/8289 (renamed from changelog/unreleased/8289) | 0 | ||||
| -rw-r--r-- | changelog/2.7.4_2020-12-21/8313 | 5 | ||||
| -rw-r--r-- | changelog/CHANGELOG.md | 0 | ||||
| -rw-r--r-- | changelog/unreleased/8314 | 6 |
6 files changed, 11 insertions, 0 deletions
diff --git a/changelog/unreleased/4329 b/changelog/2.7.4_2020-12-21/4329 index 5eac9e608..5eac9e608 100644 --- a/changelog/unreleased/4329 +++ b/changelog/2.7.4_2020-12-21/4329 diff --git a/changelog/unreleased/7672 b/changelog/2.7.4_2020-12-21/7672 index cd6caadac..cd6caadac 100644 --- a/changelog/unreleased/7672 +++ b/changelog/2.7.4_2020-12-21/7672 diff --git a/changelog/unreleased/8289 b/changelog/2.7.4_2020-12-21/8289 index 5d6d6e5cd..5d6d6e5cd 100644 --- a/changelog/unreleased/8289 +++ b/changelog/2.7.4_2020-12-21/8289 diff --git a/changelog/2.7.4_2020-12-21/8313 b/changelog/2.7.4_2020-12-21/8313 new file mode 100644 index 000000000..62975523b --- /dev/null +++ b/changelog/2.7.4_2020-12-21/8313 @@ -0,0 +1,5 @@ +Bugfix: Properly display parent Window when displaying a dialog + +We fixed a bug where a dialgo was shown before the main window was show. + +https://github.com/owncloud/client/issues/8313 diff --git a/changelog/CHANGELOG.md b/changelog/CHANGELOG.md new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog/CHANGELOG.md diff --git a/changelog/unreleased/8314 b/changelog/unreleased/8314 new file mode 100644 index 000000000..581cdc2b4 --- /dev/null +++ b/changelog/unreleased/8314 @@ -0,0 +1,6 @@ +Bugfix: Fix potential crashes with the remove all dialog + +We fixed a bug a dialog window belonging to a removed account could still +be visible. User action on that dialog would then cause a crash. + +https://github.com/owncloud/client/pull/8314 |