chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 02:53:40 +02:00
Code Activity
17,398 Commits 4 Branches 173 Tags
master
Commit Graph
17398 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Camila Ayres 9ab5241459 Merge branch 'master' into w10-start-logo 2019-09-06 16:03:54 +02:00
Camila Ayres ec603b061d Merge branch 'master' into logo-update 2019-09-06 15:42:02 +02:00
Michael Schuster b792a627e2 Qt5.5 compatiblity patch for login flow V2 + UI improvment 
Removes the right-click function for the "Re-open browser" buttons because
they are not intuitive for the user.

Adds a dedicated "Copy link" button.

Implements Qt 5.5 fixes based on: https://github.com/nextcloud/desktop/pull/1392

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-09-06 14:40:54 +02:00
Michael Schuster 0e8c6a176b Merge branch 'master' of https://github.com/nextcloud/desktop 2019-09-06 14:39:10 +02:00
Camila Ayres 0353724472 Merge pull request #1374 from Ram-Z/per-directory-ignore 
Read .sync_exclude.lst in each subdirectory
 2019-09-06 14:20:34 +02:00
Martin Sucha bbb295fea4 Use newer digest algorithms in TLS error dialog 
MD5 has been broken for a long time now and SHA1 has been
deprecated as well. SHA1 is not used when issuing new
publicly trusted certificates since 1 January 2016[1] and
there are more and more effective attacks[2][3] against it,
so display SHA1 fingerprint only for old certificates
to encourage use of safer digests by users.

So, we display SHA-256 and SHA-512 fingerprints instead in
the common case.

[1] https://cabforum.org/wp-content/uploads/CA-Browser-Forum-BR-1.6.5.pdf
[2] https://shattered.io/static/shattered.pdf
[3] https://eprint.iacr.org/2019/459.pdf

Signed-off-by: Martin Sucha <git@mm.ms47.eu>
 2019-09-06 14:07:07 +02:00
Camila Ayres d36ddb752a Merge branch 'master' into per-directory-ignore 2019-09-06 13:35:28 +02:00
Dominique Fuchs 680f70aa1a Merge branch 'master' into w10-start-logo 2019-09-06 09:30:12 +02:00
Dominique Fuchs 4ea64bf9ee Final commit to resolve #22 (at least in desktop repo, final bits have to be set in client-building). 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-06 09:24:06 +02:00
Dominique Fuchs c1dd0079d9 Modified CMakeLists (src/gui/) to install VisualElements logo files in appropiate install output folder 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-06 08:35:46 +02:00
Dominique Fuchs f33d0a322d Renamed files for consistent sheme & use in CMakeLists (/src/gui) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-06 08:23:48 +02:00
Dominique Fuchs 429c9afd60 Added files for start menu icon (70 & 150px) on Windows 10 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-06 07:44:49 +02:00
Nextcloud bot a6653af440 [tx-robot] updated from transifex 2019-09-06 03:03:36 +00:00
Dominique Fuchs abb2711d26 Merge branch 'master' into logo-update 2019-09-05 21:38:17 +02:00
Dominique Fuchs 0a5ba5a3c7 Merge pull request #1402 from DominiqueFuchs/gitignore 
Updated .gitignore to integrate unwanted files when working with VSC …
 2019-09-05 20:44:43 +02:00
