summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5857 from nextcloud/database-exception-cleanupMorris Jobke2017-07-242-13/+2
|\ | | | | Remove unneeded parameter in DatabaseException
| * Remove unneeded parameter in DatabaseExceptionMorris Jobke2017-07-242-13/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #5835 from nextcloud/cleanup_testing_appMorris Jobke2017-07-248-316/+333
|\ \ | | | | | | Cleanup testing app
| * | Proper DI for ILockingProviderRoeland Jago Douma2017-07-241-1/+3
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move over locking controllerRoeland Jago Douma2017-07-244-274/+303
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move over ConfigRoeland Jago Douma2017-07-242-50/+36
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move Application to AppInfoRoeland Jago Douma2017-07-242-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #5514 from nextcloud/assembly-stream-seekMorris Jobke2017-07-241-56/+32
|\ \ \ | | | | | | | | refactor chunked assembly stream
| * | | refactor chunked assembly streamRobin Appelman2017-07-211-56/+32
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #5855 from nextcloud/cleanup-legacy-user-classMorris Jobke2017-07-242-68/+2
|\ \ \ \ | | | | | | | | | | Cleanup legacy user class from unused methods
| * | | | Cleanup legacy user class from unused methodsMorris Jobke2017-07-242-68/+2
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #5854 from nextcloud/improve-personal-page-codeMorris Jobke2017-07-242-54/+3
|\ \ \ \ | | | | | | | | | | Cleanup code of personal page to use public interfaces
| * | | | Cleanup code of personal page to use public interfacesMorris Jobke2017-07-242-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_inspect2Morris Jobke2017-07-2429-99/+99
|\ \ \ \ | | | | | | | | | | More phpstorm inspection fixes
| * | | | More phpstorm inspection fixesRoeland Jago Douma2017-07-2429-99/+99
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #5845 from nextcloud/phpstorm_inspect3Morris Jobke2017-07-2423-51/+53
|\ \ \ \ | | | | | | | | | | Some app fixes of phpstorm inspections
| * | | | Some app fixes of phpstorm inspectionsRoeland Jago Douma2017-07-2423-51/+53
| | |/ / | |/| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #5850 from nextcloud/revert-5783-outlook-max-widthMorris Jobke2017-07-245-24/+6
|\ \ \ \ | |_|/ / |/| | | Revert 5783 outlook max width and add height="120"
| * | | Remove unneeded stylesMorris Jobke2017-07-245-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Adjust to height=120Lukas Reschke2017-07-245-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Revert "Set max-width of image to 100px in Outlook as well"Lukas Reschke2017-07-245-18/+0
| |/ /
* | | Merge pull request #5846 from nextcloud/fix_3186Roeland Jago Douma2017-07-241-1/+1
|\ \ \ | |/ / |/| | Move image-optimization.sh to build dir
| * | Move image-optimization.sh to build dirRoeland Jago Douma2017-07-241-1/+1
|/ / | | | | | | | | | | * We should not ship this! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #5783 from nextcloud/outlook-max-widthRoeland Jago Douma2017-07-245-0/+18
|\ \ | | | | | | Set max-width of image to 100px in Outlook as well
| * | Set max-width of image to 100px in Outlook as wellMorris Jobke2017-07-235-0/+18
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-07-2462-112/+484
| | |
* | | Merge pull request #5713 from nextcloud/datepicker-redesignMarius Blüm2017-07-236-4/+85
|\ \ \ | | | | | | | | Redesign jQuery UI datepicker
| * | | Fix font-weight for datepicker title.Marin Treselj2017-07-231-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | Make weekday names brighter, lighter month/year title.Marin Treselj2017-07-231-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | Make dates slightly larger and perfectly rounded.Marin Treselj2017-07-231-29/+21
| | | | | | | | | | | | | | | | | | | | | | | | SCSS cleanup, fix fringe cases, add margin between dates, un-bold title. Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | Remove deprecationMarin Treselj2017-07-231-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | Add padding to popoverMarin Treselj2017-07-231-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | Fixes issues mentioned in comments.Marin Treselj2017-07-232-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - [x] Highlight for selected date should be bold text. - [x] Hover highlight for day should be the same as for the selected date. - [x] Remove hover effect on the week. - [x] Row for days of the week should indeed stay, but non-bold and at 50% opacity so it doesn't take away the focus. - [x] Dates of previous and next months a bit lighter. - [x] Remove marking the weekend blue. - [x] The box centered below the date field, with triangle in the middle. Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | Redesign jQuery UI datepickerMarin Treselj2017-07-236-4/+87
| | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | | Merge pull request #5840 from nextcloud/phpstorm_inspectMorris Jobke2017-07-2313-181/+179
|\ \ \ \ | |/ / / |/| | | Some phpstorm inspection fixes
| * | | Some phpstorm inspection fixesRoeland Jago Douma2017-07-2213-181/+179
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-2334-130/+356
|/ / /
* | | Merge pull request #5812 from MrJeos/masterMorris Jobke2017-07-221-1/+1
|\ \ \ | | | | | | | | Fix for mb strlen
| * | | Fix for mb strlenArtem Kochnev2017-07-201-1/+1
| | | | | | | | | | | | Error with moving files with long names in UTF-8
* | | | Merge pull request #5827 from nextcloud/improve-public-share-headerMorris Jobke2017-07-222-4/+16
|\ \ \ \ | | | | | | | | | | Add filename and sharer in public page
| * | | | Add filename and sharer in public pageMorris Jobke2017-07-212-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shows the filename and sharer on the public page * allows the user to identify, that this is a user page and not an official page of the Nextcloud hosting * remove link on logo that redirects to login (fixes #5720) Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-2256-4/+162
| | | | |
* | | | | Merge pull request #5596 from nextcloud/mount-renameMorris Jobke2017-07-212-11/+14
|\ \ \ \ \ | | | | | | | | | | | | Fix renaming of non-renamble mounts
| * | | | | fix parsing of dav permissionsRobin Appelman2017-07-171-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | non movable mounts can not be movedRobin Appelman2017-07-171-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #5823 from nextcloud/improve-error-handlingMorris Jobke2017-07-213-13/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve error handling for accepting federated shares
| * | | | | | use OCSv2 to make sure that the error also arrives at the web front-endBjoern Schiessle2017-07-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | improved error handlingBjoern Schiessle2017-07-212-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check if table was updated successfully and only then send a notification mail and return "true". Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | Merge pull request #5785 from nextcloud/path-repair-steps-storageMorris Jobke2017-07-213-5/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Also repair storage id's when repairing invalid entries
| * | | | | | | Also repair storage id's when repairing invalid entriesRobin Appelman2017-07-213-5/+42
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>