mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-21 05:13:04 +03:00
Code Issues Projects Releases Packages Wiki Activity
13585 commits 486 branches 258 tags 463 MiB
Commit graph

6347 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Dominique Fuchs
544229d1e8 [WIP] themed button implementation 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-13 08:24:02 +02:00
Dominique Fuchs
af05db895c [WIP] Resource file and include changes as well as new control icons for wizard slide buttons 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-13 08:08:39 +02:00
Dominique Fuchs
1d96b102c0 Layout optimizations and tab access for self-hosting link 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-12 22:00:43 +02:00
Dominique Fuchs
ff5bf8634f fix naming for slide navigation, adapted everywhere to be consistent 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-12 20:59:03 +02:00
Dominique Fuchs
f49cd1850c Restructured layout, as the initial change were too broken (after additions through the last months) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-12 20:53:40 +02:00
Dominique Fuchs
c873da75e4 Fixed wrong resource paths 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-12 17:52:31 +02:00
Dominique Fuchs
907f36bfcb Merge branch 'bugfixing-slideshow' of https://github.com/nextcloud/desktop into bugfixing-slideshow 2019-09-12 16:43:54 +02:00
Dominique Fuchs
04fedf83b4 Added newly created next/prev svg's and fixed reduntant layout parts in wizard 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-12 16:43:24 +02:00
Michael Schuster
f3d774e2e5
Merge branch 'master' into fix-double-slashes 2019-09-12 05:09:21 +02:00
Dominique Fuchs
febc035063
Merge branch 'master' into ivan/remote-size-retrieved-race-condition 2019-09-11 22:56:34 +02:00
Dominique Fuchs
4902751d02
Merge branch 'master' into bugfixing-slideshow 2019-09-11 22:17:57 +02:00
Michael Schuster
905c1532fe
fix comment typo 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-09-11 17:31:16 +02:00
Dominique Fuchs
dd130ede8f
Merge branch 'master' into master 2019-09-10 10:17:37 +02:00
Dominique Fuchs
c662ff1902 fixed wrongly assigned pointer, didn't recognize class 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-09 20:06:32 +02:00
Dominique Fuchs
a237493def Q_UNUSED for atm unused parameters 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-09 19:23:38 +02:00
Dominique Fuchs
3a0cd45782 Declared Q_UNUSED for as-of-now unused parameters. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-09 19:23:37 +02:00
Dominique Fuchs
f08cc08eb2 Prevented warning regarding operator precedence - enhanced clarity by adding parentheses 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-09 19:23:36 +02:00
Dominique Fuchs
e3685b951c removed reduntant /* within a comment 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-09 19:23:35 +02:00
Dominique Fuchs
6b04e2f77b Remove unnecessary argument 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-09 19:23:34 +02:00
Dominique Fuchs
2e8b7771b0 Prevent use of uninitialized folder pointer. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-09 19:23:32 +02:00
Dominique Fuchs
26e98d35e6 Added forgotten case when parsing log through gui. LockedFiles were not communicated. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-09 19:23:31 +02:00
Dominique Fuchs
ab3d0141ec initialize _modtime to prevent undefined usage 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-09 19:23:30 +02:00
Dominique Fuchs
39df36c247 Use return type to prevent warning and determine chown success. Added TODO 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-09 18:06:29 +02:00
Dominique Fuchs
7473cdf184 Removed disabling of msvc warning to prevent generating a unknown option for other compilers in turn. Now detect specifically GCC in ifdef 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-09 13:46:46 +02:00
Dominique Fuchs
c585e81530 Moved macro definition due to timing issues while compiling when relying on header inheritance 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-08 19:46:08 +02:00
Dominique Fuchs
c779098772 Conditional (based on Qt version) use of 'horizontalAdvance' to provide better UI experience. See https://doc.qt.io/qt-5/qfontmetrics-obsolete.html#width 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-08 19:37:56 +02:00
Dominique Fuchs
cc07ed1ee8 commit 222b2d did the trick. now streamlined use of https://doc.qt.io/qt-5/qtglobal.html#QT_VERSION_CHECK 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-08 19:22:40 +02:00
Dominique Fuchs
222b2d8645 Further testing of cond. include of Qt library > 5.9. Utilized different macro. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-08 19:17:00 +02:00
Dominique Fuchs
f41eeaf6ec Fixed another logic error -> logical to bitwise OR for QTLEGACY 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-08 18:51:54 +02:00