1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-25 10:42:46 +01:00
Commit Graph

14618 Commits

Author SHA1 Message Date
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
Michael Schuster
267224b258
Merge branch 'master' into webflow-client-ssl-ca-chain 2019-08-30 05:38:07 +02:00
Michael Schuster
61884d1ada
fix indents, add comment
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-30 05:35:36 +02:00
Nextcloud bot
29ff9f403e
[tx-robot] updated from transifex 2019-08-30 03:06:24 +00:00
Michael Schuster
b52292db92
Windows: Workaround for CredWriteW used by QtKeychain
Saving all client CA's within one credential may result in:
  Error: "Credential size exceeds maximum size of 2560"

Client CA certificates are now being stored in separate slots
within the keychain and are being processed by a queue mechanism.

IMPORTANT TODO:
forgetSensitiveData(): Invoked by "Log out" & "Remove account"

- Remove client CA certs and KEY!
  (uncomment "//deleteKeychainEntries();" )

  Disabled as long as selecting another cert is not supported by the UI.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-30 04:56:01 +02:00
Nextcloud bot
57d0a17744
[tx-robot] updated from transifex 2019-08-29 03:03:24 +00:00
Roeland Jago Douma
85a2860e86
Merge pull request #1389 from nextcloud/webflow-client-ssl
Adds SSL client cert storage to webflow + Login Flow v2
2019-08-28 07:40:39 +02:00
Nextcloud bot
7fc95c4c52
[tx-robot] updated from transifex 2019-08-28 03:10:20 +00:00
Michael Schuster
2c4336ab2a
Merge branch 'master' into webflow-client-ssl 2019-08-28 00:30:36 +02:00
Roeland Jago Douma
d584bedcb6
Also store the CACertificates of the client side certificate
Else authentication will still fail in setups that have a chain of
certificates supplied.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-27 09:55:41 +02:00
Nextcloud bot
5c34f9e247
[tx-robot] updated from transifex 2019-08-27 03:04:46 +00:00
Michael Schuster
dbde585049
Adds SSL client cert storage to webflow + Login Flow v2
The previous commit 50cd6af394 - Build a webflowcredentials
changed:

src/gui/wizard/flow2authcredspage.cpp in line 135 to use WebFlowCredentials
instead of HttpCredentials.
But the WebFlowCredentials class didn't include code to store and load SSL client
certificates and keys from the keychain.

This commit migrates the useful stuff from the old HttpCredentials class
into WebFlowCredentials.

Successfully tested on Windows. Please test on other systems and verify it's safe! :)

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-27 03:32:21 +02:00
Michael Schuster
18404a128b
Merge pull request #1384 from nextcloud/login-flow-v2
Login flow v2
2019-08-26 21:48:40 +02:00
Roeland Jago Douma
302ca0e04e
Fix some compiler warnings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-26 20:41:14 +02:00
Roeland Jago Douma
50cd6af394
Build a webflowcredentials
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-26 20:04:23 +02:00
Michael Schuster
fd8345ccbe
Login Flow V2: adds re-auth upon logout, improvements
- Implements re-auth upon logout -> login
- Improves UI and security

TODO:
- SSL: Client certificate login is possible at the first time only but missing after relaunch

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Michael Schuster
7add98e9a3
UI: don't let Flow2 and OAuth hide the wizard
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Michael Schuster
aa93a04fd6
fix comment typo in httpcredentials.cpp
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Michael Schuster
628bab92c4
fix comment typo in webflowcredentials.cpp
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Michael Schuster
12f2ea6728
Login Flow V2: remove static test url
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Michael Schuster
8fa55b97b4
Login Flow V2: 1st implementation, cleanup
This is the first draft of the Login Flow V2 authorization method.

See: https://docs.nextcloud.com/server/latest/developer_manual/client_apis/LoginFlow/index.html#login-flow-v2

- Adds the Login Fĺow V2 auth method
- Adds ability to reinitiate a new request via UI

TODO:
- Implement re-auth upon logout -> login
- Improve UI
- SSL: Client certificate login is possible at the first time only but missing after relaunch

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Michael Schuster
2742411abd
Login Flow V2: 1st test-implementation
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Nextcloud bot
9941d49579
[tx-robot] updated from transifex 2019-08-26 03:00:53 +00:00
Nextcloud bot
93f6bb2740
[tx-robot] updated from transifex 2019-08-25 03:03:22 +00:00
Nextcloud bot
95c6dd32e9
[tx-robot] updated from transifex 2019-08-24 03:03:25 +00:00
Nextcloud bot
c5f8b00a6b
[tx-robot] updated from transifex 2019-08-21 03:04:55 +00:00
Nextcloud bot
7135d441e6
[tx-robot] updated from transifex 2019-08-20 03:04:04 +00:00
Roeland Jago Douma
e0a1d78441
Merge pull request #1225 from edent/patch-1
Typo
2019-08-19 15:39:10 +02:00
Nextcloud bot
eb31925a00
[tx-robot] updated from transifex 2019-08-18 03:08:13 +00:00
Nextcloud bot
6f4de8f503
[tx-robot] updated from transifex 2019-08-17 03:06:09 +00:00
Nextcloud bot
db83302546
[tx-robot] updated from transifex 2019-08-16 03:01:55 +00:00