Michael Schuster [Mon, 16 Sep 2019 17:17:00 +0000 (19:17 +0200)]
Merge branch 'master' into ivan/remote-size-retrieved-race-condition
Michael Schuster [Mon, 16 Sep 2019 17:08:10 +0000 (19:08 +0200)]
Merge pull request #1409 from DominiqueFuchs/msvc-warn-audit
Review of msvc/gcc warnings -> code cleanup, prevention of implicit casts, variadic macros
Michael Schuster [Mon, 16 Sep 2019 14:55:42 +0000 (16:55 +0200)]
Merge branch 'master' into msvc-warn-audit
Nextcloud bot [Mon, 16 Sep 2019 02:55:42 +0000 (02:55 +0000)]
[tx-robot] updated from transifex
Dominique Fuchs [Sun, 15 Sep 2019 17:31:20 +0000 (19:31 +0200)]
Merge pull request #1214 from Thaodan/fix_urlscheme_warning
fix qt warning about registering a URL sheme first.
Dominique Fuchs [Sun, 15 Sep 2019 17:12:22 +0000 (19:12 +0200)]
Merge branch 'master' into fix_urlscheme_warning
Camila Ayres [Sun, 15 Sep 2019 16:52:05 +0000 (18:52 +0200)]
Merge pull request #1149 from nextcloud/bugfixing-slideshow
slideshow buttons
Camila Ayres [Sun, 15 Sep 2019 16:18:46 +0000 (18:18 +0200)]
Merge branch 'master' into bugfixing-slideshow
Camila Ayres [Sun, 15 Sep 2019 15:22:49 +0000 (17:22 +0200)]
Merge pull request #1420 from nextcloud/e2e-csr-transmit
Fixing E2E CSR transmission failure for new connections
Dominique Fuchs [Sun, 15 Sep 2019 10:03:16 +0000 (12:03 +0200)]
Merge branch 'master' into e2e-csr-transmit
Dominique Fuchs [Sun, 15 Sep 2019 09:53:57 +0000 (11:53 +0200)]
Fixed e2e key transmission issue after generation (forgotten content type on sendrequest())
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 15 Sep 2019 07:56:16 +0000 (09:56 +0200)]
Merge branch 'master' into fix_urlscheme_warning
Nextcloud bot [Sun, 15 Sep 2019 02:57:10 +0000 (02:57 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 14 Sep 2019 02:55:51 +0000 (02:55 +0000)]
[tx-robot] updated from transifex
Dominique Fuchs [Fri, 13 Sep 2019 18:49:59 +0000 (20:49 +0200)]
Fixed unused var
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Fri, 13 Sep 2019 18:38:16 +0000 (20:38 +0200)]
Merge branch 'bugfixing-slideshow' of https://github.com/nextcloud/desktop into bugfixing-slideshow
Dominique Fuchs [Fri, 13 Sep 2019 18:38:03 +0000 (20:38 +0200)]
Added slight svg transparency as requested in ref issue, fixed bg detection logic
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Fri, 13 Sep 2019 15:30:25 +0000 (17:30 +0200)]
Merge branch 'master' into bugfixing-slideshow
Dominique Fuchs [Fri, 13 Sep 2019 15:26:39 +0000 (17:26 +0200)]
(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>
Dominique Fuchs [Fri, 13 Sep 2019 06:24:02 +0000 (08:24 +0200)]
[WIP] themed button implementation
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Fri, 13 Sep 2019 06:08:39 +0000 (08:08 +0200)]
[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>
Nextcloud bot [Fri, 13 Sep 2019 02:57:35 +0000 (02:57 +0000)]
[tx-robot] updated from transifex
Dominique Fuchs [Thu, 12 Sep 2019 20:00:43 +0000 (22:00 +0200)]
Layout optimizations and tab access for self-hosting link
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Michael Schuster [Thu, 12 Sep 2019 19:25:43 +0000 (21:25 +0200)]
Merge pull request #1414 from nextcloud/fix-double-slashes
Fix double slashes
Dominique Fuchs [Thu, 12 Sep 2019 18:59:03 +0000 (20:59 +0200)]
fix naming for slide navigation, adapted everywhere to be consistent
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Thu, 12 Sep 2019 18:53:40 +0000 (20:53 +0200)]
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>
Dominique Fuchs [Thu, 12 Sep 2019 15:56:30 +0000 (17:56 +0200)]
Merge branch 'bugfixing-slideshow' of https://github.com/nextcloud/desktop into bugfixing-slideshow
Dominique Fuchs [Thu, 12 Sep 2019 15:52:31 +0000 (17:52 +0200)]
Fixed wrong resource paths
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Thu, 12 Sep 2019 15:09:26 +0000 (17:09 +0200)]
Merge branch 'master' into bugfixing-slideshow
Dominique Fuchs [Thu, 12 Sep 2019 14:43:54 +0000 (16:43 +0200)]
Merge branch 'bugfixing-slideshow' of https://github.com/nextcloud/desktop into bugfixing-slideshow
Dominique Fuchs [Thu, 12 Sep 2019 14:43:24 +0000 (16:43 +0200)]
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>
Michael Schuster [Thu, 12 Sep 2019 03:09:21 +0000 (05:09 +0200)]
Merge branch 'master' into fix-double-slashes
Nextcloud bot [Thu, 12 Sep 2019 02:55:19 +0000 (02:55 +0000)]
[tx-robot] updated from transifex
Dominique Fuchs [Wed, 11 Sep 2019 20:56:34 +0000 (22:56 +0200)]
Merge branch 'master' into ivan/remote-size-retrieved-race-condition
Dominique Fuchs [Wed, 11 Sep 2019 20:17:57 +0000 (22:17 +0200)]
Merge branch 'master' into bugfixing-slideshow
Michael Schuster [Wed, 11 Sep 2019 15:31:16 +0000 (17:31 +0200)]
fix comment typo
Signed-off-by: Michael Schuster <michael@schuster.ms>
Nextcloud bot [Wed, 11 Sep 2019 03:05:21 +0000 (03:05 +0000)]
[tx-robot] updated from transifex
Dominique Fuchs [Tue, 10 Sep 2019 14:15:43 +0000 (16:15 +0200)]
Merge pull request #916 from nextcloud/icons
Remove outdated (and unused) icons
Dominique Fuchs [Tue, 10 Sep 2019 12:36:40 +0000 (14:36 +0200)]
Merge branch 'master' into icons
Dominique Fuchs [Tue, 10 Sep 2019 12:31:30 +0000 (14:31 +0200)]
Merge pull request #719 from tuxmaster5000/owncloud
Rename owncloud tests to nextcloud
Dominique Fuchs [Tue, 10 Sep 2019 11:11:02 +0000 (13:11 +0200)]
Merge branch 'master' into owncloud
Dominique Fuchs [Tue, 10 Sep 2019 09:38:59 +0000 (11:38 +0200)]
Merge pull request #1039 from javierllorente/master
Add sync date next to "Synchronized with local folder"
Dominique Fuchs [Tue, 10 Sep 2019 09:03:39 +0000 (11:03 +0200)]
Merge branch 'master' into owncloud
Dominique Fuchs [Tue, 10 Sep 2019 08:17:37 +0000 (10:17 +0200)]
Merge branch 'master' into master
Dominique Fuchs [Tue, 10 Sep 2019 07:46:24 +0000 (09:46 +0200)]
Merge pull request #1231 from Zottel92/issue1216/IgnoreEmacsRecoveryFiles
issue1216: added sync-exclude entry for emacs recovery files
Dominique Fuchs [Tue, 10 Sep 2019 07:02:55 +0000 (09:02 +0200)]
Merge branch 'master' into issue1216/IgnoreEmacsRecoveryFiles
Nextcloud bot [Tue, 10 Sep 2019 03:06:52 +0000 (03:06 +0000)]
[tx-robot] updated from transifex
Dominique Fuchs [Mon, 9 Sep 2019 19:46:39 +0000 (21:46 +0200)]
Merge branch 'master' into issue1216/IgnoreEmacsRecoveryFiles
Dominique Fuchs [Mon, 9 Sep 2019 18:16:52 +0000 (20:16 +0200)]
Merge branch 'master' into msvc-warn-audit
Dominique Fuchs [Mon, 9 Sep 2019 18:06:32 +0000 (20:06 +0200)]
fixed wrongly assigned pointer, didn't recognize class
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Mon, 9 Sep 2019 17:35:30 +0000 (19:35 +0200)]
Use -Wno-gnu-zero-variadic-macro-arguments only for Clang
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Mon, 9 Sep 2019 17:14:19 +0000 (19:14 +0200)]
Q_UNUSED for atm unused parameters
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Mon, 9 Sep 2019 17:09:38 +0000 (19:09 +0200)]
Declared Q_UNUSED for as-of-now unused parameters.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Mon, 9 Sep 2019 16:52:36 +0000 (18:52 +0200)]
Prevented warning regarding operator precedence - enhanced clarity by adding parentheses
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Mon, 9 Sep 2019 16:46:25 +0000 (18:46 +0200)]
removed reduntant /* within a comment
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Mon, 9 Sep 2019 16:44:29 +0000 (18:44 +0200)]
Remove unnecessary argument
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Mon, 9 Sep 2019 16:40:23 +0000 (18:40 +0200)]
Prevent use of uninitialized folder pointer.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Mon, 9 Sep 2019 16:22:48 +0000 (18:22 +0200)]
Added forgotten case when parsing log through gui. LockedFiles were not communicated.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Mon, 9 Sep 2019 16:16:44 +0000 (18:16 +0200)]
initialize _modtime to prevent undefined usage
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Mon, 9 Sep 2019 16:06:29 +0000 (18:06 +0200)]
Use return type to prevent warning and determine chown success. Added TODO
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Mon, 9 Sep 2019 11:46:46 +0000 (13:46 +0200)]
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>
Nextcloud bot [Mon, 9 Sep 2019 03:06:29 +0000 (03:06 +0000)]
[tx-robot] updated from transifex
Dominique Fuchs [Sun, 8 Sep 2019 18:00:48 +0000 (20:00 +0200)]
Merge branch 'master' into msvc-warn-audit
Dominique Fuchs [Sun, 8 Sep 2019 17:46:08 +0000 (19:46 +0200)]
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>
Dominique Fuchs [Sun, 8 Sep 2019 17:37:56 +0000 (19:37 +0200)]
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>
Dominique Fuchs [Sun, 8 Sep 2019 17:22:40 +0000 (19:22 +0200)]
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>
Dominique Fuchs [Sun, 8 Sep 2019 17:17:00 +0000 (19:17 +0200)]
Further testing of cond. include of Qt library > 5.9. Utilized different macro.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 16:51:54 +0000 (18:51 +0200)]
Fixed another logic error -> logical to bitwise OR for QTLEGACY
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 16:42:40 +0000 (18:42 +0200)]
Fixed logic error in QTLEGACY macro and added forgottin #if clause for header file
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 15:33:34 +0000 (17:33 +0200)]
Added macro definition and compile-time condition to support Qt < 5.9
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 14:22:08 +0000 (16:22 +0200)]
Indeed, DWORD is a special snowflake - only when on _WIN32
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 14:09:58 +0000 (16:09 +0200)]
Fixed wrongly formatted args for win32 linker flags resulting in 'unrecognized option' for all of them. Remark: /WL is for VS only, useless (and not necessary for msvc cmd)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 13:49:53 +0000 (15:49 +0200)]
Fixed missing braces
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 13:40:49 +0000 (15:40 +0200)]
Qt: Fixed numerous deprecated calls by adapting newer ones
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 12:47:35 +0000 (14:47 +0200)]
Added cmake preprocessor definitions when using msvc regarding the 'safe' versions of CRT functions
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 11:44:00 +0000 (13:44 +0200)]
Use existing fct for RegKeyQuery instead of redundant subroutine
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 09:33:20 +0000 (11:33 +0200)]
Numoerous safe conversions implemented. Added additional Utility::convertSizeToDWORD for windows builds.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 08:21:59 +0000 (10:21 +0200)]
Corrected namespace when calling convertSizetoUint
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Nextcloud bot [Sun, 8 Sep 2019 03:10:00 +0000 (03:10 +0000)]
[tx-robot] updated from transifex
Dominique Fuchs [Sun, 8 Sep 2019 00:20:24 +0000 (02:20 +0200)]
Renamed conversion function to make intention more clear. Also defaulted to 'controlled truncation' to not stupidly crash. TBD/TODO: Better handling for such things.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 00:07:52 +0000 (02:07 +0200)]
Selectively and temporary disabled warning about unknown preprocessor declarative for msvc when using specific GCC instruction.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sun, 8 Sep 2019 00:04:50 +0000 (02:04 +0200)]
Implemented Utility::convert function to convert size_t -> uint safely and on the fly. Often necessary for Qt and WIN32 functions. Using this will not generate compiler warnings of possible truncation. First call implemented in ownsql.cpp
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sat, 7 Sep 2019 23:09:22 +0000 (01:09 +0200)]
Fixed broken overloading mechanism of variadic templates. See code comment for further information.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sat, 7 Sep 2019 19:42:10 +0000 (21:42 +0200)]
usage of UINT as iterator here because comparing with UINT retval from DragQueryFile
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sat, 7 Sep 2019 19:28:12 +0000 (21:28 +0200)]
Removed redundant (and wrong in terms of it's value) definitions for WINVER/_WIN32_WINNT
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sat, 7 Sep 2019 19:26:40 +0000 (21:26 +0200)]
Removed redundant (and wrong in terms of it's value) definitions for WINVER/_WIN32_WINNT
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sat, 7 Sep 2019 18:58:20 +0000 (20:58 +0200)]
Removed redundant (and wrong in terms of it's value) definitions for WINVER/_WIN32_WINNT
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sat, 7 Sep 2019 18:55:49 +0000 (20:55 +0200)]
Updated WINVER/_WIN32_WINNT from 0x0600 to 0x0601 (e.g. Server 2008/Vista to 7) as 7 is reasonable and noted everywhere as requirement
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Sat, 7 Sep 2019 17:41:35 +0000 (19:41 +0200)]
Merge remote-tracking branch 'upstream/master'
Nextcloud bot [Sat, 7 Sep 2019 03:06:08 +0000 (03:06 +0000)]
[tx-robot] updated from transifex
Michael Schuster [Sat, 7 Sep 2019 02:18:07 +0000 (04:18 +0200)]
Fix double slashes in WebDAV URLs (account setup wizard)
Sanitize URL paths to elaminate double-slashes in the URL path string,
used for the first connection by the account setup wizard.
Example: https://cloud.example.com/remote.php/webdav//
Signed-off-by: Michael Schuster <michael@schuster.ms>
Michael Schuster [Sat, 7 Sep 2019 01:30:47 +0000 (03:30 +0200)]
Merge branch 'master' of https://github.com/nextcloud/desktop
Michael Schuster [Sat, 7 Sep 2019 00:00:49 +0000 (02:00 +0200)]
Replace old NSI Windows setup wizard graphics
New UI resources based on current https://github.com/nextcloud/promo
New:
- Icon based on https://github.com/nextcloud/desktop/pull/1401
- Wizard image & header image (dotted background replaces old cloud background)
Signed-off-by: Michael Schuster <michael@schuster.ms>
Dominique Fuchs [Fri, 6 Sep 2019 19:00:37 +0000 (21:00 +0200)]
Merge remote-tracking branch 'upstream/master'
Dominique Fuchs [Fri, 6 Sep 2019 18:43:51 +0000 (20:43 +0200)]
Merge branch 'master' of https://github.com/DominiqueFuchs/desktop
Camila San [Fri, 6 Sep 2019 16:20:52 +0000 (18:20 +0200)]
Bump master version to 2.7.
Signed-off-by: Camila San <hello@camila.codes>
Michael Schuster [Fri, 6 Sep 2019 15:57:52 +0000 (17:57 +0200)]
Merge branch 'master' of https://github.com/nextcloud/desktop
Camila Ayres [Fri, 6 Sep 2019 15:56:09 +0000 (17:56 +0200)]
Merge pull request #1408 from nextcloud/flow2-ui-qt5-compat
Qt5.5 compatiblity patch for login flow V2 + UI improvement
Camila Ayres [Fri, 6 Sep 2019 15:32:40 +0000 (17:32 +0200)]
Merge branch 'master' into flow2-ui-qt5-compat
Camila Ayres [Fri, 6 Sep 2019 15:22:10 +0000 (17:22 +0200)]
Merge pull request #1405 from DominiqueFuchs/w10-start-logo
Full-Scaled new logo in Windows 10 start menu tile