summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove duplicates from rebaseRobin Appelman2015-04-271-48/+0
* adjust testRobin Appelman2015-04-272-2/+7
* dont use our now non existing hookRobin Appelman2015-04-273-3/+9
* propagate etags for all user of a shareRobin Appelman2015-04-2714-93/+521
* Allow getting *all* share entries owned by a userRobin Appelman2015-04-272-1/+15
* Make the change propagator an emitterRobin Appelman2015-04-272-1/+8
* unit test for etag propagation across shared storage boundaryRobin Appelman2015-04-271-2/+158
* 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
|/ / / /
* | | | 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