summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3600 from coletivoEITA/masterRoeland Jago Douma2017-03-144-2/+18
|\ | | | | added method needsPartFile() in Storage
| * added method needsPartFile() in StorageVinicius Cubas Brand2017-03-144-2/+18
| | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
* | Merge pull request #3783 from andrius-kulbis/masterRoeland Jago Douma2017-03-141-1/+2
|\ \ | | | | | | Fix deleted objectstore shares
| * | Fix detecting deleted shares in object storeAndrius2017-03-091-1/+2
| | | | | | | | | While using the object store, the shares, that are moved to trashbin were still detected as accessible and cause broken shares to be shown in file/folder listing.
* | | Merge pull request #3824 from nextcloud/dav-search-getlastmodifiedRobin Appelman2017-03-142-3/+9
|\ \ \ | | | | | | | | fix searching and ordering on getlastmodified
| * | | safer casting of datetimeRobin Appelman2017-03-141-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | fix unit testMorris Jobke2017-03-131-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | fix searching and ordering on getlastmodifiedRobin Appelman2017-03-131-2/+4
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-1414-198/+266
| | | |
* | | | Merge pull request #3827 from ↵Morris Jobke2017-03-132-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/issue-3826-remove-double-password-confirmation Remove the double password confirmation on changing cron
| * | | | Remove the double password confirmation on changing cronJoas Schilling2017-03-132-3/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | 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>