Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Simplify even more | Lukas Reschke | 2015-04-27 | 1 | -2/+2 |
* | Rephrase "TL;DR" | Lukas Reschke | 2015-04-27 | 1 | -1/+1 |
* | Merge pull request #15887 from owncloud/issue-15885-empty-getenv-path | Thomas Müller | 2015-04-27 | 1 | -1/+2 |
|\ | |||||
| * | Can't use function return value in write context | Joas Schilling | 2015-04-27 | 1 | -1/+2 |
* | | Merge pull request #15886 from owncloud/fix-15848-master | Thomas Müller | 2015-04-27 | 2 | -1/+7 |
|\ \ | |||||
| * | | fixes #15848 | Thomas Müller | 2015-04-27 | 2 | -1/+7 |
| |/ | |||||
* | | Merge pull request #15860 from owncloud/enc_fallback_old_encryption | Thomas Müller | 2015-04-27 | 8 | -20/+88 |
|\ \ | |/ |/| | |||||
| * | fall back to the ownCloud default encryption module and aes128 if we read a e... | Bjoern Schiessle | 2015-04-27 | 8 | -20/+88 |
* | | Merge pull request #15882 from owncloud/fix-type-annotation | Morris Jobke | 2015-04-27 | 2 | -2/+2 |
|\ \ | |||||
| * | | Fix type annotation | Lukas Reschke | 2015-04-27 | 2 | -2/+2 |
* | | | Merge pull request #15411 from mmattel/fix_for_15375_better_message_text | Thomas Müller | 2015-04-27 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Improve error messge text for app upgrade try (#15375) | Martin | 2015-04-22 | 1 | -0/+1 |
* | | | | Merge pull request #15681 from owncloud/issue/15667-occ-encryption | Morris Jobke | 2015-04-27 | 17 | -83/+672 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Undefined index: default | Joas Schilling | 2015-04-27 | 1 | -1/+1 |
| * | | | Fix module registration | Joas Schilling | 2015-04-27 | 1 | -1/+3 |
| * | | | Fix scrutinizer complain | Joas Schilling | 2015-04-27 | 1 | -1/+1 |
| * | | | Fix new tests | Joas Schilling | 2015-04-27 | 2 | -5/+2 |
| * | | | Use interface | Joas Schilling | 2015-04-27 | 1 | -4/+4 |
| * | | | Add unit tests for the commands | Joas Schilling | 2015-04-27 | 4 | -6/+280 |
| * | | | Make methods explicit public | Joas Schilling | 2015-04-27 | 1 | -6/+6 |
| * | | | Make getDefaultModuleId public and get module protected | Joas Schilling | 2015-04-27 | 8 | -59/+33 |
| * | | | Deduplicate module mock | Joas Schilling | 2015-04-27 | 1 | -41/+34 |
| * | | | Add test for setDefaultEncryptionModule | Joas Schilling | 2015-04-27 | 1 | -0/+31 |
| * | | | Add a test that the default module is returned before we fall back | Joas Schilling | 2015-04-27 | 1 | -1/+35 |
| * | | | Add occ commands to manage the encryption modules | Joas Schilling | 2015-04-27 | 5 | -0/+283 |
| * | | | Verify that the encryption module exists before setting it | Joas Schilling | 2015-04-27 | 1 | -6/+7 |
| | |/ | |/| | |||||
* | | | Merge pull request #15875 from owncloud/multiline-buttons | Joas Schilling | 2015-04-27 | 1 | -1/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | fix layout for multiline buttons which are <a class='button'> | Jan-Christoph Borchardt | 2015-04-26 | 1 | -1/+4 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-27 | 20 | -0/+92 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-26 | 22 | -18/+62 |
* | | Merge pull request #15834 from owncloud/make-temporary-file-really-unique | Lukas Reschke | 2015-04-25 | 2 | -42/+86 |
|\ \ | |||||
| * | | Fix collision on temporary files + adjust permissions | Lukas Reschke | 2015-04-23 | 2 | -42/+86 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-25 | 22 | -0/+36 |
* | | | Merge pull request #15683 from owncloud/block-legacy-clients | Lukas Reschke | 2015-04-24 | 4 | -0/+220 |
|\ \ \ | |||||
| * | | | Catch not existing User-Agent header | Lukas Reschke | 2015-04-23 | 2 | -2/+17 |
| * | | | Reword configuration text | Lukas Reschke | 2015-04-20 | 1 | -5/+8 |
| * | | | Use 403 instead a 50x response | Lukas Reschke | 2015-04-20 | 2 | -11/+11 |
| * | | | Wording | Lukas Reschke | 2015-04-20 | 1 | -1/+1 |
| * | | | Block old legacy clients | Lukas Reschke | 2015-04-20 | 4 | -0/+202 |
* | | | | Merge pull request #15774 from owncloud/jknockaert-patch-1 | Vincent Petry | 2015-04-24 | 2 | -20/+71 |
|\ \ \ \ | |||||
| * | | | | fix unit tests | Bjoern Schiessle | 2015-04-24 | 2 | -9/+26 |
| * | | | | enable testWriteWriteRead | jknockaert | 2015-04-24 | 1 | -14/+14 |
| * | | | | enable testRewind | jknockaert | 2015-04-24 | 1 | -14/+14 |
| * | | | | Update encryption.php | jknockaert | 2015-04-24 | 1 | -1/+2 |
| * | | | | Update encryption.php | jknockaert | 2015-04-24 | 1 | -14/+14 |
| * | | | | disable r+ test | jknockaert | 2015-04-24 | 1 | -14/+14 |
| * | | | | fixed name | jknockaert | 2015-04-24 | 1 | -1/+1 |
| * | | | | add two tests | jknockaert | 2015-04-24 | 1 | -0/+30 |
| * | | | | Update encryption.php | jknockaert | 2015-04-24 | 1 | -8/+8 |
| * | | | | fix encryption header error | jknockaert | 2015-04-24 | 1 | -13/+16 |
|/ / / / |