Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-21 | 32 | -10/+196 |
| | |||||
* | Merge pull request #14737 from owncloud/app-descriptions-collapsible | Jan-Christoph Borchardt | 2015-03-20 | 3 | -16/+48 |
|\ | | | | | collapse app descriptions by default, make expandable, fix #13112 | ||||
| * | collapse app descriptions by default, make expandable, fix #13112 | Jan-Christoph Borchardt | 2015-03-19 | 3 | -16/+48 |
| | | |||||
* | | Merge pull request #15069 from owncloud/enable-oci-testing-on-pr-master | Thomas Müller | 2015-03-20 | 1 | -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.org | Thomas Müller | 2015-03-20 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #14857 from owncloud/preview-provider-registration-in-manager | Thomas Müller | 2015-03-20 | 19 | -270/+551 |
|\ \ \ | | | | | | | | | Preview provider registration in manager | ||||
| * | | | Remove load*() methods from public interface | Joas Schilling | 2015-03-16 | 1 | -48/+1 |
| | | | | | | | | | | | | | | | | We shall add a factory for that in the future | ||||
| * | | | Fix controller test | Joas Schilling | 2015-03-16 | 1 | -0/+1 |
| | | | | |||||
| * | | | Only register the core providers when necessary | Joas Schilling | 2015-03-16 | 1 | -6/+13 |
| | | | | |||||
| * | | | Move mimetype check from template to controller | Joas Schilling | 2015-03-16 | 2 | -4/+4 |
| | | | | |||||
| * | | | Create an interface for OC_Image and OCP\Image for the public API | Joas Schilling | 2015-03-16 | 13 | -25/+220 |
| | | | | |||||
| * | | | Only sort the list when required | Joas Schilling | 2015-03-16 | 1 | -2/+13 |
| | | | | |||||
| * | | | Order the providers alphabetically | Joas Schilling | 2015-03-16 | 1 | -8/+8 |
| | | | | |||||
| * | | | Only do all the "find path" magic when we need to register them | Joas Schilling | 2015-03-16 | 1 | -1/+5 |
| | | | | |||||
| * | | | Cache result for isMimeTypeSupported() | Joas Schilling | 2015-03-16 | 1 | -0/+13 |
| | | | | |||||
| * | | | Add more type hinting | Joas Schilling | 2015-03-16 | 4 | -4/+4 |
| | | | | |||||
| * | | | Use DI for the config | Joas Schilling | 2015-03-16 | 3 | -13/+23 |
| | | | | |||||
| * | | | Add an interface for the preview providers | Joas Schilling | 2015-03-16 | 4 | -6/+50 |
| | | | | |||||
| * | | | Clean up some docs | Joas Schilling | 2015-03-16 | 2 | -9/+9 |
| | | | | |||||
| * | | | Move default provider registration to preview manager | Joas Schilling | 2015-03-16 | 3 | -178/+209 |
| | | | | |||||
| * | | | Register preview providers on the preview manager instead of OC\Preview | Joas Schilling | 2015-03-16 | 4 | -61/+74 |
| | | | | |||||
| * | | | Use the PreviewManager where possible | Joas Schilling | 2015-03-16 | 2 | -5/+4 |
| | | | | |||||
* | | | | Merge pull request #14941 from AdamWill/pipeline-apps | Morris Jobke | 2015-03-20 | 1 | -1/+5 |
|\ \ \ \ | |_|/ / |/| | | | fall back to absolute path for pipelined assets (#14940) | ||||
| * | | | fall back to absolute path for pipelined assets (#14940) | Adam Williamson | 2015-03-16 | 1 | -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-appframework | Vincent Petry | 2015-03-20 | 32 | -489/+4316 |
|\ \ \ \ | | | | | | | | | | | Cleanup ext storage CRUD code, introduce storage config id | ||||
| * | | | | Introduce async status checking | Robin McCorkell | 2015-03-20 | 3 | -10/+9 |
| | | | | | |||||
| * | | | | Fix PHPDoc in files_external, add missing tag | Vincent Petry | 2015-03-17 | 8 | -25/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix various PHPDoc issues in external storage app. Added missing NoAdminRequired tag | ||||
| * | | | | Fix storage priority in JS unit test | Vincent Petry | 2015-03-16 | 1 | -3/+6 |
| | | | | | |||||
| * | | | | Fix PHPDoc for StoragesController | Vincent Petry | 2015-03-16 | 1 | -6/+9 |
| | | | | | |||||
| * | | | | Generate storage config ids when missing | Vincent Petry | 2015-03-16 | 8 | -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 tests | Vincent Petry | 2015-03-13 | 2 | -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 around | Vincent Petry | 2015-03-13 | 13 | -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 input | Robin McCorkell | 2015-03-12 | 2 | -0/+15 |
| | | | | | |||||
| * | | | | Use storage id + appframework for ext storage CRUD | Vincent Petry | 2015-03-12 | 29 | -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-master | Thomas Müller | 2015-03-20 | 2 | -1/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Handle session initialization errors and display error page | ||||
| * | | | | | Handle session initialization errors and display error page - fixes #15053 | Thomas Müller | 2015-03-20 | 2 | -1/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #15063 from owncloud/share-readonlyfile-permissions | Morris Jobke | 2015-03-20 | 2 | -3/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Do not automatically add "update" permission to shared mounts | ||||
| * | | | | | | Do not automatically add "update" permission to shared mounts | Vincent Petry | 2015-03-20 | 2 | -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-docker | Morris Jobke | 2015-03-20 | 1 | -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 available | Thomas Müller | 2015-03-20 | 1 | -26/+2 |
| | | | | | | |||||
| * | | | | | Oracle 11 XE is now fired up in a docker image - looks like we get back ↵ | Thomas Müller | 2015-03-17 | 1 | -3/+18 |
| | |/ / / | |/| | | | | | | | | | | | | | Oracle Testing on pull requests | ||||
* | | | | | Merge pull request #14993 from owncloud/stop-on-missing-deps | Thomas Müller | 2015-03-20 | 2 | -30/+41 |
|\ \ \ \ \ | | | | | | | | | | | | | Stop executing, when 3rdparty is missing or apps directory is invalid | ||||
| * | | | | | Do not add apps2/ directory if it does not exist | Joas Schilling | 2015-03-19 | 1 | -20/+20 |
| | | | | | | |||||
| * | | | | | Stop executing, when 3rdparty is missing or apps directory is invalid | Joas Schilling | 2015-03-18 | 1 | -10/+21 |
| | | | | | | |||||
* | | | | | | Merge pull request #15047 from owncloud/connect-failed-exception-message | Thomas Müller | 2015-03-20 | 1 | -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 db | Robin Appelman | 2015-03-20 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #15050 from owncloud/user-create-exists | Robin McCorkell | 2015-03-20 | 1 | -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 exists | Robin Appelman | 2015-03-20 | 1 | -0/+9 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #15046 from owncloud/exception-show-type | Robin McCorkell | 2015-03-20 | 2 | -0/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | show exception type in debug mode | ||||
| * | | | | | | | show exception type in debug mode | Robin Appelman | 2015-03-20 | 2 | -0/+2 |
| |/ / / / / / |