István Váradi
fd7ba861a1
Merge branch 'master' into fix-eoan-build
2019-10-04 20:15:38 +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
Nextcloud bot
dddb233f16
[tx-robot] updated from transifex
2019-10-04 03:05:53 +00:00
Corentin Noël
04dd02c295
Build with libcloudproviders on debian and in the AppImage
...
Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
2019-10-03 10:33:46 +02:00
Nextcloud bot
3f495a30e0
[tx-robot] updated from transifex
2019-10-03 03:03:10 +00:00
István Váradi
37f74291b5
Remove kdelibs5-dev from the build dependencies for Eoan
...
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-10-02 20:04:23 +02:00
Nextcloud bot
361c5a5a54
[tx-robot] updated from transifex
2019-10-02 03:05:56 +00: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
Camila Ayres
4dddf88569
Merge pull request #1459 from tribut/fix-ldap-display-name
...
Use user-provided username in `displayName()` - Fix #836
2019-10-01 15:06:15 +02:00
Camila Ayres
7f19d5669b
Merge branch 'master' into fix-ldap-display-name
2019-10-01 12:34:39 +02:00
Roeland Jago Douma
c6705ecd9c
Merge pull request #1462 from tribut/fix-typo-elided
...
Fix typo
2019-10-01 12:02:36 +02:00
Felix Eckhofer
28da954aad
Fix typo
...
Signed-off-by: Felix Eckhofer <felix@eckhofer.com>
2019-10-01 08:25:24 +02:00
Nextcloud bot
a8fbbc65c1
[tx-robot] updated from transifex
2019-10-01 03:15:23 +00:00
Michael Schuster
47ffcfd561
Merge pull request #1461 from nextcloud/issue/1458
...
Checks if exclude file is empty before creating the regular expressions.
2019-09-30 21:52:04 +02:00
Camila San
481d8d3a0b
Checks if exclude file is empty before creating the regular expressions.
...
The default file created by the application it is not empty.
Signed-off-by: Camila San <hello@camila.codes>
2019-09-30 20:38:56 +02:00
Felix Eckhofer
ace142bb23
Use user-provided username in displayName()
...
This replaces `davUser()`, which is replaced by a numeric ID when using
LDAP, by the username that was actually used for logging in.
Fixes #836
Signed-off-by: Felix Eckhofer <felix@eckhofer.com>
2019-09-30 17:56:14 +02:00
Dominique Fuchs
ea14baff6c
Merge branch 'lnx-domainname-desktopfiles' of https://github.com/nextcloud/desktop into lnx-domainname-desktopfiles
2019-09-30 11:00:10 +02:00
Dominique Fuchs
0c4c5c5f8b
Fixed typo / double suffix
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-30 10:59:59 +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
Nextcloud bot
a140720901
[tx-robot] updated from transifex
2019-09-30 03:12:41 +00:00
Nextcloud bot
141d31c546
[tx-robot] updated from transifex
2019-09-29 03:15:41 +00:00
Andreas Wunderlich
f293dbfeeb
Revert default remote poll interval back from 5 seconds to 30 seconds
...
Signed-off-by: Andreas Wunderlich <code@andwun.me>
2019-09-29 00:58:35 +02:00
Dominique Fuchs
3f533edba6
Merge branch 'master' into syncjournal-del-prio
2019-09-28 09:29:04 +02:00
Dominique Fuchs
10a5e75cd8
Harmonizing sorting algorithm (again)
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-28 09:17:12 +02:00
Nextcloud bot
58349fae02
[tx-robot] updated from transifex
2019-09-28 03:04:02 +00:00
Dominique Fuchs
3269402f48
Merge branch 'syncjournal-del-prio' of https://github.com/nextcloud/desktop into syncjournal-del-prio
2019-09-27 12:21:06 +02:00
Dominique Fuchs
26f7848821
Fix logic for DELETE prio, now (hopefully) in harmony with destination sorting
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-27 12:21:02 +02:00
Dominique Fuchs
08efb40599
Merge branch 'master' into syncjournal-del-prio
2019-09-27 09:59:32 +02:00
Dominique Fuchs
f81e5be119
Implemented second sorting step for SyncFileVector (merged trees) to prioritize DELETEs
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-27 09:34:49 +02:00
Nextcloud bot
cf4fcebc53
[tx-robot] updated from transifex
2019-09-27 03:04:15 +00: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
a8ecf486d1
Updated AppImage instructions w/ new desktop file name
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 21:01:01 +02:00
Dominique Fuchs
83918619cf
Corrected new .desktop file location in forgotten function
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 20:56:14 +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
Camila Ayres
f6b03f0186
Merge pull request #1443 from nextcloud/enhancement/change-share-menu-wording
...
Improve wording of the context menu in the file manager extension.
2019-09-26 13:20:42 +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
Dominique Fuchs
e5f0ee3b92
Fixed wrongly formatted define statement
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 12:35:32 +02:00
Camila Ayres
570041e3b4
Merge branch 'master' into enhancement/change-share-menu-wording
2019-09-26 11:12:43 +02:00
Camila Ayres
c0e7120b12
Merge pull request #1445 from nextcloud/fix-white-window
...
Fix White Window issue on Windows after Qt 5.12.4 upgrade
2019-09-26 11:04:14 +02:00
Michael Schuster
82a73e443c
Merge branch 'master' into fix-white-window
2019-09-26 05:21:42 +02:00
Nextcloud bot
5d3a8e3725
[tx-robot] updated from transifex
2019-09-26 03:03:05 +00: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
Michael Schuster
cb60e8aa90
Merge branch 'master' of https://github.com/nextcloud/desktop
2019-09-26 01:41:06 +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