chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-09-25 07:02:47 +02:00
Code Activity
15,244 Commits 4 Branches 173 Tags
v3.1.1
Commit Graph

7133 Commits

Author SHA1 Message Date
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
Camila Ayres
7f19d5669b Merge branch 'master' into fix-ldap-display-name 2019-10-01 12:34:39 +02:00
Felix Eckhofer
28da954aad Fix typo 
Signed-off-by: Felix Eckhofer <felix@eckhofer.com>
 2019-10-01 08:25:24 +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
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
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
10a5e75cd8 Harmonizing sorting algorithm (again) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-28 09:17:12 +02: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
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
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
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
d8dca83dd5 Merge branch 'master' into recipientnote 2019-09-20 19:01:34 +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
Michael Schuster
30cff4e4f8 UI improvement: Message box: Delete / Keep all files 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-09-20 16:47:11 +02:00
Dominique Fuchs
31f3b322c8 Color corrections and sharer=self case implementation 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-19 10:04:52 +02:00
Mariusz Wasak
dcc33f3417 Fix for #1382 "linux client crashes for no discernable reason" 
There in no "return" in
PropagateUploadFileCommon::slotStartUpload in if (prevModtime != _item-
>_modtime) {... }

There is possibility that
PropagateItemJob::done(status, errorString)
maybe called two times from PropagateUploadFileCommon::slotStartUpload
1. in if (prevModtime != _item->_modtime) {... }
2. in if (fileIsStillChanging(*_item)) {..}
if changes in files are frequent the second call is possible.

This two calls has effect in PropagatorCompositeJob::slotSubJobFinished
and job is removed two times in _runningJobs.remove(i);
(the second time with argumetnt -1 (because first call removed job).

This return was removed in commit
efc039863b - by accident I think.

Good simulation is to synchronize firefox profile with frequent page
refresh.

Signed-off-by: Mariusz Wasak <mawasak@gmail.com>
 2019-09-18 18:18:12 +02:00
Dominique Fuchs
5a9fc02f07 Correcting autoraise for widget w/ background fill 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-18 13:40:14 +02:00
Dominique Fuchs
9d6780d6c1 Finishing PR #1154 adding note when sharing 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-18 13:37:49 +02:00
Michael Schuster
207de071f4 Add warning for failed chown in libsync/propagatedownload.cpp 
In addition to PR 1409 generate warnings if chown fails.

See: https://github.com/nextcloud/desktop/pull/1409

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-09-16 20:26:18 +02:00
Michael Schuster
916d414543 Merge branch 'master' into ivan/remote-size-retrieved-race-condition 2019-09-16 19:17:00 +02:00
Michael Schuster
b40e3e7b4e Merge branch 'master' into msvc-warn-audit 2019-09-16 16:55:42 +02:00
Kilian Pfeiffer
c46ca5c256 Merge branch 'master' into master 2019-09-16 13:41:15 +02:00
Dominique Fuchs
a2a753a34b Merge branch 'master' into fix_urlscheme_warning 2019-09-15 19:12:22 +02:00
Camila Ayres
82a67a44c4 Merge branch 'master' into bugfixing-slideshow 2019-09-15 18:18:46 +02:00
Dominique Fuchs
a35b346e62 Fixed e2e key transmission issue after generation (forgotten content type on sendrequest()) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-15 11:53:57 +02:00
Dominique Fuchs
7d4406254a Merge branch 'master' into fix_urlscheme_warning 2019-09-15 09:56:16 +02:00
Dominique Fuchs
1eb61b7949 Fixed unused var 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-13 20:49:59 +02:00
Dominique Fuchs
f6bac6cfdd Merge branch 'bugfixing-slideshow' of https://github.com/nextcloud/desktop into bugfixing-slideshow 2019-09-13 20:38:16 +02:00
Dominique Fuchs
e8c8fe4223 Added slight svg transparency as requested in ref issue, fixed bg detection logic 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-13 20:38:03 +02:00
Dominique Fuchs
3659bca0ec Merge branch 'master' into bugfixing-slideshow 2019-09-13 17:30:25 +02:00
Dominique Fuchs
ace3da841c (Maybe) finished implementation of themed wizard buttons and accessibility refinements and thus implementation of helper fct. to retrieve themed QIcons. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-13 17:26:39 +02:00