summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fall back to the ownCloud default encryption module and aes128 if we read a e...Bjoern Schiessle2015-04-278-20/+88
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-2720-0/+92
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-2622-18/+62
* Merge pull request #15834 from owncloud/make-temporary-file-really-uniqueLukas Reschke2015-04-252-42/+86
|\
| * Fix collision on temporary files + adjust permissionsLukas Reschke2015-04-232-42/+86
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2522-0/+36
* | Merge pull request #15683 from owncloud/block-legacy-clientsLukas Reschke2015-04-244-0/+220
|\ \
| * | Catch not existing User-Agent headerLukas Reschke2015-04-232-2/+17
| * | Reword configuration textLukas Reschke2015-04-201-5/+8
| * | Use 403 instead a 50x responseLukas Reschke2015-04-202-11/+11
| * | WordingLukas Reschke2015-04-201-1/+1
| * | Block old legacy clientsLukas Reschke2015-04-204-0/+202
* | | Merge pull request #15774 from owncloud/jknockaert-patch-1Vincent Petry2015-04-242-20/+71
|\ \ \
| * | | fix unit testsBjoern Schiessle2015-04-242-9/+26
| * | | enable testWriteWriteReadjknockaert2015-04-241-14/+14
| * | | enable testRewindjknockaert2015-04-241-14/+14
| * | | Update encryption.phpjknockaert2015-04-241-1/+2
| * | | Update encryption.phpjknockaert2015-04-241-14/+14
| * | | disable r+ testjknockaert2015-04-241-14/+14
| * | | fixed namejknockaert2015-04-241-1/+1
| * | | add two testsjknockaert2015-04-241-0/+30
| * | | Update encryption.phpjknockaert2015-04-241-8/+8
| * | | fix encryption header errorjknockaert2015-04-241-13/+16
|/ / /
* | | Merge pull request #15839 from owncloud/enc_fix_moving_shared_filesJoas Schilling2015-04-2410-75/+399
|\ \ \
| * | | Add test "operation on keys failed"Joas Schilling2015-04-241-7/+10
| * | | Deduplicate data provider and fix method visibilityJoas Schilling2015-04-242-19/+15
| * | | Use public interfaces for type hintingJoas Schilling2015-04-242-13/+13
| * | | only update share keys if the file was encryptedBjoern Schiessle2015-04-244-6/+25
| * | | update share keys if file gets copiedBjoern Schiessle2015-04-232-19/+70
| * | | update share keys if a file is moved to a shared folderBjoern Schiessle2015-04-238-46/+301
| | |/ | |/|
* | | Merge pull request #15838 from owncloud/code-checker-to-ignore-testsJoas Schilling2015-04-241-1/+1
|\ \ \
| * | | Ignore test folders when checking the code for complianceThomas Müller2015-04-231-1/+1
* | | | Merge pull request #15855 from owncloud/teardownaftercommandLukas Reschke2015-04-241-0/+1
|\ \ \ \
| * | | | Tear down FS after running trash expireVincent Petry2015-04-241-0/+1
* | | | | Merge pull request #15835 from owncloud/delete-permission-iconJan-Christoph Borchardt2015-04-245-5/+62
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Show hint if there is no delete permissionMorris Jobke2015-04-235-5/+62
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-246-6/+6
* | | | Merge pull request #15846 from owncloud/fix-missing-loading-indicatorLukas Reschke2015-04-231-0/+2
|\ \ \ \
| * | | | Add missing loading indicator for enabled appsMorris Jobke2015-04-231-0/+2
| | |/ / | |/| |
* | | | Merge pull request #15826 from owncloud/issue-15804-occ-user-delete-exceptionblizzz2015-04-238-20/+262
|\ \ \ \ | |/ / / |/| | |
| * | | Fix file namesJoas Schilling2015-04-232-0/+0
| * | | Add tests for occ user:lastseenJoas Schilling2015-04-231-0/+105
| * | | Unify the output of the user commands and use DIJoas Schilling2015-04-236-16/+40
| * | | Add unit tests for occ user:deleteJoas Schilling2015-04-231-0/+106
| * | | Check if the user exists before trying to delete himJoas Schilling2015-04-231-5/+12
| |/ /
* | | Merge pull request #15814 from owncloud/public-reshare-webdavVincent Petry2015-04-234-139/+6
|\ \ \
| * | | fix subfolder reshares over webdavRobin Appelman2015-04-231-2/+2
| * | | remove unneeded readonlycacheRobin Appelman2015-04-221-44/+0
| * | | resolve reshares in public webdavRobin Appelman2015-04-221-3/+4
| * | | use the permissions mask cache wrapper instead of the read only cacheRobin Appelman2015-04-222-94/+4