Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14862 from owncloud/introduce-shipped.json-master | Morris Jobke | 2015-03-23 | 2 | -6/+33 |
|\ | | | | | shipped apps are now defined in core/shipped.json - the shipped tag in i... | ||||
| * | Add spaces | Morris Jobke | 2015-03-16 | 1 | -1/+1 |
| | | |||||
| * | [WIP] upgrade app store apps during console upgrade | Thomas Müller | 2015-03-13 | 1 | -1/+21 |
| | | |||||
| * | shipped apps are now defined in core/shipped.json - the shipped tag in ↵ | Thomas Müller | 2015-03-13 | 1 | -5/+12 |
| | | | | | | | | info.xml is ignored from now on - never trust an app :speak_no_evil: | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-23 | 2 | -6/+8 |
| | | |||||
* | | Merge pull request #15088 from oparoz/3d-support | Morris Jobke | 2015-03-22 | 2 | -21/+36 |
|\ \ | | | | | | | Introducing 3D images support (media type) | ||||
| * | | Introducing 3D images support (media type) | Olivier Paroz | 2015-03-20 | 2 | -21/+36 |
| | | | | | | | | | | | | | | | So that people with 3D images can at least see a 2D picture Full 3D support is possible via an app | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-22 | 2 | -0/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-21 | 16 | -8/+138 |
|/ / | |||||
* | | Merge pull request #14857 from owncloud/preview-provider-registration-in-manager | Thomas Müller | 2015-03-20 | 13 | -262/+539 |
|\ \ | | | | | | | 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 | ||||
| * | | Only register the core providers when necessary | Joas Schilling | 2015-03-16 | 1 | -6/+13 |
| | | | |||||
| * | | Create an interface for OC_Image and OCP\Image for the public API | Joas Schilling | 2015-03-16 | 11 | -24/+215 |
| | | | |||||
| * | | 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 |
| | | | |||||
* | | | 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 #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 |
| | | | | | |||||
* | | | | | Do not automatically add "update" permission to shared mounts | Vincent Petry | 2015-03-20 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #14993 from owncloud/stop-on-missing-deps | Thomas Müller | 2015-03-20 | 1 | -10/+21 |
|\ \ \ \ | | | | | | | | | | | Stop executing, when 3rdparty is missing or apps directory is invalid | ||||
| * | | | | 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 #15046 from owncloud/exception-show-type | Robin McCorkell | 2015-03-20 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | show exception type in debug mode | ||||
| * | | | | | | show exception type in debug mode | Robin Appelman | 2015-03-20 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #15035 from owncloud/assocmapper | Morris Jobke | 2015-03-20 | 1 | -19/+36 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | If the execute method on the mapper receives an assoc array, it binds by... | ||||
| * | | | | | If the execute method on the mapper receives an assoc array, it binds by ↵ | Bernhard Posselt | 2015-03-19 | 1 | -19/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | value instead of index | ||||
* | | | | | | Merge pull request #14947 from oparoz/repairmimetypes-sql | Morris Jobke | 2015-03-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Make repairmimetypes compatible with case sensitive SQL backends | ||||
| * | | | | | Make repairmimetypes compatible with case sensitive SQL backends | Olivier Paroz | 2015-03-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change for #14132 Just a word of warning, ILIKE seems to be a Doctrine only clause. The statements are thus not portable. | ||||
* | | | | | | Merge pull request #15025 from rullzer/ocs_respect_enforced_date | Thomas Müller | 2015-03-19 | 1 | -1/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Ocs respect enforced date | ||||
| * | | | | | | When the expiration date is enforced respect this | Roeland Jago Douma | 2015-03-19 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we do not allow removing of the expiration date when this is enforced in the settings. | ||||
* | | | | | | | Merge pull request #14986 from owncloud/fixmapperbackw | Thomas Müller | 2015-03-19 | 1 | -3/+17 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix backwards compatibility for mapper execute method | ||||
| * | | | | | | | also use backwards compatible method for mapper | Bernhard Posselt | 2015-03-18 | 1 | -1/+6 |
| | | | | | | | | |||||
| * | | | | | | | fix backwards compatibility for mapper execute method | Bernhard Posselt | 2015-03-18 | 1 | -2/+11 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #14704 from owncloud/storage-wrapper-mount | Robin Appelman | 2015-03-19 | 7 | -12/+64 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | pass mountpoint to storage wrapper callback | ||||
| * | | | | | | | fix factory test | Robin Appelman | 2015-03-11 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | Allow setting the watcher policy as mount option | Robin Appelman | 2015-03-11 | 2 | -1/+9 |
| | | | | | | | | |||||
| * | | | | | | | Copy mount options to the storage | Robin Appelman | 2015-03-11 | 3 | -1/+27 |
| | | | | | | | | |||||
| * | | | | | | | Allow getting all mount options as array | Robin Appelman | 2015-03-11 | 2 | -0/+16 |
| | | | | | | | | |||||
| * | | | | | | | pass mountpoint to storage wrapper callback | Robin Appelman | 2015-03-11 | 3 | -10/+13 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #14980 from owncloud/fix-fileglobalgc | Thomas Müller | 2015-03-19 | 1 | -3/+7 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Fix fileglobalgc unlink parameter warnings |