summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Simplify even moreLukas Reschke2015-04-271-2/+2
* Rephrase "TL;DR"Lukas Reschke2015-04-271-1/+1
* Merge pull request #15887 from owncloud/issue-15885-empty-getenv-pathThomas Müller2015-04-271-1/+2
|\
| * Can't use function return value in write contextJoas Schilling2015-04-271-1/+2
* | Merge pull request #15886 from owncloud/fix-15848-masterThomas Müller2015-04-272-1/+7
|\ \
| * | fixes #15848Thomas Müller2015-04-272-1/+7
| |/
* | Merge pull request #15860 from owncloud/enc_fallback_old_encryptionThomas Müller2015-04-278-20/+88
|\ \ | |/ |/|
| * fall back to the ownCloud default encryption module and aes128 if we read a e...Bjoern Schiessle2015-04-278-20/+88
* | Merge pull request #15882 from owncloud/fix-type-annotationMorris Jobke2015-04-272-2/+2
|\ \
| * | Fix type annotationLukas Reschke2015-04-272-2/+2
* | | Merge pull request #15411 from mmattel/fix_for_15375_better_message_textThomas Müller2015-04-271-0/+1
|\ \ \
| * | | Improve error messge text for app upgrade try (#15375)Martin2015-04-221-0/+1
* | | | Merge pull request #15681 from owncloud/issue/15667-occ-encryptionMorris Jobke2015-04-2717-83/+672
|\ \ \ \ | |_|/ / |/| | |
| * | | Undefined index: defaultJoas Schilling2015-04-271-1/+1
| * | | Fix module registrationJoas Schilling2015-04-271-1/+3
| * | | Fix scrutinizer complainJoas Schilling2015-04-271-1/+1
| * | | Fix new testsJoas Schilling2015-04-272-5/+2
| * | | Use interfaceJoas Schilling2015-04-271-4/+4
| * | | Add unit tests for the commandsJoas Schilling2015-04-274-6/+280
| * | | Make methods explicit publicJoas Schilling2015-04-271-6/+6
| * | | Make getDefaultModuleId public and get module protectedJoas Schilling2015-04-278-59/+33
| * | | Deduplicate module mockJoas Schilling2015-04-271-41/+34
| * | | Add test for setDefaultEncryptionModuleJoas Schilling2015-04-271-0/+31
| * | | Add a test that the default module is returned before we fall backJoas Schilling2015-04-271-1/+35
| * | | Add occ commands to manage the encryption modulesJoas Schilling2015-04-275-0/+283
| * | | Verify that the encryption module exists before setting itJoas Schilling2015-04-271-6/+7
| | |/ | |/|
* | | Merge pull request #15875 from owncloud/multiline-buttonsJoas Schilling2015-04-271-1/+4
|\ \ \ | |/ / |/| |
| * | fix layout for multiline buttons which are <a class='button'>Jan-Christoph Borchardt2015-04-261-1/+4
* | | [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
|/ / / /