summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* v9.0.53v9.0.53Lukas Reschke2016-08-011-2/+2
|
* Merge pull request #310 from nextcloud/version-numberv9.0.52Lukas Reschke2016-07-051-2/+2
|\ | | | | Increase version to 9.0.52
| * Increase version to 9.0.52Lukas Reschke2016-07-051-2/+2
|/
* Merge pull request #308 from nextcloud/use-proper-branding-againLukas Reschke2016-07-041-4/+4
|\ | | | | Use proper branding again
| * Use proper branding againLukas Reschke2016-07-041-4/+4
|/ | | The merge of the theming app changed these defaults back again.
* Merge pull request #304 from nextcloud/versions-fixMorris Jobke2016-07-041-0/+4
|\ | | | | add additional check if we have a valid uid and filename
| * add additional check if we have a valid uid and filenameBjoern Schiessle2016-07-041-0/+4
| |
* | Merge pull request #298 from nextcloud/use-parameterized-queryMorris Jobke2016-07-041-4/+1
|\ \ | |/ |/| [stable9] Use paramterized parameter for \OC\SystemTag\SystemTagManager
| * [stable9] Use paramterized parameter for \OC\SystemTag\SystemTagManagerLukas Reschke2016-07-031-4/+1
| | | | | | | | $nameSearchPattern was passed in and directly appended to the SQL query. Luckily the code path isn't reached anywhere in Nextcloud or the included apps.
* | Merge pull request #291 from nextcloud/stable9-update-transifex-linkMorris Jobke2016-07-041-1/+1
|\ \ | | | | | | [stable9] We have our own Transifex org now ;)
| * | We have our own Transifex org now ;)Marius Blüm2016-07-021-1/+1
|/ /
* | Merge pull request #287 from nextcloud/rc1-for-9-0-52v9.0.52RC1Lukas Reschke2016-07-011-2/+2
|\ \ | |/ |/| 9.0.52 RC1
| * 9.0.52 RC1Lukas Reschke2016-07-011-2/+2
|/
* Revert "Revert "[stable9] Don't show the updater if updater is incompatible""Lukas Reschke2016-07-013-13/+108
| | | | This reverts commit f8964705420d64a33e595922c40b5efe1217eaa4.
* Merge pull request #277 from nextcloud/traversal-directory-jsBjörn Schießle2016-07-012-2/+15
|\ | | | | [stable9] Do not allow directory traversal using "../" in JS file list
| * Match on 405Lukas Reschke2016-07-012-1/+6
| |
| * Match for /../Lukas Reschke2016-07-012-1/+5
| |
| * Do not allow directory traversal using "../"Lukas Reschke2016-07-012-1/+5
| | | | | | | | | | | | | | | | We should not allow directory traversals using "../" here. To test access the following URL once with and then without this patch: http://localhost/server/index.php/apps/files/?dir=../../This+Should+Not+Be+Here
* | Merge pull request #282 from nextcloud/fix-testsBjörn Schießle2016-07-0112-50/+53
|\ \ | | | | | | Fix unit test compatibility issues with phpunit 5.2+
| * | Fix Single execution of preview testsJoas Schilling2016-07-012-0/+10
| | |
| * | Fix Comments tests with phpunit 5.2+Joas Schilling2016-07-011-10/+0
| | |
| * | Fix Sharing app tests with phpunit 5.2+Joas Schilling2016-07-012-8/+4
| | |
| * | Fix Encryption tests with phpunit 5.2+Joas Schilling2016-07-012-7/+6
| | |
| * | Fix DAV tests with phpunit 5.2+Joas Schilling2016-07-011-22/+26
| | |
| * | Fix Share Manager tests with phpunit 5.2+Joas Schilling2016-07-011-1/+1
| | |
| * | Fix Notification tests with phpunit 5.2+Joas Schilling2016-07-011-0/+2
| | |
| * | Fix Appframework tests with phpunit 5.2+Joas Schilling2016-07-011-1/+3
| | |
| * | Fix AvatarControllerTest with phpunit 5.2+Joas Schilling2016-07-011-1/+1
| |/
* | Merge pull request #244 from nextcloud/theming-app-stable9Björn Schießle2016-07-0123-6/+4075
|\ \ | | | | | | [stable9] theming app
| * | Also fix the dav testJoas Schilling2016-07-011-0/+2
| | |
| * | Clear the storage wrappers after clearing the hooksJoas Schilling2016-07-011-0/+2
| | |
| * | initial commit for the theming appBjoern Schiessle2016-06-3021-6/+4071
| | |
* | | Merge pull request #274 from nextcloud/stable9-sync-upstreamMorris Jobke2016-07-012-2/+10
|\ \ \ | |_|/ |/| | [Stable9] sync upstream
| * | Merge remote-tracking branch 'upstream/stable9' into stable9-sync-upstreamLukas Reschke2016-07-012-2/+10
| |\ \
| | * \ Merge pull request #25264 from ↵Vincent Petry2016-07-011-2/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | owncloud/stable9-search-fixsearchfromotherfilelists [stable9] Fix search result link for file results outside default list
| | | * | Hide search results after switching directoryVincent Petry2016-06-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | When clicking on a folder result in the search result list, the result box for "results in another folder" must disappear.
| | | * | Fix search result link for file results outside default listVincent Petry2016-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | When outside the "All files" list, the search result link must properly redirect to the "All files" list.
| | * | | Merge pull request #25234 from owncloud/stable9-iedavclient-nullheadersVincent Petry2016-07-011-0/+1
| | |\ \ \ | | | | | | | | | | | | [stable9] Init the headers in iedavclient.js
| | | * | | Init the headers in iedavclient.jsVincent Petry2016-06-221-0/+1
| | | | | |
| | * | | | ownCloud 9.0.3v9.0.3Daniel Molkentin2016-06-291-2/+2
| | | |/ / | | |/| |
* | | | | Merge pull request #254 from nextcloud/fix-229-stable9Morris Jobke2016-06-302-1/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | [stable9] get only vcard which match both the address book id and the vcard uri
| * | | | get only vcard which match both the address book id and the vcard uriBjoern Schiessle2016-06-302-1/+6
| | | | |
* | | | | Merge pull request #266 from nextcloud/fix-262Björn Schießle2016-06-301-1/+11
|\ \ \ \ \ | | | | | | | | | | | | [stable9] getShareByToken() should also consider remote shares
| * | | | | getShareByToken() should also consider remote sharesBjoern Schiessle2016-06-301-1/+11
| | | | | |
* | | | | | Merge pull request #260 from nextcloud/fix-versions-stable9Lukas Reschke2016-06-301-5/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable9] check permissions before rollback
| * | | | | | check permissions before rollbackBjoern Schiessle2016-06-301-5/+11
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #249 from nextcloud/add-exemption-for-acsLukas Reschke2016-06-301-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable9] Add exemption for ACS endpoint
| * | | | | | Add exemption for ACS endpointLukas Reschke2016-06-291-0/+17
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a SAML scenario we don't get any strict or lax cookie send for the ACS endpoint. Since we have some legacy code in Nextcloud (direct PHP files) the enforcement of lax cookies is performed here instead of the middleware. This means we cannot exclude some routes from the cookie validation, which normally is not a problem but is a little bit cumbersome for this use-case. Once the old legacy PHP endpoints have been removed we can move the verification into a middleware and also adds some exemptions. Not super awesome code to have but the best that I could come up with that doesn't add another ton of technical debt.
* | | | | | Merge pull request #261 from nextcloud/stable9-fix243Marius Blüm2016-06-301-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [stable9] targets 3rdparty submodule from Nc instead of oC
| * | | | | targets 3rdparty submodule from Nc instead of oCMarius Blüm2016-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * backport of #245 * fixes #243