István Váradi
7e210cfcb3
Merge branch 'master' of github.com:nextcloud/client
2018-05-06 10:24:21 +02:00
István Váradi
fee2872a98
Added build dependency on qt5webengine-dev
2018-05-06 09:53:49 +02:00
Roeland Jago Douma
880f256a62
Merge pull request #278 from ivaradi/master
...
Fix Debian build
2018-05-03 22:20:44 +02:00
István Váradi
7827fe4151
Fix Debian build
2018-05-03 19:02:49 +02:00
Roeland Jago Douma
e40bddb2c2
Merge pull request #276 from nextcloud/no_debian
...
Build no debian while it fails
2018-05-03 14:38:38 +02:00
Roeland Jago Douma
ed3a723ad2
Build no debian while it fails
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-03 14:28:11 +02:00
Roeland Jago Douma
889c930b36
Merge pull request #75 from nextcloud/new_flow
...
Add weblogin flow for NC > 12
2018-05-03 14:07:44 +02:00
Roeland Jago Douma
56e17c25b2
Change loading bar to NC blue
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-03 13:55:27 +02:00
Roeland Jago Douma
ef2d113930
Mark credentials as valid if there is no error
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
35e8d0437d
Address comments
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
6809f12e68
Allow the user to sign in again
...
If the user is signed out (for whatever reason). Show a popup
with the loginflow again.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
ac1664b525
Actually use webflow credentails
...
* Detect invalid auth (if the users token is removed for example)
* Properly store and fetch from keychain
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
6b43d80c01
Start with persisting credentials
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
356f9b4831
Actually connect properly to server
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
715c738ebf
Add urlschema handler so w can catch the nc:// urls
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
c763a6e7fb
Show webview with page
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
c4a88fe57e
Add QWebView as a dependency
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Camila Ayres
9338dadaab
Merge pull request #265 from k1l1/log_files_path
...
Put log files somewhere else #221 (name conflict)
2018-05-02 15:30:34 +02:00
Kilian Pfeiffer
56c1d79c49
fixes windows crash / renaming changed
2018-04-30 16:09:04 +02:00
Camila Ayres
64cbc88474
Merge pull request #251 from nextcloud/clientSideEncryptionV4
...
Client side encryption v4.
2018-04-26 19:56:55 +02:00
Kilian Pfeiffer
cd926e5b84
resolving name conflict in logfiles
2018-04-24 15:47:23 +02:00
Morris Jobke
a41546834e
Merge pull request #262 from nextcloud/update-transifex-config
...
Update transifex config and move it to a proper place
2018-04-23 19:59:41 +02:00
Morris Jobke
3a763f4d9c
Update transifex config and move it to a proper place
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-23 15:45:34 +02:00
Roeland Jago Douma
81ae682e87
Revert "Make different program so it doesn't mess with existing config"
...
This reverts commit c04d1f1f69
.
2018-04-22 21:04:37 +02:00
Roeland Jago Douma
75609c1b2c
Merge pull request #254 from ad1rie1/FIX32BitApplication
...
Fix #6394
2018-04-22 20:57:36 +02:00
Camila Ayres
25b40cc852
Merge pull request #255 from ad1rie1/FixDeprecatedTR
...
Fix Use of Deprecated trUtf8.
2018-04-20 11:11:05 +02:00
Adrien
8e52f1237b
Fix Use of Deprecated trUtf8
2018-04-19 12:02:26 +02:00
Julius Härtl
00336bd71d
Merge pull request #253 from k1l1/log_files_path
...
Put log files somewhere else #221
2018-04-19 11:43:29 +02:00
Adrien
5f0a021c04
Fix #6394
2018-04-19 11:35:03 +02:00
Kilian Pfeiffer
40b1f051a4
log files are visible now
2018-04-17 17:59:03 +02:00
Kilian Pfeiffer
faf64958ec
changed paths of logfiles
2018-04-17 15:54:05 +02:00
Tomaz Canabrava
7432d6a814
Merge branch 'master' into clientSideEncryptionV4
2018-04-10 16:18:58 +02:00
Daniel Nicoletti
16aa54ed64
Do not create new db entries when the remote tree does not have proper values
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
3e05bd1da0
Do not detach encrypted files vector
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
3eb3535d0f
Fix downloading NEW encrypted files
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
defe2d7631
Fix matching encrypted data for downloading
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
b12066f1aa
Properly remove encryption data from JSON of deleted file
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
a9208f6581
Remove unused encrypted property
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
6e63a538b7
Make sure bool _currentLockingInProgress is first defined to false
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
a7a8de8787
Fix matching encrypted file for download
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d93f7269b8
Properly mark encrypted files for removal
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d3b6aacf3f
Fix merging remote and local trees when e2e files are involved
...
When populating the tree from the filesystem we need to fill
the e2eMangledName from DB and we when trying to find another
match on the oposite tree we need to take in account that names
don't match and search with the mangled name information
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
c0ef36b8fa
Use QUuid to generate random names
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
60fc5d6dd4
Fix upload of existing encrypted files by matching only filename
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d5ab642e46
Fix sync status running when encryption data is missing
...
When a file on the server of an encrypted folder do
not have a matching entry on the JSON metadata, we
need to report an error and be done with the job
so that Sync status is not "running".
This eventually should cause the file to be removed
from the server as it can not be recovered anymore.
2018-04-09 13:23:52 +02:00
Tomaz Canabrava
b4b3e422de
Handle gracefully failures in file decryption
2018-03-27 09:18:54 +02:00
Tomaz Canabrava
ed6f56257e
Dont use new with QFiles.
2018-03-26 22:18:07 +02:00
Tomaz Canabrava
461aeca200
Do not crash when failing to decrypt the metadata
2018-03-26 22:02:46 +02:00
Tomaz Canabrava
6c88367ac6
Do not crash if there was an error encrypting the file.
2018-03-26 21:44:46 +02:00
Tomaz Canabrava
5fe9717598
Potentially fix crash acessing a deleted pointer.
2018-03-26 21:37:13 +02:00