summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add warning on admin screen when set_time_limit is unavailableKo-2017-03-162-0/+23
|
* Check that set_time_limit is not disabled before calling itKo-2017-03-118-8/+25
| | | | Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
* 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
| * | | | | Get the user folder of the correct userJoas Schilling2017-03-093-51/+68
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3621 from kuimovvg/masterRoeland Jago Douma2017-03-091-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | don't setted status when file is lock
| * | | | | don't setted status when file is lockvkuimov2017-02-251-0/+1
| | | | | |
* | | | | | Merge pull request #3785 from nextcloud/bump_autoloaderMorris Jobke2017-03-092-4/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bump autoloader
| * | | | | | Bump autoloaderRoeland Jago Douma2017-03-092-4/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Composer was updated so lets update the autoloader Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #3611 from nextcloud/announce-trsuted-server-endpointsBjörn Schießle2017-03-093-2/+95
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Announce trusted server endpoints
| * | | | | add and adjust unit testsBjoern Schiessle2017-03-091-2/+64
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | announce public endpoints to sync trusted serversBjoern Schiessle2017-03-091-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | add new routes for trusted servers which are more align with the other ↵Bjoern Schiessle2017-03-091-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | end-points Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | Merge pull request #3754 from trustelem/user_saml-samesite-excludeLukas Reschke2017-03-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Extend Same Site cookie user_saml exemption rule
| * | | | | | Extend Same Site cookie user_saml exemption ruleVincent Vanackere2017-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current check does not trigger if $request->getRequestUri() does not return index.php as a prefix (on my config this was occuring using nginx to serve Nextcloud) Signed-off-by: Vincent Vanackere <vincent.vanackere@trustelem.com>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-0912-2/+106
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #3360 from nextcloud/dav-searchRobin Appelman2017-03-0826-25/+1598
|\ \ \ \ \ \ | | | | | | | | | | | | | | Implement webdav SEARCH
| * | | | | | update 3rdparty submoduleMorris Jobke2017-03-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | autoloaderRobin Appelman2017-03-012-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | add tests for filesearchbackendRobin Appelman2017-03-013-7/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | add tests for searchQueryRobin Appelman2017-03-012-15/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | Implement webdav SEARCHRobin Appelman2017-03-0118-33/+609
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | add icewind/searchdavRobin Appelman2017-02-2813-0/+631
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #3757 from nextcloud/issue-2887-no-subsystem-for-lockingRoeland Jago Douma2017-03-082-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add new user agent of windows 10 dav backend
| * | | | | | | Set a status code when setting a bodyJoas Schilling2017-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Add new user agent of windows 10 dav backendJoas Schilling2017-03-071-0/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks Microsoft Signed-off-by: Joas Schilling <coding@schilljs.com>