summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 #13112
| * 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.o...
| * | 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
|\ \ \ | | | | | | | | Preview provider registration in manager
| * | | Remove load*() methods from public interfaceJoas Schilling2015-03-161-48/+1
| | | | | | | | | | | | | | | | We shall add a factory for that in the future
| * | | 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)
| * | | fall back to absolute path for pipelined assets (#14940)Adam Williamson2015-03-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the asset is, for example, in an apps directory that is outside the $SERVERROOT, we won't be able to get a relative path. We shouldn't just fail hard in this case. Fall back to using the absolute path instead (as we used to).
* | | | Merge pull request #11884 from owncloud/ext-appframeworkVincent Petry2015-03-2032-489/+4316
|\ \ \ \ | | | | | | | | | | Cleanup ext storage CRUD code, introduce storage config id
| * | | | Introduce async status checkingRobin McCorkell2015-03-203-10/+9
| | | | |
| * | | | Fix PHPDoc in files_external, add missing tagVincent Petry2015-03-178-25/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix various PHPDoc issues in external storage app. Added missing NoAdminRequired tag
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading in old mount.json files, they do not contain config ids. Since these are needed to be able to use the UI and the new service classes, these will be generated automatically. The config grouping is based on a config hash.
| * | | | Fix mount config unit testsVincent Petry2015-03-132-26/+56
| | | | | | | | | | | | | | | | | | | | | | | | | Fix expected result now that it returns the status. Added isset for some properties that are not always present.
| * | | | Mount options for ext storage are now passed aroundVincent Petry2015-03-1313-6/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mount options are now passed to the UI and stored in a hidden field. The ext storage controllers and services also know how to load/save them from the legacy config.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added StorageConfig class to replace ugly arrays - Implemented StorageService and StorageController for Global and User storages - Async status checking for storages (from Xenopathic) - Auto-generate id for external storage configs (not the same as storage_id) - Refactor JS classes for external storage settings, this mostly moves/encapsulated existing global event handlers into the MountConfigListView class. - Added some JS unit tests for the external storage UI
* | | | | Merge pull request #15062 from owncloud/fix-15053-masterThomas Müller2015-03-202-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Handle session initialization errors and display error page
| * | | | | 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 mounts
| * | | | | | Do not automatically add "update" permission to shared mountsVincent Petry2015-03-202-3/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the past it seems the update permission was needed to be able to rename shared mounts, but it doesn't seem to be the case any more. Removing the "update" permission that used to be added automatically fixes the read-only permission check when trying to overwrite a read-only file over WebDAV.
* | | | | | Merge pull request #14938 from owncloud/test-oracle-in-dockerMorris Jobke2015-03-201-24/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Oracle 11 XE is now fired up in a docker image - looks like we get back ...
| * | | | | 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 ↵Thomas Müller2015-03-171-3/+18
| | |/ / / | |/| | | | | | | | | | | | | Oracle Testing on pull requests
* | | | | Merge pull request #14993 from owncloud/stop-on-missing-depsThomas Müller2015-03-202-30/+41
|\ \ \ \ \ | | | | | | | | | | | | Stop executing, when 3rdparty is missing or apps directory is invalid
| * | | | | 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...
| * | | | | | 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 exists
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | show exception type in debug mode
| * | | | | | | show exception type in debug modeRobin Appelman2015-03-202-0/+2
| |/ / / / / /