summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22269 from owncloud/issue-22243-avoid-deadlock-with-lots-...Thomas Müller2016-02-103-24/+71
|\
| * Chunk the queries to make sure they don't time outJoas Schilling2016-02-103-24/+71
* | Merge pull request #22271 from owncloud/remember-login-stateThomas Müller2016-02-102-0/+5
|\ \
| * | refactoring codeVincent Chan2016-02-103-9/+4
| * | Remember previous state of remember login checkboxVincent Chan2016-02-102-1/+11
* | | Merge pull request #22273 from owncloud/versions-fixpathasrecipientThomas Müller2016-02-102-1/+7
|\ \ \
| * | | Use full path of known file when handling versionsVincent Petry2016-02-101-1/+2
| * | | Remove path from versions responseVincent Petry2016-02-101-0/+5
| | |/ | |/|
* | | Merge pull request #22267 from owncloud/fix_encryption2Thomas Müller2016-02-103-25/+72
|\ \ \
| * | | remember signature version and only set it on update to make sure that otherBjoern Schiessle2016-02-103-12/+44
| * | | use the version of the original file if we write the part file to have a prop...Bjoern Schiessle2016-02-101-15/+30
* | | | Merge pull request #20073 from owncloud/files-should-add-download-dispositionThomas Müller2016-02-101-0/+17
|\ \ \ \
| * | | | Only set the header if the node exists and in case the request is a GETThomas Müller2016-02-081-3/+8
| * | | | Serve files with an attachment disposition for new DAV endpointLukas Reschke2016-02-081-0/+12
* | | | | Merge pull request #22270 from owncloud/use-cache-directlyThomas Müller2016-02-101-5/+2
|\ \ \ \ \
| * | | | | Use cache directly instead of QBLukas Reschke2016-02-101-5/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #22274 from owncloud/fix_21710Thomas Müller2016-02-101-1/+7
|\ \ \ \ \
| * | | | | Updated davclient.jsRoeland Jago Douma2016-02-101-1/+7
* | | | | | Merge pull request #22263 from owncloud/fix-group-principalsThomas Müller2016-02-102-8/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix group principalThomas Müller2016-02-102-8/+24
* | | | | | Merge pull request #22266 from owncloud/fix_21726Vincent Petry2016-02-101-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Only show link spinner if the share existsRoeland Jago Douma2016-02-101-1/+1
|/ / / / /
* | | | | 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