1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-09-29 18:42:44 +02:00
Commit Graph

15187 Commits

Author SHA1 Message Date
Bruno Perel
7378ae6a7f Fix git merge hiccup 2020-03-02 08:05:37 +01:00
Nextcloud bot
68ee513bd0
[tx-robot] updated from transifex 2020-03-02 03:26:20 +00:00
Michael Schuster
7fa44d438d
Merge pull request #1823 from nextcloud/fix-http2-disable
Disable HTTP/2 for now due to Qt bug, allow enabling it via env var
2020-03-02 03:26:43 +01:00
Michael Schuster
f90f31756a
Fix build with older Qt: Disable http2 for now due to Qt bug, add env var (upstream)
Disable http2 for now due to Qt bug but allow enabling it via env var, see: https://github.com/owncloud/client/pull/7620
  and: https://github.com/nextcloud/desktop/pull/1806
Issue: https://github.com/nextcloud/desktop/issues/1503

Co-authored-by: XNG <Milokita@users.noreply.github.com>
Co-authored-by: Hannah von Reth <hannah.vonreth@owncloud.com>

Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-03-02 01:47:00 +01:00
XNG
e2066b317b
Disable http2 for now due to Qt bug
So that user may continue to use http2 on their webpage

Signed-off-by: XNG <Milokita@users.noreply.github.com>
(cherry picked from commit dad95d4e4617211360bf2b4391e29c341e939844)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-03-02 01:27:04 +01:00
Michael Schuster
eb7ed33d98
Merge pull request #1744 from nextcloud/qt-traygeometry-workaround
Fix wrong window position on some linux DEs - worked around invalid g…
2020-03-01 07:07:47 +01:00
Michael Schuster
deb90a6ba1
Merge pull request #1739 from nextcloud/qml-singleton-style
Outsourcing qml styling into own, centralized module
2020-03-01 07:06:20 +01:00
Michael Schuster
b846e25ddb
further resource cleanup: remove theme/settings@2x.png
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-03-01 06:51:00 +01:00
Michael Schuster
712fef0cac
Merge branch 'master' into qml-singleton-style and fix merge conflict
Migrate changes in client.qrc to resources.qrc

Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-03-01 06:47:46 +01:00
Michael Schuster
318c749558
Merge pull request #1736 from nextcloud/resource-cleanup
Resource cleanup and application-wide svg usage
2020-03-01 06:11:17 +01:00
Michael Schuster
662fbb7b2a
Merge pull request #1820 from nextcloud/fix-explorer-integration-2
Fix Explorer integration re-save and hide option on non-Windows
2020-03-01 05:43:49 +01:00
Michael Schuster
5b2877a63e
Merge branch 'master' into resource-cleanup
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-03-01 05:34:12 +01:00
Michael Schuster
29e02d0579
owncloudsetuppage.cpp: adapt to string change from master: url -> URL
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-03-01 05:32:59 +01:00
Michael Schuster
a92a764c2a
owncloudsetuppage.cpp: also rename client/theme/lock-http(s) PNGs to SVG
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-03-01 05:12:59 +01:00
Nextcloud bot
2c88b46e26
[tx-robot] updated from transifex 2020-03-01 03:28:17 +00:00
Michael Schuster
40767f7ae0
Fix Explorer integration: Hide option on non-Windows
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-03-01 04:03:29 +01:00
Michael Schuster
f1dd312b2e
Fix Explorer integration re-save (fixes issue #1807)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-03-01 03:39:24 +01:00
Michael Schuster
bf838bd336
Merge pull request #1809 from sroracle/cmake-qml-quick
Fix cmake inclusion of Qml and Quick
2020-02-29 21:18:11 +01:00
Nextcloud bot
ce322fd39c
[tx-robot] updated from transifex 2020-02-29 03:27:40 +00:00
Nextcloud bot
c8e9aac4cf
[tx-robot] updated from transifex 2020-02-28 03:27:33 +00:00
Nextcloud bot
ac491aeb8b
[tx-robot] updated from transifex 2020-02-27 03:28:55 +00:00
Nextcloud bot
3b00bc3cde
[tx-robot] updated from transifex 2020-02-26 03:28:57 +00:00
Nextcloud bot
b3a9954fa8
[tx-robot] updated from transifex 2020-02-25 03:34:13 +00:00
Michael Schuster
67e2999f63
Merge pull request #1810 from nextcloud/rakekniven-patch-1
l10n: Changes to improve source strings
2020-02-24 21:07:12 +01:00
rakekniven
b936cc1f6e
l10n: Change spelling of "webdav"
Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
2020-02-24 11:14:34 +01:00
rakekniven
62bc9d025e
l10n: Removed colon from translation
Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
2020-02-24 11:13:34 +01:00
rakekniven
961c05363a
l10n: Removed blank before colon
Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
2020-02-24 11:10:05 +01:00
rakekniven
3f7cd5c0f3
l10n: Change case of one word
Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
2020-02-24 11:08:56 +01:00
Max Rees
3d3021e3b0
Fix cmake inclusion of Qml and Quick
Signed-off-by: Max Rees <maxcrees@me.com>
2020-02-23 23:44:54 -06:00
Nextcloud bot
b7b3601cc1
[tx-robot] updated from transifex 2020-02-24 03:30:44 +00:00
Nextcloud bot
366016ce3c
[tx-robot] updated from transifex 2020-02-23 03:30:53 +00:00
Nextcloud bot
eb419d54fa
[tx-robot] updated from transifex 2020-02-22 03:30:06 +00:00
Michael Schuster
5ab20d4ab1
Merge pull request #1802 from nextcloud/feature/update-segment
Updater: Add query-parameter 'updatesegment' to the update check
2020-02-21 23:39:10 +01:00
Michael Schuster
9c8a0204e5
Updater: Add query-parameter 'updatesegment' to the update check
Used to throttle down desktop release rollout in order to keep the update servers alive at peak times.

See: https://github.com/nextcloud/client_updater_server/pull/36

Targeted issues: #1795, #1800

Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-02-21 21:28:42 +01:00
Nextcloud bot
34e3d236f8
[tx-robot] updated from transifex 2020-02-21 12:45:31 +00:00
Nextcloud bot
67bc8fc529
[tx-robot] updated from transifex 2020-02-21 12:15:55 +00:00
Nextcloud bot
ac1e4d2bb1
[tx-robot] updated from transifex 2020-02-20 03:29:30 +00:00
Nextcloud bot
04d68018d6
[tx-robot] updated from transifex 2020-02-19 03:26:26 +00:00
Nextcloud bot
7bb3646781
[tx-robot] updated from transifex 2020-02-18 03:26:16 +00:00
Michael Schuster
5554488dd8
Merge pull request #1768 from nextcloud/umlaut-sync-fix
Fix wrong encoding when specifying extra header with if-match path
2020-02-17 01:49:48 +01:00
Nextcloud bot
39a48a17ef
[tx-robot] updated from transifex 2020-02-16 03:26:04 +00:00
Nextcloud bot
7dd903c9b6
[tx-robot] updated from transifex 2020-02-15 03:27:07 +00:00
Michael Schuster
cf209f4c10
Merge pull request #1782 from nextcloud/enh/quota-userinfo
Add UserInfo class and fetch quota via API instead of PropfindJob
2020-02-14 12:58:16 +01:00
Nextcloud bot
33896de943
[tx-robot] updated from transifex 2020-02-14 03:26:18 +00:00
Michael Schuster
3e255df533
Fix Tests linkage (missed UserInfo.cpp in CMakeLists.txt)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-02-14 03:12:37 +01:00
Michael Schuster
640655ea10
Code cleanup
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-02-14 03:00:20 +01:00
Michael Schuster
abfebcf291
Add UserInfo class and fetch quota via API instead of PropfindJob
The PropfindJob quota includes the size of shares and thus leads to confusion
in regard of the real space available, as shown in the UI.
This commit aims to streamline the behaviour with the Android and iOS apps,
which also utilize the API.

Details:
- Refactor the QuotaInfo class into UserInfo
- Use JsonApiJob (ocs/v1.php/cloud/user) instead of PropfindJob
- Let ConnectionValidator use the new UserInfo class to fetch
  the user and the avatar image (to avoid code duplication)
- Allow updating the avatar image upon AccountSettings visibility,
  using UserInfo's quota fetching

Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-02-14 02:10:01 +01:00
Nextcloud bot
bbb310a853
[tx-robot] updated from transifex 2020-02-13 03:30:53 +00:00
Nextcloud bot
fd6eba287e
[tx-robot] updated from transifex 2020-02-12 03:25:47 +00:00
Nextcloud bot
8f2e853ec0
[tx-robot] updated from transifex 2020-02-11 03:29:04 +00:00