Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-22 | 102 | -14/+314 |
* | Merge pull request #15734 from owncloud/add-deprecate-tags | Thomas Müller | 2015-04-21 | 6 | -1/+27 |
|\ | |||||
| * | Add @deprecated to all methods with a proper method in \OCP | Morris Jobke | 2015-04-20 | 6 | -1/+27 |
* | | Merge pull request #15782 from owncloud/hide-modified-multiselect | Morris Jobke | 2015-04-21 | 1 | -1/+10 |
|\ \ | |||||
| * | | hide modified header when multiselect is active, fix #15779 | Jan-Christoph Borchardt | 2015-04-21 | 1 | -1/+10 |
* | | | Merge pull request #15721 from oparoz/fix-readonly-cache | Thomas Müller | 2015-04-21 | 2 | -1/+96 |
|\ \ \ | |||||
| * | | | Renamed class + split methods | Olivier Paroz | 2015-04-21 | 1 | -25/+13 |
| * | | | Tests for read-only cache | Olivier Paroz | 2015-04-18 | 1 | -0/+105 |
| * | | | Thou shalt not corrupt the answer of a cache request | Olivier Paroz | 2015-04-18 | 1 | -1/+3 |
* | | | | Merge pull request #15690 from owncloud/enc_fix_upload | Björn Schießle | 2015-04-21 | 2 | -2/+96 |
|\ \ \ \ | |||||
| * | | | | get dirname from sharePath | Bjoern Schiessle | 2015-04-21 | 2 | -2/+96 |
* | | | | | Merge pull request #15769 from owncloud/files-emptycontentreadonly | Jan-Christoph Borchardt | 2015-04-21 | 4 | -5/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Added empty content message for empty read-only folders | Vincent Petry | 2015-04-21 | 4 | -5/+16 |
| |/ / / / | |||||
* | | | | | Merge pull request #15770 from owncloud/fix-15764 | Morris Jobke | 2015-04-21 | 1 | -1/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | bring back border in host input field for consistency | Arthur Schiwon | 2015-04-21 | 1 | -1/+0 |
| |/ / / | |||||
* | | | | Merge pull request #15713 from owncloud/fix-15707-master | Morris Jobke | 2015-04-21 | 4 | -39/+47 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | doc and indent | Thomas Müller | 2015-04-21 | 2 | -4/+8 |
| * | | | Don't pollute the global namespace | Thomas Müller | 2015-04-21 | 3 | -33/+44 |
| * | | | make jshint happy | Thomas Müller | 2015-04-20 | 2 | -14/+17 |
| * | | | use a simple function - OC.Encryption is already defined - fixes #15707 | Thomas Müller | 2015-04-20 | 1 | -23/+13 |
* | | | | Merge pull request #15636 from owncloud/enc2_performance_improvement | Björn Schießle | 2015-04-21 | 1 | -3/+2 |
|\ \ \ \ | |||||
| * | | | | set size and unencrypted size to zero on fopen | Bjoern Schiessle | 2015-04-20 | 1 | -3/+2 |
* | | | | | Merge pull request #15753 from owncloud/remove-app-version-from-disabled-list | Thomas Müller | 2015-04-21 | 3 | -4/+25 |
|\ \ \ \ \ | |||||
| * | | | | | Remove the app version from disabled app list | Joas Schilling | 2015-04-20 | 3 | -4/+25 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-21 | 10 | -8/+44 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #15677 from owncloud/enc_reset_private_key_password | Thomas Müller | 2015-04-20 | 5 | -10/+379 |
|\ \ \ \ \ | |||||
| * | | | | | Dont use the old .status way | Joas Schilling | 2015-04-20 | 3 | -24/+12 |
| * | | | | | Fix several minor things | Joas Schilling | 2015-04-20 | 2 | -24/+21 |
| * | | | | | let user update the private key password in case the login password was chang... | Bjoern Schiessle | 2015-04-17 | 4 | -0/+384 |
* | | | | | | Merge pull request #15748 from owncloud/fixing-enc-filesize-once-more | Vincent Petry | 2015-04-20 | 6 | -26/+78 |
|\ \ \ \ \ \ | |||||
| * | | | | | | move permission related code into getMetaData() | Thomas Müller | 2015-04-20 | 3 | -15/+20 |
| * | | | | | | Avoid function name collision in dropbox external storage | Thomas Müller | 2015-04-20 | 1 | -7/+7 |
| * | | | | | | Introduce Storage::getMetaData() to allow storage implementations more contro... | Thomas Müller | 2015-04-20 | 5 | -10/+10 |
| * | | | | | | Introduce Storage::getData() to allow storage implementations more control ov... | Thomas Müller | 2015-04-20 | 5 | -10/+57 |
* | | | | | | | Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfound | Lukas Reschke | 2015-04-20 | 2 | -9/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add tests for correct path | Joas Schilling | 2015-04-20 | 1 | -1/+2 |
| * | | | | | | | Fix phpStorm complains and namespace | Joas Schilling | 2015-04-20 | 1 | -7/+18 |
| * | | | | | | | Fix wrong path generation | Morris Jobke | 2015-04-20 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #15635 from owncloud/issue/15634-empty-txt-previews | Morris Jobke | 2015-04-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Scale up the font on larger previews | Joas Schilling | 2015-04-15 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #15735 from owncloud/fix-visibility | Morris Jobke | 2015-04-20 | 8 | -22/+22 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Fix visibility of public API methods | Joas Schilling | 2015-04-20 | 3 | -4/+4 |
| * | | | | | | Fix visibility of interfaces in \OCP | Morris Jobke | 2015-04-19 | 5 | -18/+18 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #15637 from owncloud/migrate-certificate-stuff | Lukas Reschke | 2015-04-20 | 15 | -132/+359 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Adjust tests and statuscode | Lukas Reschke | 2015-04-20 | 3 | -9/+19 |
| * | | | | | | fix date variable | Morris Jobke | 2015-04-20 | 1 | -1/+1 |
| * | | | | | | Fix files | Lukas Reschke | 2015-04-20 | 1 | -2/+6 |
| * | | | | | | Proper return types | Lukas Reschke | 2015-04-20 | 2 | -3/+4 |
| * | | | | | | Migrate personal certificate handling into AppFramework controllers | Lukas Reschke | 2015-04-20 | 10 | -100/+298 |
| * | | | | | | Verify if returned object is an array | Lukas Reschke | 2015-04-20 | 2 | -24/+38 |