summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | fix 3rdpartyjknockaert2015-02-191-0/+0
| * | | | | | againjknockaert2015-02-191-36/+0
| * | | | | | try againjknockaert2015-02-191-0/+36
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/master'jknockaert2015-02-195-4/+21
| | |\ \ \ \ \ \
| | | * | | | | | OC8 versionjknockaert2015-02-191-196/+170
| | | * | | | | | update enc streamjknockaert2014-12-171-136/+161
| | * | | | | | | backjknockaert2015-02-191-35/+34
| * | | | | | | | new tryjknockaert2015-02-192-130/+160
* | | | | | | | | Merge pull request #15107 from owncloud/user-mgmt-headerMorris Jobke2015-03-231-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix first user mgmt header jumping around, fix #8873Jan-Christoph Borchardt2015-03-231-1/+9
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #15108 from owncloud/issue/15049-iran-timezoneThomas Müller2015-03-231-3/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | The iran timezone removed the DST handling which breaks the timezone libJoas Schilling2015-03-231-3/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #15103 from owncloud/link-personalMorris Jobke2015-03-233-6/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | fix capitalization in Personal settingsJan-Christoph Borchardt2015-03-231-3/+3
| * | | | | | | | link back to top on Personal page, fix #14519Jan-Christoph Borchardt2015-03-233-3/+8
|/ / / / / / / /
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2322-20/+70
* | | | | | | | Merge pull request #15088 from oparoz/3d-supportMorris Jobke2015-03-223-305/+286
|\ \ \ \ \ \ \ \
| * | | | | | | | Introducing 3D images support (media type)Olivier Paroz2015-03-203-305/+286
* | | | | | | | | [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