Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14857 from owncloud/preview-provider-registration-in-manager | Thomas Müller | 2015-03-20 | 4 | -8/+215 |
|\ | | | | | 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 | ||||
| * | Create an interface for OC_Image and OCP\Image for the public API | Joas Schilling | 2015-03-16 | 4 | -6/+197 |
| | | |||||
| * | Add more type hinting | Joas Schilling | 2015-03-16 | 2 | -2/+2 |
| | | |||||
| * | Add an interface for the preview providers | Joas Schilling | 2015-03-16 | 1 | -0/+41 |
| | | |||||
| * | Clean up some docs | Joas Schilling | 2015-03-16 | 1 | -3/+3 |
| | | |||||
| * | Move default provider registration to preview manager | Joas Schilling | 2015-03-16 | 1 | -0/+12 |
| | | |||||
| * | Register preview providers on the preview manager instead of OC\Preview | Joas Schilling | 2015-03-16 | 1 | -2/+12 |
| | | |||||
* | | 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 #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 | 2 | -2/+10 |
|\ \ \ | |/ / |/| | | pass mountpoint to storage wrapper callback | ||||
| * | | Allow getting all mount options as array | Robin Appelman | 2015-03-11 | 1 | -0/+7 |
| | | | |||||
| * | | pass mountpoint to storage wrapper callback | Robin Appelman | 2015-03-11 | 1 | -2/+3 |
| | | | |||||
* | | | Use a closure for the files app entry and deprecate old methods | Joas Schilling | 2015-03-17 | 1 | -5/+12 |
| | | | |||||
* | | | Merge pull request #14931 from ↵ | Lukas Reschke | 2015-03-17 | 1 | -2/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/issue/14881-closures-for-navigation-entries Issue/14881 closures for navigation entries | ||||
| * | | | Allow registering closures for navigation entries | Joas Schilling | 2015-03-16 | 1 | -2/+5 |
| | |/ | |/| | | | | | | | | | | This speeds up all pages that don't use the navigation by 0.04sec per app, because we don't need to create the routing anymore, unless we really need to. | ||||
* | | | Merge pull request #12085 from owncloud/add-swift-mailer | Lukas Reschke | 2015-03-17 | 3 | -6/+98 |
|\ \ \ | | | | | | | | | Migrate OC_Mail to SwiftMailer | ||||
| * | | | Don't fallback to Plaintext per default for legacy class | Lukas Reschke | 2015-03-16 | 1 | -6/+15 |
| | | | | |||||
| * | | | Incorporate review changes | Lukas Reschke | 2015-03-16 | 3 | -27/+10 |
| | | | | |||||
| * | | | Migrate to SwiftMail | Lukas Reschke | 2015-03-16 | 4 | -5/+105 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly. Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014 Conflicts: 3rdparty lib/private/server.php lib/public/iservercontainer.php tests/lib/mail.php tests/settings/controller/mailsettingscontrollertest.php Conflicts: 3rdparty lib/private/mail.php lib/private/server.php lib/public/iservercontainer.php settings/ajax/lostpassword.php settings/application.php | ||||
* | | | | Also add a note that clob does not work in the compare array | Joas Schilling | 2015-03-16 | 1 | -0/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #14766 from owncloud/fix-insertifnotexists-poc | Morris Jobke | 2015-03-16 | 2 | -32/+18 |
|\ \ \ | | | | | | | | | Allow specifying the compare-array for insertIfNotExists() | ||||
| * | | | Fix doc blocks of insertIfNotExists() method | Joas Schilling | 2015-03-11 | 2 | -30/+16 |
| | | | | |||||
| * | | | let insertIfNotExist() throw the native DBALException - no need to hide the ↵ | Thomas Müller | 2015-03-09 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | real exception | ||||
| * | | | Allow specifying the compare-array for insertIfNotExists() | Joas Schilling | 2015-03-09 | 2 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #14776 from owncloud/fix-14629-master | Thomas Müller | 2015-03-16 | 1 | -0/+34 |
|\ \ \ \ | |_|/ / |/| | | | verify the file name length not to exceed 255 characters + verify path d... | ||||
| * | | | verify the file name length not to exceed 255 characters + verify path ↵ | Thomas Müller | 2015-03-12 | 1 | -0/+34 |
| | | | | | | | | | | | | | | | | during rename | ||||
* | | | | Can also be null | Lukas Reschke | 2015-03-13 | 1 | -1/+1 |
|/ / / | | | | | | | | | | If the user does not exist this returns null and can lead to nasty bugs since the IDE is not indicating this... | ||||
* | / | Avatar controller moved to AppFrameWork | Roeland Jago Douma | 2015-03-11 | 2 | -1/+78 |
| |/ |/| | | | | | | | | | | | | | * Original avatarcontroller migrated to the appframework * Added DataDisplayResponse that show data inline in the browser (used to retrun the image) * Removed some unneeded code * Added unit tests for the avatarcontroller | ||||
* | | Merge pull request #14346 from owncloud/storage-based-path-validation | Lukas Reschke | 2015-03-10 | 4 | -0/+84 |
|\ \ | | | | | | | adding storage specific filename verification | ||||
| * | | no translation service in common storage class | Thomas Müller | 2015-03-09 | 2 | -0/+74 |
| | | | |||||
| * | | deprecate isValidFileName() | Thomas Müller | 2015-03-09 | 1 | -0/+1 |
| | | | |||||
| * | | adding storage specific filename verification - refs #13640 | Thomas Müller | 2015-03-09 | 1 | -0/+9 |
| |/ | |||||
* | | Merge pull request #14534 from owncloud/add-child-src | Thomas Müller | 2015-03-10 | 1 | -0/+17 |
|\ \ | |/ |/| | Add support for 'child-src' directive | ||||
| * | Add support for 'child-src' directive | Lukas Reschke | 2015-02-28 | 1 | -0/+17 |
| | | | | | | | | | | | | This is required when working with stuff such as PDF.js in the files_pdfviewer application. Opt-in only. Master change only because the stable CSP policies has a failback that allows nearly anything :see_no_evil: | ||||
* | | Fix PHPDoc | Lukas Reschke | 2015-03-04 | 2 | -2/+2 |
| | | | | | | | | That apparently went lost when changing the signature. | ||||
* | | Fix the behaviour of getLanguageCode() to match the expectation of the name | Joas Schilling | 2015-03-03 | 1 | -9/+3 |
|/ | |||||
* | Merge pull request #13616 from owncloud/streamresponse | Bernhard Posselt | 2015-02-27 | 3 | -0/+133 |
|\ | | | | | AppFramework StreamResponse | ||||
| * | AppFramework StreamResponse | Bernhard Posselt | 2015-02-27 | 3 | -0/+133 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First stab at the StreamResponse, see #12988 The idea is to use an interface ICallbackResponse (I'm not 100% happy with the name yet, suggestions?) that allow the response to output things in its own way, for instance stream the file using readfile Unittests are atm lacking, plan is to check if a mock of ICallbackResponse will be used by calling its callback (also unhappy with this name) method Usage is: $response = new StreamResponse('path/to/file'); rename io to output, add additional methods and handle error and not modified cases when using StreamResponse fix indention and uppercasing, also handle forbidden cases fix indention fix indention no forbidden, figuring out if a file is really readable is too complicated to get to work across OSes and streams remove useless import remove useless import fix intendation | ||||
* | | Add "throws" lines to calling methods and interface aswell | Joas Schilling | 2015-02-27 | 1 | -0/+18 |
|/ | |||||
* | Merge pull request #14530 from owncloud/revert-14403 | Thomas Müller | 2015-02-27 | 123 | -1887/+1652 |
|\ | | | | | Revert "Updating license headers" | ||||
| * | Revert "Updating license headers" | Morris Jobke | 2015-02-26 | 123 | -1887/+1652 |
| | | | | | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36. | ||||
* | | Merge pull request #14300 from owncloud/commandbus | Morris Jobke | 2015-02-26 | 3 | -0/+46 |
|\ \ | |/ |/| | Add async command system to handle asynchronous operations | ||||
| * | Rename getAsyncCommandBus to getCommandBus | Robin Appelman | 2015-02-25 | 1 | -1/+1 |
| | | |||||
| * | Allow apps to determine which commands should be run synchronous based on ↵ | Robin Appelman | 2015-02-25 | 1 | -0/+7 |
| | | | | | | | | traints | ||||
| * | Add async command system to handle asynchronous operations | Robin Appelman | 2015-02-25 | 3 | -0/+39 |
| | | |||||
* | | owncloud -> ownCloud | Thomas Müller | 2015-02-25 | 1 | -1/+1 |
| | | |||||
* | | deprecate getters for deprecated class | Bernhard Posselt | 2015-02-25 | 1 | -1/+2 |
| | |