summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-22102-14/+314
* Merge pull request #15734 from owncloud/add-deprecate-tagsThomas Müller2015-04-216-1/+27
|\
| * Add @deprecated to all methods with a proper method in \OCPMorris Jobke2015-04-206-1/+27
* | Merge pull request #15782 from owncloud/hide-modified-multiselectMorris Jobke2015-04-211-1/+10
|\ \
| * | hide modified header when multiselect is active, fix #15779Jan-Christoph Borchardt2015-04-211-1/+10
* | | Merge pull request #15721 from oparoz/fix-readonly-cacheThomas Müller2015-04-212-1/+96
|\ \ \
| * | | Renamed class + split methodsOlivier Paroz2015-04-211-25/+13
| * | | Tests for read-only cacheOlivier Paroz2015-04-181-0/+105
| * | | Thou shalt not corrupt the answer of a cache requestOlivier Paroz2015-04-181-1/+3
* | | | Merge pull request #15690 from owncloud/enc_fix_uploadBjörn Schießle2015-04-212-2/+96
|\ \ \ \
| * | | | get dirname from sharePathBjoern Schiessle2015-04-212-2/+96
* | | | | Merge pull request #15769 from owncloud/files-emptycontentreadonlyJan-Christoph Borchardt2015-04-214-5/+16
|\ \ \ \ \
| * | | | | Added empty content message for empty read-only foldersVincent Petry2015-04-214-5/+16
| |/ / / /
* | | | | Merge pull request #15770 from owncloud/fix-15764Morris Jobke2015-04-211-1/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | bring back border in host input field for consistencyArthur Schiwon2015-04-211-1/+0
| |/ / /
* | | | Merge pull request #15713 from owncloud/fix-15707-masterMorris Jobke2015-04-214-39/+47
|\ \ \ \ | |/ / / |/| | |
| * | | doc and indentThomas Müller2015-04-212-4/+8
| * | | Don't pollute the global namespaceThomas Müller2015-04-213-33/+44
| * | | make jshint happyThomas Müller2015-04-202-14/+17
| * | | use a simple function - OC.Encryption is already defined - fixes #15707Thomas Müller2015-04-201-23/+13
* | | | Merge pull request #15636 from owncloud/enc2_performance_improvementBjörn Schießle2015-04-211-3/+2
|\ \ \ \
| * | | | set size and unencrypted size to zero on fopenBjoern Schiessle2015-04-201-3/+2
* | | | | Merge pull request #15753 from owncloud/remove-app-version-from-disabled-listThomas Müller2015-04-213-4/+25
|\ \ \ \ \
| * | | | | Remove the app version from disabled app listJoas Schilling2015-04-203-4/+25
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2110-8/+44
| |_|/ / / |/| | | |
* | | | | Merge pull request #15677 from owncloud/enc_reset_private_key_passwordThomas Müller2015-04-205-10/+379
|\ \ \ \ \
| * | | | | Dont use the old .status wayJoas Schilling2015-04-203-24/+12
| * | | | | Fix several minor thingsJoas Schilling2015-04-202-24/+21
| * | | | | let user update the private key password in case the login password was chang...Bjoern Schiessle2015-04-174-0/+384
* | | | | | Merge pull request #15748 from owncloud/fixing-enc-filesize-once-moreVincent Petry2015-04-206-26/+78
|\ \ \ \ \ \
| * | | | | | move permission related code into getMetaData()Thomas Müller2015-04-203-15/+20
| * | | | | | Avoid function name collision in dropbox external storageThomas Müller2015-04-201-7/+7
| * | | | | | Introduce Storage::getMetaData() to allow storage implementations more contro...Thomas Müller2015-04-205-10/+10
| * | | | | | Introduce Storage::getData() to allow storage implementations more control ov...Thomas Müller2015-04-205-10/+57
* | | | | | | Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfoundLukas Reschke2015-04-202-9/+21
|\ \ \ \ \ \ \
| * | | | | | | Add tests for correct pathJoas Schilling2015-04-201-1/+2
| * | | | | | | Fix phpStorm complains and namespaceJoas Schilling2015-04-201-7/+18
| * | | | | | | Fix wrong path generationMorris Jobke2015-04-201-1/+1
* | | | | | | | Merge pull request #15635 from owncloud/issue/15634-empty-txt-previewsMorris Jobke2015-04-201-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Scale up the font on larger previewsJoas Schilling2015-04-151-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #15735 from owncloud/fix-visibilityMorris Jobke2015-04-208-22/+22
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix visibility of public API methodsJoas Schilling2015-04-203-4/+4
| * | | | | | Fix visibility of interfaces in \OCPMorris Jobke2015-04-195-18/+18
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #15637 from owncloud/migrate-certificate-stuffLukas Reschke2015-04-2015-132/+359
|\ \ \ \ \ \
| * | | | | | Adjust tests and statuscodeLukas Reschke2015-04-203-9/+19
| * | | | | | fix date variableMorris Jobke2015-04-201-1/+1
| * | | | | | Fix filesLukas Reschke2015-04-201-2/+6
| * | | | | | Proper return typesLukas Reschke2015-04-202-3/+4
| * | | | | | Migrate personal certificate handling into AppFramework controllersLukas Reschke2015-04-2010-100/+298
| * | | | | | Verify if returned object is an arrayLukas Reschke2015-04-202-24/+38