summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-2258-0/+136
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-2132-10/+196
* Merge pull request #14737 from owncloud/app-descriptions-collapsibleJan-Christoph Borchardt2015-03-203-16/+48
|\
| * collapse app descriptions by default, make expandable, fix #13112Jan-Christoph Borchardt2015-03-193-16/+48
* | Merge pull request #15069 from owncloud/enable-oci-testing-on-pr-masterThomas Müller2015-03-201-0/+0
|\ \
| * | Adding magic file to enable oci on pull request testing on ci.owncloud.orgThomas Müller2015-03-201-0/+0
* | | Merge pull request #14857 from owncloud/preview-provider-registration-in-managerThomas Müller2015-03-2019-270/+551
|\ \ \
| * | | Remove load*() methods from public interfaceJoas Schilling2015-03-161-48/+1
| * | | Fix controller testJoas Schilling2015-03-161-0/+1
| * | | Only register the core providers when necessaryJoas Schilling2015-03-161-6/+13
| * | | Move mimetype check from template to controllerJoas Schilling2015-03-162-4/+4
| * | | Create an interface for OC_Image and OCP\Image for the public APIJoas Schilling2015-03-1613-25/+220
| * | | Only sort the list when requiredJoas Schilling2015-03-161-2/+13
| * | | Order the providers alphabeticallyJoas Schilling2015-03-161-8/+8
| * | | Only do all the "find path" magic when we need to register themJoas Schilling2015-03-161-1/+5
| * | | Cache result for isMimeTypeSupported()Joas Schilling2015-03-161-0/+13
| * | | Add more type hintingJoas Schilling2015-03-164-4/+4
| * | | Use DI for the configJoas Schilling2015-03-163-13/+23
| * | | Add an interface for the preview providersJoas Schilling2015-03-164-6/+50
| * | | Clean up some docsJoas Schilling2015-03-162-9/+9
| * | | Move default provider registration to preview managerJoas Schilling2015-03-163-178/+209
| * | | Register preview providers on the preview manager instead of OC\PreviewJoas Schilling2015-03-164-61/+74
| * | | Use the PreviewManager where possibleJoas Schilling2015-03-162-5/+4
* | | | Merge pull request #14941 from AdamWill/pipeline-appsMorris Jobke2015-03-201-1/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | fall back to absolute path for pipelined assets (#14940)Adam Williamson2015-03-161-1/+5
* | | | Merge pull request #11884 from owncloud/ext-appframeworkVincent Petry2015-03-2032-489/+4316
|\ \ \ \
| * | | | Introduce async status checkingRobin McCorkell2015-03-203-10/+9
| * | | | Fix PHPDoc in files_external, add missing tagVincent Petry2015-03-178-25/+77
| * | | | Fix storage priority in JS unit testVincent Petry2015-03-161-3/+6
| * | | | Fix PHPDoc for StoragesControllerVincent Petry2015-03-161-6/+9
| * | | | Generate storage config ids when missingVincent Petry2015-03-168-43/+317
| * | | | Fix mount config unit testsVincent Petry2015-03-132-26/+56
| * | | | Mount options for ext storage are now passed aroundVincent Petry2015-03-1313-6/+109
| * | | | Implement priority on client side in hidden inputRobin McCorkell2015-03-122-0/+15
| * | | | Use storage id + appframework for ext storage CRUDVincent Petry2015-03-1229-455/+3803
* | | | | Merge pull request #15062 from owncloud/fix-15053-masterThomas Müller2015-03-202-1/+8
|\ \ \ \ \
| * | | | | Handle session initialization errors and display error page - fixes #15053Thomas Müller2015-03-202-1/+8
* | | | | | Merge pull request #15063 from owncloud/share-readonlyfile-permissionsMorris Jobke2015-03-202-3/+2
|\ \ \ \ \ \
| * | | | | | Do not automatically add "update" permission to shared mountsVincent Petry2015-03-202-3/+2
| |/ / / / /
* | | | | | Merge pull request #14938 from owncloud/test-oracle-in-dockerMorris Jobke2015-03-201-24/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Now using a special docker where the database for testing is already availableThomas Müller2015-03-201-26/+2
| * | | | | Oracle 11 XE is now fired up in a docker image - looks like we get back Oracl...Thomas Müller2015-03-171-3/+18
| | |/ / / | |/| | |
* | | | | Merge pull request #14993 from owncloud/stop-on-missing-depsThomas Müller2015-03-202-30/+41
|\ \ \ \ \
| * | | | | Do not add apps2/ directory if it does not existJoas Schilling2015-03-191-20/+20
| * | | | | Stop executing, when 3rdparty is missing or apps directory is invalidJoas Schilling2015-03-181-10/+21
* | | | | | Merge pull request #15047 from owncloud/connect-failed-exception-messageThomas Müller2015-03-201-1/+1
|\ \ \ \ \ \
| * | | | | | be a little more verbose in the exception message when we cant connect to the dbRobin Appelman2015-03-201-1/+1
* | | | | | | Merge pull request #15050 from owncloud/user-create-existsRobin McCorkell2015-03-201-0/+9
|\ \ \ \ \ \ \
| * | | | | | | show a better error message when trying to create a user that already existsRobin Appelman2015-03-201-0/+9
| |/ / / / / /
* | | | | | | Merge pull request #15046 from owncloud/exception-show-typeRobin McCorkell2015-03-202-0/+2
|\ \ \ \ \ \ \