Dominique Fuchs 0a643c06e7 Merge branch 'master' into gitignore 2019-09-05 20:31:23 +02:00
Dominique Fuchs 6f5dcfa78b Complementary renaming in theme.qrc 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-05 19:59:49 +02:00
Dominique Fuchs e2f7947966 Check for possible case failure when building on drone 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-05 19:52:03 +02:00
Dominique Fuchs 4b9e8274b5 Merge branch 'logo-update' of https://github.com/DominiqueFuchs/desktop into logo-update 2019-09-05 20:59:34 +02:00
Dominique Fuchs 7aefa5afaf Updated CmakeLists for gui part to correct old variable (OUTFILE_BASE[NAME]) that changed by recent update of AddAppIcon modules. Fixes wrong naming of resource pack in build output. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-05 20:58:05 +02:00
John Molakvoæ 1606cf2e09 Use newer digest algorithms in TLS error dialog (#1404) 
Use newer digest algorithms in TLS error dialog
 2019-09-05 07:12:36 +02:00
Dominique Fuchs 464cdabecf Merge branch 'master' into gitignore 2019-09-05 07:00:13 +02:00
Dominique Fuchs defa0b2781 Merge branch 'master' into logo-update 2019-09-05 06:59:34 +02:00
John Molakvoæ acd2425250 Merge branch 'master' into ssl-error-digests 2019-09-05 06:44:19 +02:00
Nextcloud bot aa37a67729 [tx-robot] updated from transifex 2019-09-05 03:09:38 +00:00
Michael Schuster 1b2e64788d Merge branch 'master' into ssl-error-digests 2019-09-05 01:07:20 +02:00
Roeland Jago Douma b8ef78205a Merge pull request #1256 from meskobalazs/master 
Marking unused strings as unstranslatable
 2019-09-04 23:06:08 +02:00
Martin Sucha 3e6422a889 Use newer digest algorithms in TLS error dialog 
MD5 has been broken for a long time now and SHA1 has been
deprecated as well. SHA1 is not used when issuing new
publicly trusted certificates since 1 January 2016[1] and
there are more and more effective attacks[2][3] against it,
so display SHA1 fingerprint only for old certificates
to encourage use of safer digests by users.

So, we display SHA-256 and SHA-512 fingerprints instead in
the common case.

[1] https://cabforum.org/wp-content/uploads/CA-Browser-Forum-BR-1.6.5.pdf
[2] https://shattered.io/static/shattered.pdf
[3] https://eprint.iacr.org/2019/459.pdf

Signed-off-by: Martin Sucha <git@mm.ms47.eu>
 2019-09-04 22:06:12 +02:00
Michael Schuster 0bcc923a8a Merge branch 'master' into gitignore 2019-09-04 21:12:48 +02:00
Roeland Jago Douma 0cb1f4d14b Merge pull request #1394 from nextcloud/webflow-client-ssl-ca-chain 
Windows: Workaround for CredWriteW used by QtKeychain
 2019-09-04 20:04:45 +02:00
Dominique Fuchs 7ac6df24a3 Updated ECMAddAppIcon to newest ver fromhttps://github.com/KDE/extra-cmake-modules/blob/master/modules/ECMAddAppIcon.cmake with modifications for nc workflow (incl. png2imagemagick) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-04 16:51:16 +02:00
Michael Schuster 5ef9600007 Merge branch 'master' into webflow-client-ssl-ca-chain 2019-09-04 12:56:22 +02:00
Nextcloud bot fcc84b6dc4 [tx-robot] updated from transifex 2019-09-04 03:07:24 +00:00
Dominique Fuchs 88dcbad790 Updated theme.qrc to include new icon logo files 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-03 19:38:01 +02:00
Dominique Fuchs 7e4323c7de Revert-corrected naming of icon files due to limitations by ECMAddAppIcon 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-03 18:27:37 +02:00
Dominique Fuchs af831a7653 updated resources for new logo icon files 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-03 18:17:46 +02:00
Dominique Fuchs 8bd85fa71d Corrected sized icon versions to up2date windows guidelines (see also ECMAddAppIcon.cmake) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-03 18:05:06 +02:00
Dominique Fuchs 9d225452bd Updated svg version of nc icon 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-03 18:00:51 +02:00
Dominique Fuchs b79a82cc3f Updated AddAppIconMacro (esp. for new macOS retina guidelines) and corrected filenames to not change pattern in cmake scripts 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-03 17:54:22 +02:00
Dominique Fuchs 0380271499 Updated cmake module to current version (esp. worthy for newer windows versions reg. the sizes) in https://github.com/KDE/extra-cmake-modules/blob/master/modules/ECMAddAppIcon.cmake 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-03 17:25:05 +02:00
Dominique Fuchs 2e243e5a38 deleted old icon files (not sidebar logo files atm) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-03 17:19:20 +02:00
Dominique Fuchs e56b1a082b Updated .gitignore to integrate unwanted files when working with VSC or VS2019 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-03 10:59:21 +02:00
Dominique Fuchs c389985c2e Merge remote-tracking branch 'upstream/master' 2019-09-03 10:53:43 +02:00
Dominique Fuchs ef9c092662 Added png export series of new logo based on svg material in promo branch. 
Decided for new naming sheme too keep old variants in repo untill all changes (also in helper repos like client-building) are done.

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-03 09:42:52 +02:00
Nextcloud bot 86f559add4 [tx-robot] updated from transifex 2019-09-03 03:04:22 +00:00
Dominique Fuchs 5bcff7dab6 Merge branch 'master' into master 2019-09-02 06:56:30 +02:00
Nextcloud bot 812e688572 [tx-robot] updated from transifex 2019-09-02 03:03:47 +00:00
Dominique Fuchs 8f3bf3313e Integrated registry check on windows when hasDarkSystray is called. 
Return value determines which theme is applied for monochrome variant.
Fixes #1276 but only when monochrome option is toggled or nc starts, not automatically when changing windows theme.

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-01 22:13:14 +02:00
Nextcloud bot 87bf0d9a7e [tx-robot] updated from transifex 2019-09-01 03:09:08 +00:00
Nextcloud bot bb9140d075 [tx-robot] updated from transifex 2019-08-31 03:03:58 +00:00