summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22253 from owncloud/notifications-for-remote-sharesThomas Müller2016-02-106-17/+30
|\
| * Fix oracle by using less quotesJoas Schilling2016-02-101-1/+1
| * Listen to the notification event to reload the file listJoas Schilling2016-02-101-1/+13
| * Mark the accept button as primaryJoas Schilling2016-02-101-1/+2
| * Create the actions with the correct IDJoas Schilling2016-02-102-5/+6
| * Make sure the share ID is an integerJoas Schilling2016-02-101-2/+2
| * Fix action pathsJoas Schilling2016-02-101-2/+2
| * Bring the messages inlineJoas Schilling2016-02-101-1/+1
| * Fix the notification API usageJoas Schilling2016-02-102-1/+6
| * Revert "Disable the remote sharing notifications until they work properly"Joas Schilling2016-02-103-8/+2
* | Merge pull request #22256 from owncloud/hide-updater-secretThomas Müller2016-02-101-0/+1
|\ \ | |/ |/|
| * Hide updater.secret from occ output by defaultLukas Reschke2016-02-091-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1090-74/+94
* | Merge pull request #21557 from owncloud/use-hmac-over-encryptionLukas Reschke2016-02-0918-137/+499
|\ \
| * | Add tests for setVersionLukas Reschke2016-02-091-0/+40
| * | Use cache update instead of put for encryption versionVincent Petry2016-02-091-1/+1
| * | Use cache and add testsLukas Reschke2016-02-093-15/+39
| * | don't decrease ->version for part files but only a local variable, otherwise ...Bjoern Schiessle2016-02-091-4/+8
| * | Check if partial cache entry or not in encryption wrapperVincent Petry2016-02-091-2/+5
| * | realPath should contain the path to the file we want to read, e.g. the versio...Bjoern Schiessle2016-02-091-1/+1
| * | Use database for keeping track of the versionLukas Reschke2016-02-096-9/+58
| * | Use number of chunk for HMAC as wellLukas Reschke2016-02-093-19/+29
| * | Keep track of file versionLukas Reschke2016-02-093-13/+53
| * | Clarify documentationLukas Reschke2016-02-091-0/+2
| * | Use hash with appended "a" of the original password for the authenticationLukas Reschke2016-02-091-3/+4
| * | fixing unit testsBjörn Schießle2016-02-095-11/+60
| * | Use random_bytes instead OpenSSLLukas Reschke2016-02-091-8/+1
| * | meta data are at the end of the fileBjörn Schießle2016-02-091-1/+1
| * | always use default cipher for write operations, no matter how the file was en...Björn Schießle2016-02-091-3/+3
| * | make it backward compatible to work with signed and un-signed filesBjörn Schießle2016-02-095-18/+34
| * | sign all encrypted blocks and check signature on decryptBjörn Schießle2016-02-098-33/+133
| * | Add note about the addPadding functionLukas Reschke2016-02-091-0/+4
| * | Use an actual 16 byte long IVLukas Reschke2016-02-091-17/+2
| * | Use AES-256-CTR as defaultLukas Reschke2016-02-092-26/+68
|/ /
* | Merge pull request #22192 from owncloud/fix_19685Thomas Müller2016-02-094-7/+51
|\ \
| * | Catch exceptionRoeland Jago Douma2016-02-091-4/+17
| * | Throw exceptionRoeland Jago Douma2016-02-093-5/+17
| * | Only set the default expiration date on share creationRoeland Jago Douma2016-02-094-2/+21
* | | Merge pull request #22246 from owncloud/register-process-control-signal-handl...Thomas Müller2016-02-091-10/+12
|\ \ \
| * | | Register process control signel handlers only on execution of the commandThomas Müller2016-02-091-10/+12
* | | | Merge pull request #22255 from owncloud/add-sso-for-updatecheckerThomas Müller2016-02-0912-1/+491
|\ \ \ \
| * | | | Add SSO for updater applicationLukas Reschke2016-02-0912-1/+491
| | |_|/ | |/| |
* | | | Merge pull request #22251 from owncloud/smb-105Thomas Müller2016-02-0916-38/+215
|\ \ \ \
| * | | | update icewind/smb to 1.0.5Robin Appelman2016-02-0916-38/+215
* | | | | Merge pull request #22249 from owncloud/fix-22245Thomas Müller2016-02-091-0/+8
|\ \ \ \ \
| * | | | | Save display name and email address on paste operations - fixes #22245Thomas Müller2016-02-091-0/+8
| | |_|/ / | |/| | |
* | | | | Merge pull request #20928 from owncloud/publicdav-check-permissionsC. Montero Luque2016-02-095-2/+139
|\ \ \ \ \
| * | | | | add testsRobin Appelman2016-02-091-0/+49
| * | | | | Fix unit testsRoeland Jago Douma2016-02-091-0/+2
| * | | | | check share permissions in share controllerRobin Appelman2016-02-091-0/+17