summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not clear CSRF token on logout (fix for #1303)Roeland Jago Douma2017-03-131-0/+4
| | | | | | | | | | | | | | | | | | | This is a hacky way to allow the use case of #1303. What happens is 1. User tries to login 2. PreLoginHook kicks in and figures out that the user need to change their LDAP password or whatever => redirects user 3. While loading the redirect some logic of ours kicks in and logouts the user (thus clearing the session). 4. We render the new page but now the session and the page disagree about the CSRF token This is kind of hacky but I don't think it introduces new attack vectors. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #3828 from nextcloud/no-no-empty-wildcard-searchLukas Reschke2017-03-131-0/+4
|\ | | | | dont allow empty wildcard search
| * dont allow empty wildcard searchRobin Appelman2017-03-131-0/+4
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #3648 from nextcloud/sabre-3.2.2Lukas Reschke2017-03-133-9/+9
|\ \ | |/ |/| [3rdparty] Bump sabre/dav to 3.2.2
| * Make intergration tests work againRoeland Jago Douma2017-03-101-3/+3
| | | | | | | | | | | | The regex was to greedy Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix testsRoeland Jago Douma2017-03-101-6/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [3rdparty] Bump sabre/dav to 3.2.2Roeland Jago Douma2017-03-101-0/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #3822 from nextcloud/webui-upoad-no-mtimeRobin Appelman2017-03-131-5/+0
|\ \ | | | | | | dont preserve mtime when uploading trough the web interface
| * | dont preserve mtime when uploading trough the web interfaceRobin Appelman2017-03-131-5/+0
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #3814 from nextcloud/oc-27328-delay-language-initialisationRoeland Jago Douma2017-03-135-59/+59
|\ \ \ | | | | | | | | use closure to properly defer l10n initialization (#27328)
| * | | use closure to properly defer l10n initialization (#27328)Jörn Friedrich Dreyer2017-03-135-59/+59
| | | |
* | | | Merge pull request #3819 from nextcloud/dont-add-user-to-subadminRoeland Jago Douma2017-03-131-1/+1
|\ \ \ \ | |_|/ / |/| | | Call right function after sudo mode
| * | | Call right function after sudo modeLukas Reschke2017-03-131-1/+1
| |/ / | | | | | | | | | | | | | | | This should call the `applyGroupSelect` and not the `applySubadminSelect`. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #3780 from GitHubUser4234/audit_log_agentLukas Reschke2017-03-131-0/+3
|\ \ \ | | | | | | | | Audit log the User-Agent
| * | | author updateRoger Szabo2017-03-101-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | improvement of userAgent variable assigmentRoger Szabo2017-03-101-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | log user agent globally insteadRoger Szabo2017-03-102-4/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | audit log the user-agentRoger Szabo2017-03-091-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | | | Merge pull request #3803 from Thijsdh/masterLukas Reschke2017-03-131-0/+6
|\ \ \ \ | |_|/ / |/| | | Create app password by pressing enter
| * | | Create app password by pressing enterThijs den Hartog2017-03-131-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Thijs den Hartog <Thijs@thijsbeer.nl>
* | | | Merge pull request #3772 from nextcloud/favorite-searchMorris Jobke2017-03-137-23/+155
|\ \ \ \ | | | | | | | | | | Allow searching for favorites
| * | | | Allow searching for favoritesRobin Appelman2017-03-087-23/+155
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-1318-6/+92
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-1230-50/+246
| |/ / / |/| | |
* | | | Merge pull request #3739 from fti7/masterLukas Reschke2017-03-111-0/+1
|\ \ \ \ | | | | | | | | | | Serve robots.txt if the RewriteBase is configured
| * | | | Serve robots.txt if the RewriteBase is configuredFrank Isemann2017-03-061-0/+1
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-1118-78/+160
| | | | |
* | | | | Merge pull request #3798 from nextcloud/fix-loginMorris Jobke2017-03-101-0/+13
|\ \ \ \ \ | | | | | | | | | | | | Fix login page, because only guest.css is loaded now
| * | | | | Fix login page, because only guest.css is loaded nowMorris Jobke2017-03-101-0/+13
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3755 from nextcloud/scan-tipstricksLukas Reschke2017-03-101-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Add security scan to tips & tricks section
| * | | | Add security scan to tips & tricks sectionMarius Blüm2017-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | | Merge pull request #3774 from artem-sidorenko/posix-exit-1Lukas Reschke2017-03-101-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Exit with error code if posix ext missing or wrong user
| * | | | | Exit with error code if posix ext missing or wrong userArtem Sidorenko2017-03-081-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | similar to the console.php
* | | | | Merge pull request #3778 from nextcloud/verify_jpg_filesLukas Reschke2017-03-101-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Test if a file is a valid jpg file
| * | | | | Test is a file is a valid jpg fileRoeland Jago Douma2017-03-081-1/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During preview generation if we provide an invalid JPG file the system errors out with a PHP Fatal Error. Now we can't catch Fatal Errors (in 5.6). I suspect that exif_imagetype to fall back to the extention. However a valid jpg file has a size. So we request the size of the image and just drop out if that returns false. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #3787 from nextcloud/ocs-cookieLukas Reschke2017-03-102-0/+28
|\ \ \ \ \ | | | | | | | | | | | | dont require strict same site cookies for ocs requests
| * | | | | add test for skipping cookie checks for ocsRobin Appelman2017-03-101-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | dont require strict same site cookies for ocs requestsRoeland Jago Douma2017-03-091-0/+3
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #3793 from stefan-squareweave/masterLukas Reschke2017-03-102-2/+7
|\ \ \ \ \ | | | | | | | | | | | | Correct incorrectly typed X-OC-Mtime header
| * | | | | Correct incorrectly typed X-OC-Mtime headerStefan Schneider2017-03-102-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Schneider <stefan.schneider@squareweave.com.au>
* | | | | | Merge pull request #3794 from nextcloud/fix_2739Lukas Reschke2017-03-101-19/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | MP3 without cover don't get a preview
| * | | | | MP3 without cover don't get a previewRoeland Jago Douma2017-03-101-19/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #2739 It tries to create an image from an SVG file. Which we don't support. So this fails and prints an log line. Then we fall back anyways to the 404 and fetch the default icon. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #3690 from nextcloud/cleanup-legacy-groups-classMorris Jobke2017-03-0913-548/+141
|\ \ \ \ \ | | | | | | | | | | | | Remove legacy class OC_Group and OC_User
| * | | | | Remove legacy class OC_Group and OC_UserMorris Jobke2017-03-0913-548/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * basically a straight replacement of the wrapped code at the calling code parts Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-1014-90/+318
|/ / / / /
* | | | | Merge pull request #3791 from nextcloud/combine_sassLukas Reschke2017-03-097-14/+30
|\ \ \ \ \ | | | | | | | | | | | | Combine sass
| * | | | | Add more styles to the server.scssMorris Jobke2017-03-096-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | [PoC] combine 2 scss files!Roeland Jago Douma2017-03-092-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Allow using import in sass filesRoeland Jago Douma2017-03-091-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to combine multiple sass files that we have to always load together anyway. Fixes #3389 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #3693 from nextcloud/get-user-folder-of-correct-userRoeland Jago Douma2017-03-093-51/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | Get the user folder of the correct user for mention notifications
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 19:30:10 +0000