Hannah von Reth
|
ecb7347d33
|
2.7 has less automatic includes on Windows
|
2020-03-13 16:30:58 +01:00 |
|
Hannah von Reth
|
4d690710d2
|
Merge branch '2.6'
|
2020-03-13 15:22:10 +01:00 |
|
Hannah von Reth
|
f8cf98a768
|
Cleanup Windows shell extensions
|
2020-03-13 14:18:18 +01:00 |
|
Hannah von Reth
|
db40652c6a
|
Update year
|
2020-03-13 14:18:18 +01:00 |
|
Hannah von Reth
|
54ce1662a4
|
Fix build with mingw
Stack protections still breaks mingw builds
|
2020-03-12 13:44:33 +01:00 |
|
Hannah von Reth
|
9aba4cfa5a
|
[tx] updated client translations from transifex
|
2020-03-11 03:32:08 +00:00 |
|
Hannah von Reth
|
e1ca612c5d
|
Don't insert items into the folder model if selectiveSync is not supported
This fixes an assertion in FolderStatusModel::SubFolderInfo::resetSubs
rowCount reported 0 but we actually had items in the model
|
2020-03-10 16:31:00 +01:00 |
|
Hannah von Reth
|
f7070ebd62
|
[tx] updated client translations from transifex
|
2020-03-10 03:34:17 +00:00 |
|
Hannah von Reth
|
02f5d5a802
|
Always enable experimental features in vanilla theme
|
2020-03-09 14:47:15 +01:00 |
|
Hannah von Reth
|
f87dd0aaa5
|
Make sure all cases are handled
|
2020-03-09 14:46:18 +01:00 |
|
Hannah von Reth
|
3ba8eeb2d7
|
[Gui] Fix vfs dialog not showing on Windows
|
2020-03-09 14:46:18 +01:00 |
|
Hannah von Reth
|
e48faae96d
|
[tx] updated client translations from transifex
|
2020-03-05 03:08:39 +00:00 |
|
Hannah von Reth
|
5d8df64704
|
Remove unused defines
|
2020-03-04 11:46:26 +01:00 |
|
Hannah von Reth
|
2125992f3f
|
Use Q_ENUM_NS to pretty print csync enums
|
2020-03-04 11:46:26 +01:00 |
|
Hannah von Reth
|
9cac0da65b
|
Bugfix: Client sometimes does not show up when started by a user
Issue: #7018
|
2020-03-04 09:51:27 +01:00 |
|
Hannah von Reth
|
6debfe6bdd
|
[tx] updated client translations from transifex
|
2020-03-04 03:31:30 +00:00 |
|
Hannah von Reth
|
3e765c7281
|
[Gui] Fix remaning icon
|
2020-03-03 12:15:34 +01:00 |
|
Hannah von Reth
|
90cdbe442b
|
[Gui] Apply createColorAwareIcon on more icons
|
2020-03-03 11:33:28 +01:00 |
|
Hannah von Reth
|
7b75fe2c93
|
[CI] backport changelog generation
|
2020-03-03 11:06:54 +01:00 |
|
Michael Stingl
|
2685a82835
|
Merge pull request #7771 from owncloud/fix-7762
OAuth: make sure to encode the '+' in query string
|
2020-03-02 12:07:41 +01:00 |
|
Hannah von Reth
|
dedb42500e
|
Merge branch '2.6'
|
2020-02-28 17:50:46 +01:00 |
|
Hannah von Reth
|
6cbd980c1f
|
[Ci] Update craft
|
2020-02-28 12:25:17 +01:00 |
|
Hannah von Reth
|
4590a4bbfa
|
[Ci] Update craft
|
2020-02-28 11:51:59 +01:00 |
|
Hannah von Reth
|
f765532e4c
|
[Ci] Update craft config and switch to Qt 5.12.7
|
2020-02-28 11:17:43 +01:00 |
|
Dominik Schmidt
|
b3dd880591
|
Lower required version to 5.10.
It's what we use for our legacy macOS builds for 2.6.x. master still
requires 5.12.
|
2020-02-27 16:20:30 +01:00 |
|
Hannah von Reth
|
98aa48ca80
|
[tx] updated client translations from transifex
|
2020-02-27 03:28:17 +00:00 |
|
Hannah von Reth
|
1fa42814be
|
For a satisfying and secure experience we require Qt 5.12
|
2020-02-26 13:21:07 +01:00 |
|
Hannah von Reth
|
6f8cd289ae
|
Automated changelog update [skip ci]
|
2020-02-26 11:08:39 +00:00 |
|
Hannah von Reth
|
4dd0e22a3f
|
Merge remote-tracking branch 'origin/2.6'
|
2020-02-26 12:02:01 +01:00 |
|
Olivier Goffart
|
1374be3bb1
|
Automated changelog update [skip ci]
|
2020-02-26 10:58:44 +00:00 |
|
Olivier Goffart
|
1bcece999a
|
Merge pull request #7737 from owncloud/merge
Merge 2.6 in master
|
2020-02-26 10:30:09 +01:00 |
|
Hannah von Reth
|
44198bd0e2
|
Bump version
|
2020-02-25 17:13:57 +01:00 |
|
Hannah von Reth
|
b55737bd50
|
Revert removal of suffix
|
2020-02-25 16:56:55 +01:00 |
|
Hannah von Reth
|
9e4be87881
|
Merge branch '2.6.2' into 2.6
|
2020-02-25 16:53:19 +01:00 |
|
Olivier Goffart
|
dc1070d02d
|
Merge remote-tracking branch 'origin/2.6'
Conflicts:
CHANGELOG.md
VERSION.cmake
src/gui/MacOSXBundleInfo.plist
src/gui/folderstatusmodel.h
src/gui/settingsdialog.cpp
|
2020-02-25 11:45:27 +01:00 |
|
Olivier Goffart
|
4296ebffee
|
OAuth: make sure to encode the '+' in query string
The server understands '+' as a space.
Issue #7762
|
2020-02-25 11:43:43 +01:00 |
|
Olivier Goffart
|
aab8ee3e77
|
Changelog: all entries need to have a prefix
|
2020-02-25 11:24:17 +01:00 |
|
Olivier Goffart
|
2eaeabff45
|
Changelog: make sure the title is short enough
or CI won't pass in master
|
2020-02-25 09:52:08 +01:00 |
|
Hannah von Reth
|
a86b9677ca
|
Don't hardcode PLUGINDIR
|
2020-02-24 15:04:51 +01:00 |
|
Michael Stingl
|
fb36ddc3e0
|
[typo] Changelog: caused instead of casued
|
2020-02-24 13:40:48 +01:00 |
|
Hannah von Reth
|
4b900b5f7c
|
Add changelog entry for #7761
|
2020-02-24 12:43:10 +01:00 |
|
Dominik Schmidt
|
3c7bc6886f
|
Remove sign_app.sh
|
2020-02-24 11:01:40 +01:00 |
|
Hannah von Reth
|
d4f834bdb9
|
Fix potential null pointer access
https://sentry.io/organizations/owncloud/issues/1529161263/events/02509984b5ca42ffb3960d9c9e161414/?project=79001&statsPeriod=14d
|
2020-02-24 10:05:19 +01:00 |
|
Hannah von Reth
|
42ef3de4ce
|
Version bump
|
2020-02-21 15:17:27 +01:00 |
|
Hannah von Reth
|
0b9977a9f8
|
[Gui] Hide delta sync if enableExperimentalFreatures are disabled
|
2020-02-21 15:17:27 +01:00 |
|
Hannah von Reth
|
fad78f3224
|
[Branding] Add branding option to disable experimental features
Fixes: #7755
|
2020-02-21 15:16:49 +01:00 |
|
Hannah von Reth
|
89d34b71cf
|
Change logs are now automatically generated on Master
(cherry picked from commit 510911c822)
|
2020-02-21 11:54:19 +01:00 |
|
Olivier Goffart
|
5cbbbbb61c
|
[tx] updated client translations from transifex
|
2020-02-20 03:03:38 +00:00 |
|
Olivier Goffart
|
7f844dc722
|
Folder Wizard: warn when adding a folder which is the parent of a sync'ed folder
issue #7741
|
2020-02-19 17:54:10 +01:00 |
|
Hannah von Reth
|
86c376d211
|
[CMake] Directly install sync-exclude.lst on Windows to the correct directory
|
2020-02-19 17:44:52 +01:00 |
|