rockihack
1b2a8ba6b0
Enable stack-protector-strong on Windows and macOS.
...
(cherry picked from commit 586fd346ea
2017-12-13 11:28:22 +01:00
rockihack
8a963a67f2
stack-protector is not supported on hppa.
2017-12-13 11:27:48 +01:00
rockihack
586fd346ea
Enable stack-protector-strong on Windows and macOS.
2017-12-13 11:27:48 +01:00
Christian Kamm
e5ed8fc90a
Merge remote-tracking branch 'origin/2.4'
2017-12-13 11:03:24 +01:00
Markus Goetz
75676f8830
Notifications: Propagate "Dismiss" as DELETE to server #5922
...
(cherry picked from commit e86416fff7
2017-12-13 11:00:40 +01:00
Jenkins for ownCloud
530853c988
[tx-robot] updated from transifex
2017-12-13 02:18:36 +01:00
Tomaz Canabrava
9916583ffa
[CSE] More verbose output
2017-12-12 21:50:30 +01:00
Roeland Jago Douma
25734afd39
First base64 decode
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-12 21:42:37 +01:00
Tomaz Canabrava
ea3558faf6
[CSE] Fix strings
2017-12-12 21:29:06 +01:00
Tomaz Canabrava
159c0e138f
[CSE] Add a DecryptAsync method
...
Also, cleanup a bit of the old calls. One particular difference
is that I used to set padding to 1 and it should actually be
PKCS1_OAEP_PADDING
2017-12-12 21:23:02 +01:00
Tomaz Canabrava
aca298ca64
[CSE] Be explicit that async encryption uses publicKey
2017-12-12 20:14:31 +01:00
Tomaz Canabrava
2127b2629d
[CSE] Move encryption related network jobs to its own file
...
Move encryption related network jobs to it's own file,
the original file was starting to be just way too big.
2017-12-12 19:36:47 +01:00
István Váradi
c26d986dbf
New repository directory name
2017-12-12 17:27:01 +01:00
István Váradi
e55518f820
Fixed IV variable reference
2017-12-12 17:22:29 +01:00
István Váradi
44854beefb
Further script and file path renaming
2017-12-12 17:17:23 +01:00
István Váradi
7e41a811dd
Fix of script path
2017-12-12 17:14:49 +01:00
István Váradi
d2e159c385
Automatic building of Ubuntu/Debian packages
2017-12-12 17:11:46 +01:00
Tomaz Canabrava
f6f078d1ee
[CSE] Rename Variable
2017-12-12 16:15:05 +01:00
Tomaz Canabrava
ce37235cc4
[CSE] Retrieve the Private Key from the KeyChain
...
This fixes one thing and exposes a bug.
the MetadataKeys are not being correctly unencrypted.
2017-12-12 16:09:49 +01:00
Tomaz Canabrava
0a58ea76e5
[CSE] Start the work with an existing metadata
2017-12-12 15:35:53 +01:00
Olivier Goffart
02283fc686
Merge pull request #6224 from owncloud/deprecated
...
Remove use of deprecated Qt API
2017-12-12 11:48:04 +01:00
Tomaz Canabrava
e6f835d138
[CSE] Unlock the folder after a lock
...
This makes sure the folder will be unlocked for next tests
2017-12-12 11:26:54 +01:00
Tomaz Canabrava
33b1fcfe66
Merge branch 'master' into clientSideEncryptionV3
2017-12-12 10:46:43 +01:00
Christian Kamm
dcf0baa9de
Journal: 64bit inodes, fix storing uint64s generally
...
In addition to using the right function when retrieving inodes this
*also* fixes a more general bug ownsql had with storing uint64 values
that didn't fit into an int64.
2017-12-12 10:30:54 +01:00
Martin
cd2057fc04
Update Overlay Icon naming
2017-12-12 10:18:00 +01:00
Jenkins for ownCloud
3e294d5339
[tx-robot] updated from transifex
2017-12-12 02:18:35 +01:00
Olivier Goffart
bae00358b9
Merge pull request #6219 from owncloud/config
...
Move config and remove most dependencies form the sync engine.
2017-12-11 17:10:18 +01:00
Jenkins for ownCloud
36573a5c6f
[tx-robot] updated from transifex
2017-12-11 02:18:33 +01:00
Jenkins for ownCloud
9a835af7ce
[tx-robot] updated from transifex
2017-12-10 02:18:34 +01:00
Jenkins for ownCloud
ca48ff793c
[tx-robot] updated from transifex
2017-12-09 02:18:34 +01:00
Olivier Goffart
58e8a25869
Enable deprecated warnings
2017-12-08 16:16:06 +01:00
Olivier Goffart
d517d92f6c
FolderWizard: don't use deprecated API
2017-12-08 16:16:06 +01:00
Olivier Goffart
71dcf7fc37
SSLButton: Removes some call to deprecated functions
2017-12-08 16:16:02 +01:00
Olivier Goffart
0a59faf03d
OcsJob: Use QUrlQuery
...
Qurl::setEncodedQueryItems is deprecated.
2017-12-08 16:15:48 +01:00
Olivier Goffart
7bd48b1327
cmd: remove usage of deprecated qInstallMsgHandler
2017-12-08 16:15:48 +01:00
Olivier Goffart
8c652e061d
Remove uses of deprecated QString::fromAscii
2017-12-08 16:15:48 +01:00
Olivier Goffart
a4816d6a8c
Updater: use QUrlQuery
...
QUrl::addQueryItem is deprecated
2017-12-08 16:15:47 +01:00
Olivier Goffart
1a503d54f6
Remove usage of deprecated qSort
2017-12-08 16:15:47 +01:00
Olivier Goffart
263668b1cb
Remove use of deprecated translate call
2017-12-08 16:15:38 +01:00
Olivier Goffart
3df65460f5
Remove usage of QString::null
...
Replaces by "QString()"
2017-12-08 16:15:22 +01:00
Olivier Goffart
74672d493d
Utility: use QUrlQuery
...
For QUrl::setQuery is deprecated in Qt5
2017-12-08 16:15:17 +01:00
Tomaz Canabrava
0a83d3e743
[CSE] Fix reading the public key for the metadata
...
This broke when we started to use QSslKey and the Qt Keychain
framework.
2017-12-08 11:24:22 +01:00
Tomaz Canabrava
a08a32ceca
[CSE] Fetch the metadata for the upload.
2017-12-08 10:32:05 +01:00
Tomaz Canabrava
6745777ca3
[CSE] Save folder id and token for the lock
...
So we can unlock it later. - perhaps we should store this
on the disk or something, to make it harder to lose.
2017-12-08 10:19:56 +01:00
Olivier Goffart
f1b7d506ae
csync_exclude: fix compilation of non-test builds
2017-12-08 09:43:26 +01:00
Jenkins for ownCloud
fc8c88be41
[tx-robot] updated from transifex
2017-12-08 02:18:35 +01:00
Tomaz Canabrava
70d562668c
[CSE] Add handling for side-by-side uploads.
2017-12-07 21:51:42 +01:00
Tomaz Canabrava
ccd8cff4db
[CSE] Try to lock repeteadly the folder if needed.
...
The upload is made in an event loop with more than one
upload at the same time, this confuses the hell out of the
folder locking mechanism.
We need to lock the folder and ask the other trials to try
again in a few seconds in the future to give time for the
uploader to actually upload the current file that's locking
the folder.
2017-12-07 21:31:20 +01:00
Tomaz Canabrava
9f678652f8
[CSE] Lock the folder to upload a file.
2017-12-07 20:52:54 +01:00
Tomaz Canabrava
76916b6c48
[CSE] Request the Folder ID.
2017-12-07 19:39:30 +01:00
