Camila Ayres
4efa282f80
Merge branch 'master' into issue_1351
2019-11-04 22:48:07 +01:00
Michael Schuster
b9ad82ceeb
Merge branch 'master' into fix-remote-wipe-proxy
2019-11-04 19:58:56 +01:00
Michael Schuster
6421397083
Fix updater message: Download link instead of "use the system's update tool"
...
Provide a download link to the new version instead of the confusing message that
users should use their "system's update tool to install it".
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-11-04 19:19:59 +01:00
Camila San
52ae354ca2
Fix remote wipe when a proxy is configured.
...
Signed-off-by: Camila San <hello@camila.codes>
2019-11-04 17:52:02 +00:00
Dominique Fuchs
7ed03f1f29
resolving conflict with current master
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-29 14:07:26 +01:00
Dominique Fuchs
5301477747
Merge branch 'master' into recipientnote
2019-10-29 12:58:14 +01:00
Michael Schuster
8e8858178b
Merge branch 'master' into move-rtfiles
2019-10-27 17:49:22 +01:00
Michael Schuster
e54f127a06
Merge branch 'master' into lnx-domainname-desktopfiles
2019-10-27 17:30:48 +01:00
Michael Schuster
9618500975
fix tab spacing
...
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-27 17:25:50 +01:00
Dominique Fuchs
eff75a2059
Merge branch 'master' into move-rtfiles
2019-10-27 15:43:41 +01:00
Sergey Zolotarev
9a11bef263
Fix duplicate items in Apps menu (a bug introduced in #1477 )
...
Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
2019-10-24 02:55:56 +06:00
adrb
921b144d06
Merge branch 'master' into issue_1351
2019-10-18 08:19:32 +02:00
Adrian Brzezinski
3b750895b4
* fix for issue no. 1351
...
Signed-off-by: Adrian Brzezinski <adrian.brzezinski@eo.pl>
2019-10-18 08:16:59 +02:00
Michael Schuster
32bb31a417
Merge branch 'master' into feature/remote-wipe
2019-10-17 22:05:20 +02:00
Camila San
19491ff85f
Once client gets 401/403 from the server, check if remote wipe was requested.
...
- When the the users logs because of 401 or 403 errors, it checks if the
server requested the remote wipe. If yes, locally deletes account and folders
connected to the account and notify the server. If no, proceeds to ask the
user to login again.
- The app password is restored in the keychain.
- WIP: The change also includes a test class for RemoteWipe.
Signed-off-by: Camila San <hello@camila.codes>
2019-10-17 20:11:31 +02:00
Camila San
8546d53b05
Merge the list of ignored files/symlinks into one Activity notification.
...
Signed-off-by: Camila San <hello@camila.codes>
2019-10-17 18:45:33 +02:00
Michael Schuster
ade50d0b92
Pick from upstream: Update qtmacgoodies for an OSX crash fix #6930
...
With Qt 5.12.5 this OC crash also applies to the Nextcloud Desktop Client on macOS.
For reference please see:
- https://github.com/owncloud/client/issues/6930
- 0dc7bc3328
For the required changes in the qtmacgoodies submodule see:
https://github.com/camilasan/qtmacgoodies/pull/1
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-17 04:29:33 +02:00
Michael Schuster
e8fc3ecf28
Merge branch 'master' into quit-wizard-fix
2019-10-16 04:43:41 +02:00
Michael Schuster
c8b4145214
Add a 'Content-Length: 0' header to initial POST requests
...
The webserver lighttpd rejected POST requests without a Content-length
header with "411 Length Required".
See: https://github.com/nextcloud/desktop/issues/1473
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-10 05:17:22 +02:00
Michael Schuster
04a9f0313a
Merge pull request #1481 from asapelkin/for_loop_optimization
...
Avoiding copying in range-based loops
2019-10-10 01:30:40 +02:00
Michael Schuster
4ddc606361
Merge branch 'master' into for_loop_optimization
2019-10-10 01:12:57 +02:00
Michael Schuster
836c748cd9
Merge branch 'master' into trexcl
2019-10-10 01:12:48 +02:00
Michael Schuster
0d349d54b4
Fix outdated link to server admin docs
...
Sets the target version from "15" to "latest" and removes
"index.html" because this could get obsolete in the future too.
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-10 01:03:46 +02:00
Michael Schuster
29123f4d9d
Merge branch 'master' into master
2019-10-10 00:45:04 +02:00
Dominique Fuchs
c1cd308940
Merge branch 'master' into quit-wizard-fix
2019-10-09 09:18:26 +02:00
Sergey Zolotarev
4bba498229
Replace isQuitting flag with disconnect()
...
Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
2019-10-09 11:07:00 +06:00
asapelkin
6b71e4ec6f
Merge branch 'master' into for_loop_optimization
2019-10-07 15:31:01 +03:00
Dominique Fuchs
75444e44b9
Merge branch 'master' into master
2019-10-07 09:45:22 +02:00
asapelkin
17f39bd09d
little loops optimization
...
Signed-off-by: asapelkin <asapelkin0x01@ya.ru>
2019-10-07 01:29:55 +03:00
Sergey Zolotarev
eaddc55267
Don't run connection wizard when quitting the application
...
Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
2019-10-05 22:38:47 +06:00
Sergey Zolotarev
f6b6765424
Prevent jumping of tray menu
...
Instead of adding the "Apps" menu after the apps are fetched, add it
from the start (together with other actions) but in a disabled state,
and enable it after the apps data is ready.
Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
2019-10-05 22:10:35 +06:00
Michael Schuster
7deb74cc22
Merge branch 'master' into show-server-vers
2019-10-05 00:44:08 +02:00
rakekniven
b25aa99de7
Fixed grammar
...
Reported at Transifex.
See https://www.transifex.com/nextcloud/nextcloud/translate/#nl/client/182396083
Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
2019-10-04 08:10:55 +02:00
Daniel Kesselberg
4114fe68c9
Add server info to menu
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-10-01 16:16:20 +02:00
Felix Eckhofer
28da954aad
Fix typo
...
Signed-off-by: Felix Eckhofer <felix@eckhofer.com>
2019-10-01 08:25:24 +02:00
Dominique Fuchs
0a407a39b0
Merge branch 'master' into lnx-domainname-desktopfiles
2019-09-30 09:46:15 +02:00
Dominique Fuchs
3ad1c0e7a8
Created wrapper variable LINUX_APPLICATION_ID to clean up code
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-30 09:45:41 +02:00
Michael Schuster
00db94a73c
Revert "Fix White Window issue on Windows after Qt 5.12.4 upgrade"
...
This reverts commit 8f616969ab
.
Turns out that with the upgrade to the new released Qt 5.12.5 the issue
has been solved by the Qt developers, so this fix becomes obsolete.
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-27 04:58:12 +02:00
Dominique Fuchs
f52c330c22
cleanup and migration for location change
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 19:09:40 +02:00
Dominique Fuchs
67ed54671b
Adapted for cmd version and added migration step for config file
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 17:47:01 +02:00
Dominique Fuchs
fc6b895f52
moved default db sync file to Qt standard path AppDataLocation
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 17:09:24 +02:00
Camila Ayres
6f9256f290
Merge branch 'master' into lnx-domainname-desktopfiles
2019-09-26 13:26:22 +02:00
Dominique Fuchs
555c513acb
Merge branch 'master' into lnx-domainname-desktopfiles
2019-09-26 12:51:20 +02:00
Dominique Fuchs
96da4674f9
Updated .desktop file naming scheme
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 12:36:05 +02:00
Camila Ayres
570041e3b4
Merge branch 'master' into enhancement/change-share-menu-wording
2019-09-26 11:12:43 +02:00
Michael Schuster
8f616969ab
Fix White Window issue on Windows after Qt 5.12.4 upgrade
...
Qt 5.12.4 seems to introduce a new bug on Windows, causing the settings window
to not be redrawn when re-opening it, for example by clicking at the tray icon.
As a workaround this fix starts a 100 ms timer to be fired once upon
QDialog::showEvent is called.
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-26 04:59:17 +02:00
Camila San
b9f0e444e8
Improve wording of the context menu in the file manager extension.
...
'Share...' -> 'Share options'
'private link' -> 'internal link'
Removes 'to clipboard' from 'copy link' options.
Signed-off-by: Camila San <hello@camila.codes>
2019-09-25 19:54:22 +02:00
Dominique Fuchs
cd89efc24b
Fixed some missing 'translatable' exclusions, added missing window titles in flow dialogs
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-25 14:02:59 +02:00
Camila San
dd90ed9643
Changes wording in the share context menu.
...
Instead of only Nextcloud it says "Share via Nextcloud".
Signed-off-by: Camila San <hello@camila.codes>
2019-09-24 16:25:03 +02:00
Dominique Fuchs
0ff91574d2
show only 'shared with you by...' if it's not the current user itself
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-20 18:50:32 +02:00