summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3589 from nextcloud/remove-unneeded-repair-stepMorris Jobke2017-02-2329-3284/+19
|\ | | | | Remove unneeded repair steps
| * cleanup old and not needed repair steps to speed up the updateMorris Jobke2017-02-2228-3192/+19
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Remove unneeded UpdateCertificateStore.Morris Jobke2017-02-223-92/+0
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #3576 from robert-scheck/timezoneMorris Jobke2017-02-231-5/+0
|\ \ | | | | | | According to issue #3553, the default logtimezone is always UTC
| * | According to issue #3553, the default logtimezone is always UTCRobert Scheck2017-02-231-5/+0
| | | | | | | | | | | | Signed-off-by: Robert Scheck <robert@fedoraproject.org>
* | | Merge pull request #2602 from ↵Lukas Reschke2017-02-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/resize-the-controls-after-the-sidebar-slided-in Increase debounce time to make sure controls are resized after the sidebar disappeared
| * | | Increase debounce time to make sure controls are resized after the sidebar ↵Marius Blüm2017-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | disappeared Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | Merge pull request #3590 from individual-it/correct_text_when_disabling_appLukas Reschke2017-02-231-1/+2
|\ \ \ \ | | | | | | | | | | show correct text when disabling App
| * | | | show correct text when disabling App Artur Neumann2017-02-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during the process of disabling an App the button would show "Enabling app …" This is corrected by this patch Signed-off-by: Artur Neumann <info@individual-it.net>
* | | | | Merge pull request #3575 from nextcloud/better-thumbnail-qualityJoas Schilling2017-02-232-16/+49
|\ \ \ \ \ | |_|_|_|/ |/| | | | Use 90% JPEG quality for thumbnails and previews by default
| * | | | Fix code quality a bitJoas Schilling2017-02-221-13/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Use 90% JPEG quality for thumbnails and previews by defaultJoas Schilling2017-02-222-4/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-2384-80/+172
| | | | |
* | | | | Merge pull request #3580 from nextcloud/password-reset-wordingMorris Jobke2017-02-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | detail wording: password reset instead of recovery
| * | | | | detail wording: password reset instead of recoveryJan-Christoph Borchardt2017-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #3567 from nextcloud/autocomplete-settingsBjörn Schießle2017-02-225-32/+101
|\ \ \ \ \ \ | |/ / / / / |/| | | | | some sharing settings
| * | | | | fix typoBjoern Schiessle2017-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | use (int) instead of intval for performance reasonsBjoern Schiessle2017-02-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | properly include classMorris Jobke2017-02-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Use intval() for validation of config optionsMorris Jobke2017-02-213-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Improve the UX for sharing settingsMorris Jobke2017-02-213-9/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shows a info when list is potentially truncated * shows a warning when characters length is not enough Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | allow to configure a min-length of search strings for auto-compeltion and a ↵Bjoern Schiessle2017-02-212-19/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | max number for of results returned Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | Merge pull request #3418 from nextcloud/add-groups-to-userinfoLukas Reschke2017-02-222-3/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | add groups to user info output
| * | | | | | add groups to user info outputBjoern Schiessle2017-02-092-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | Merge pull request #3573 from ↵Lukas Reschke2017-02-221-1/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/correctly-catch-the-exception-from-pathinfo Catch exception from path info
| * | | | | | Catch exception from path infoJoas Schilling2017-02-221-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't really care when the path info can not be gathered correctly. we will simply not use SCSS then but the CSS fallback. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #3570 from nextcloud/fix-share-loadingJohn Molakvoæ2017-02-221-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix position of share autocomplete loading icon
| * | | | | | | Fix position of share autocomplete loading iconMorris Jobke2017-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | Merge pull request #3413 from nextcloud/theming-appdataLukas Reschke2017-02-226-100/+378
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move theming images to AppData
| * | | | | | | | Add test for creating AppData folderJulius Haertl2017-02-201-13/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | | | | | Use createMockJulius Haertl2017-02-162-46/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | | | | | Use ::class in tests and correct importJulius Haertl2017-02-163-28/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | | | | | Add tests for theming migration stepJulius Haertl2017-02-162-7/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | | | | | Adapt ThemingController testsJulius Haertl2017-02-161-52/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | | | | | Add repair step to move existing theming imagesJulius Haertl2017-02-162-1/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | | | | | Move theming images to AppDataJulius Haertl2017-02-162-26/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | | | | | | | Merge pull request #3566 from nextcloud/setUpScenario1Lukas Reschke2017-02-225-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use clearer name setUpScenario
| * | | | | | | | | Use clearer name setUpScenarioPhil Davis2017-02-215-5/+5
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Phil Davis <phil.davis@inf.org>
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-2264-150/+326
| | | | | | | | |
* | | | | | | | | Merge pull request #3568 from nextcloud/fix-pdfviewer-marginMorris Jobke2017-02-211-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix bottom margin of shared pdfviewer links
| * | | | | | | | | fix bottom margin of shared pdfviewer linksJan-Christoph Borchardt2017-02-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | | | Merge pull request #3557 from marncz/masterJohn Molakvoæ2017-02-211-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Fixed path in other folders search
| * | | | | | | | | Fixed path in other folders searchMarcin2017-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marcin Czarnecki <marcin.czarnecki@protonmail.com>
* | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-2158-106/+244
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3521 from nextcloud/ldap-fix-uuid-attr-detectionLukas Reschke2017-02-2020-43/+895
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Borken UUID Attribute Detection
| * | | | | | | | | add tests to DB groupArthur Schiwon2017-02-172-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | | Background jobs can take 4k of characters only. We find a good batch size.Arthur Schiwon2017-02-175-18/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | | Add repair stepsArthur Schiwon2017-02-1714-2/+710
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | | add integration test for uuid attr detectionArthur Schiwon2017-02-172-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | | Fix determining the UUID attribute, default of the override is nullArthur Schiwon2017-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>