Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5864 from nextcloud/legacy_user | Lukas Reschke | 2017-07-25 | 4 | -93/+2 |
|\ | | | | | Remove legacy OC_User_Backend and OC_User_Interface | ||||
| * | Fix comments | Morris Jobke | 2017-07-25 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | Remove legacy OC_User_Backend and OC_User_Interface | Roeland Jago Douma | 2017-07-24 | 3 | -92/+1 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #5836 from nextcloud/preview_update | Lukas Reschke | 2017-07-25 | 1 | -1/+7 |
|\ \ | | | | | | | Empty search no longer works | ||||
| * | | Empty search no longer works | Roeland Jago Douma | 2017-07-24 | 1 | -1/+7 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | "Only variables must be passed by reference" | Joas Schilling | 2017-07-25 | 1 | -2/+4 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Use order by to avoid problems when chunking finds a same item again... | Joas Schilling | 2017-07-25 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Remove generate change script which doesnt work with migrations anymore | Joas Schilling | 2017-07-25 | 2 | -2/+0 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Fix autoloader | Morris Jobke | 2017-07-25 | 2 | -0/+4 |
| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Install from migrations | Joas Schilling | 2017-07-25 | 6 | -25/+4 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #5863 from nextcloud/pimp_l10n_string | Lukas Reschke | 2017-07-25 | 7 | -9/+19 |
|\ \ \ | | | | | | | | | Move \OC_L10N_String to proper namespace | ||||
| * | | | Update autoloader | Roeland Jago Douma | 2017-07-24 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Move \OC_L10N_String to proper \OC\L10N\L10NString | Roeland Jago Douma | 2017-07-24 | 5 | -9/+17 |
| | |/ | |/| | | | | | | | | | | | | | | | | * Proper namespacing * Fixed phpdocs Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* / | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-25 | 4 | -2/+44 |
|/ / | |||||
* | | Merge pull request #5857 from nextcloud/database-exception-cleanup | Morris Jobke | 2017-07-24 | 2 | -13/+2 |
|\ \ | | | | | | | Remove unneeded parameter in DatabaseException | ||||
| * | | Remove unneeded parameter in DatabaseException | Morris Jobke | 2017-07-24 | 2 | -13/+2 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #5835 from nextcloud/cleanup_testing_app | Morris Jobke | 2017-07-24 | 1 | -1/+3 |
|\ \ | | | | | | | Cleanup testing app | ||||
| * | | Proper DI for ILockingProvider | Roeland Jago Douma | 2017-07-24 | 1 | -1/+3 |
| |/ | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #5855 from nextcloud/cleanup-legacy-user-class | Morris Jobke | 2017-07-24 | 1 | -67/+1 |
|\ \ | | | | | | | Cleanup legacy user class from unused methods | ||||
| * | | Cleanup legacy user class from unused methods | Morris Jobke | 2017-07-24 | 1 | -67/+1 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #5854 from nextcloud/improve-personal-page-code | Morris Jobke | 2017-07-24 | 2 | -54/+3 |
|\ \ | | | | | | | Cleanup code of personal page to use public interfaces | ||||
| * | | Cleanup code of personal page to use public interfaces | Morris Jobke | 2017-07-24 | 2 | -54/+3 |
| |/ | | | | | | | | | | | | | * public interfaces instead of static code calls * drop static private namespace methods Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #5844 from nextcloud/phpstorm_inspect2 | Morris Jobke | 2017-07-24 | 29 | -99/+99 |
|\ \ | | | | | | | More phpstorm inspection fixes | ||||
| * | | More phpstorm inspection fixes | Roeland Jago Douma | 2017-07-24 | 29 | -99/+99 |
| |/ | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Remove unneeded styles | Morris Jobke | 2017-07-24 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Adjust to height=120 | Lukas Reschke | 2017-07-24 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | Revert "Set max-width of image to 100px in Outlook as well" | Lukas Reschke | 2017-07-24 | 1 | -3/+0 |
|/ | |||||
* | Merge pull request #5783 from nextcloud/outlook-max-width | Roeland Jago Douma | 2017-07-24 | 1 | -0/+3 |
|\ | | | | | Set max-width of image to 100px in Outlook as well | ||||
| * | Set max-width of image to 100px in Outlook as well | Morris Jobke | 2017-07-23 | 1 | -0/+3 |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-24 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #5713 from nextcloud/datepicker-redesign | Marius Blüm | 2017-07-23 | 1 | -1/+1 |
|\ \ | | | | | | | Redesign jQuery UI datepicker | ||||
| * | | Redesign jQuery UI datepicker | Marin Treselj | 2017-07-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
* | | | Merge pull request #5840 from nextcloud/phpstorm_inspect | Morris Jobke | 2017-07-23 | 13 | -181/+179 |
|\ \ \ | |/ / |/| | | Some phpstorm inspection fixes | ||||
| * | | Some phpstorm inspection fixes | Roeland Jago Douma | 2017-07-22 | 13 | -181/+179 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-23 | 2 | -0/+4 |
|/ / | |||||
* | | Merge pull request #5812 from MrJeos/master | Morris Jobke | 2017-07-22 | 1 | -1/+1 |
|\ \ | | | | | | | Fix for mb strlen | ||||
| * | | Fix for mb strlen | Artem Kochnev | 2017-07-20 | 1 | -1/+1 |
| | | | | | | | | | Error with moving files with long names in UTF-8 | ||||
* | | | Merge pull request #5596 from nextcloud/mount-rename | Morris Jobke | 2017-07-21 | 1 | -8/+12 |
|\ \ \ | | | | | | | | | Fix renaming of non-renamble mounts | ||||
| * | | | non movable mounts can not be moved | Robin Appelman | 2017-07-17 | 1 | -8/+12 |
| | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | Merge pull request #5785 from nextcloud/path-repair-steps-storage | Morris Jobke | 2017-07-21 | 2 | -5/+8 |
|\ \ \ \ | | | | | | | | | | | Also repair storage id's when repairing invalid entries | ||||
| * | | | | Also repair storage id's when repairing invalid entries | Robin Appelman | 2017-07-21 | 2 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | | Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domain | Lukas Reschke | 2017-07-21 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix error message on untrusted domain error page | ||||
| * | | | | Fix error message on untrusted domain error page | Morris Jobke | 2017-07-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5347 Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | | Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixes | Roeland Jago Douma | 2017-07-21 | 3 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | Minor documentation fixes | ||||
| * | | | | Minor typos | Marcel Waldvogel | 2017-07-21 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de> | ||||
* | | | | | Merge pull request #5802 from nextcloud/rm_dep_controller_functions | Lukas Reschke | 2017-07-21 | 1 | -105/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove deprecated Controller Functions | ||||
| * | | | | | Remove deprecated Controller Functions | Roeland Jago Douma | 2017-07-20 | 1 | -105/+1 |
| | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | | Merge pull request #5818 from nextcloud/ocs_privatedata | Roeland Jago Douma | 2017-07-21 | 5 | -146/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | PrivateData to app | ||||
| * | | | | PrivateData to app | Roeland Jago Douma | 2017-07-21 | 5 | -146/+0 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * PrivateData is an app now: https://github.com/nextcloud/privatedata * No need to load the OCS routes.php (as there is none!) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | Merge pull request #5797 from paulijar/share20-postUnshareFromSelf | Morris Jobke | 2017-07-21 | 2 | -0/+17 |
|\ \ \ \ | | | | | | | | | | | Dispatch event postUnshareFromSelf when the recipient of a share unshares it |