Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | v9.0.53v9.0.53 | Lukas Reschke | 2016-08-01 | 1 | -2/+2 |
| | |||||
* | Merge pull request #310 from nextcloud/version-numberv9.0.52 | Lukas Reschke | 2016-07-05 | 1 | -2/+2 |
|\ | | | | | Increase version to 9.0.52 | ||||
| * | Increase version to 9.0.52 | Lukas Reschke | 2016-07-05 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #308 from nextcloud/use-proper-branding-again | Lukas Reschke | 2016-07-04 | 1 | -4/+4 |
|\ | | | | | Use proper branding again | ||||
| * | Use proper branding again | Lukas Reschke | 2016-07-04 | 1 | -4/+4 |
|/ | | | The merge of the theming app changed these defaults back again. | ||||
* | Merge pull request #304 from nextcloud/versions-fix | Morris Jobke | 2016-07-04 | 1 | -0/+4 |
|\ | | | | | add additional check if we have a valid uid and filename | ||||
| * | add additional check if we have a valid uid and filename | Bjoern Schiessle | 2016-07-04 | 1 | -0/+4 |
| | | |||||
* | | Merge pull request #298 from nextcloud/use-parameterized-query | Morris Jobke | 2016-07-04 | 1 | -4/+1 |
|\ \ | |/ |/| | [stable9] Use paramterized parameter for \OC\SystemTag\SystemTagManager | ||||
| * | [stable9] Use paramterized parameter for \OC\SystemTag\SystemTagManager | Lukas Reschke | 2016-07-03 | 1 | -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-link | Morris Jobke | 2016-07-04 | 1 | -1/+1 |
|\ \ | | | | | | | [stable9] We have our own Transifex org now ;) | ||||
| * | | We have our own Transifex org now ;) | Marius Blüm | 2016-07-02 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #287 from nextcloud/rc1-for-9-0-52v9.0.52RC1 | Lukas Reschke | 2016-07-01 | 1 | -2/+2 |
|\ \ | |/ |/| | 9.0.52 RC1 | ||||
| * | 9.0.52 RC1 | Lukas Reschke | 2016-07-01 | 1 | -2/+2 |
|/ | |||||
* | Revert "Revert "[stable9] Don't show the updater if updater is incompatible"" | Lukas Reschke | 2016-07-01 | 3 | -13/+108 |
| | | | | This reverts commit f8964705420d64a33e595922c40b5efe1217eaa4. | ||||
* | Merge pull request #277 from nextcloud/traversal-directory-js | Björn Schießle | 2016-07-01 | 2 | -2/+15 |
|\ | | | | | [stable9] Do not allow directory traversal using "../" in JS file list | ||||
| * | Match on 405 | Lukas Reschke | 2016-07-01 | 2 | -1/+6 |
| | | |||||
| * | Match for /../ | Lukas Reschke | 2016-07-01 | 2 | -1/+5 |
| | | |||||
| * | Do not allow directory traversal using "../" | Lukas Reschke | 2016-07-01 | 2 | -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-tests | Björn Schießle | 2016-07-01 | 12 | -50/+53 |
|\ \ | | | | | | | Fix unit test compatibility issues with phpunit 5.2+ | ||||
| * | | Fix Single execution of preview tests | Joas Schilling | 2016-07-01 | 2 | -0/+10 |
| | | | |||||
| * | | Fix Comments tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 1 | -10/+0 |
| | | | |||||
| * | | Fix Sharing app tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 2 | -8/+4 |
| | | | |||||
| * | | Fix Encryption tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 2 | -7/+6 |
| | | | |||||
| * | | Fix DAV tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 1 | -22/+26 |
| | | | |||||
| * | | Fix Share Manager tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 1 | -1/+1 |
| | | | |||||
| * | | Fix Notification tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 1 | -0/+2 |
| | | | |||||
| * | | Fix Appframework tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 1 | -1/+3 |
| | | | |||||
| * | | Fix AvatarControllerTest with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #244 from nextcloud/theming-app-stable9 | Björn Schießle | 2016-07-01 | 23 | -6/+4075 |
|\ \ | | | | | | | [stable9] theming app | ||||
| * | | Also fix the dav test | Joas Schilling | 2016-07-01 | 1 | -0/+2 |
| | | | |||||
| * | | Clear the storage wrappers after clearing the hooks | Joas Schilling | 2016-07-01 | 1 | -0/+2 |
| | | | |||||
| * | | initial commit for the theming app | Bjoern Schiessle | 2016-06-30 | 21 | -6/+4071 |
| | | | |||||
* | | | Merge pull request #274 from nextcloud/stable9-sync-upstream | Morris Jobke | 2016-07-01 | 2 | -2/+10 |
|\ \ \ | |_|/ |/| | | [Stable9] sync upstream | ||||
| * | | Merge remote-tracking branch 'upstream/stable9' into stable9-sync-upstream | Lukas Reschke | 2016-07-01 | 2 | -2/+10 |
| |\ \ | |||||
| | * \ | Merge pull request #25264 from ↵ | Vincent Petry | 2016-07-01 | 1 | -2/+9 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | owncloud/stable9-search-fixsearchfromotherfilelists [stable9] Fix search result link for file results outside default list | ||||
| | | * | | Hide search results after switching directory | Vincent Petry | 2016-06-24 | 1 | -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 list | Vincent Petry | 2016-06-24 | 1 | -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-nullheaders | Vincent Petry | 2016-07-01 | 1 | -0/+1 |
| | |\ \ \ | | | | | | | | | | | | | [stable9] Init the headers in iedavclient.js | ||||
| | | * | | | Init the headers in iedavclient.js | Vincent Petry | 2016-06-22 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | ownCloud 9.0.3v9.0.3 | Daniel Molkentin | 2016-06-29 | 1 | -2/+2 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge pull request #254 from nextcloud/fix-229-stable9 | Morris Jobke | 2016-06-30 | 2 | -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 uri | Bjoern Schiessle | 2016-06-30 | 2 | -1/+6 |
| | | | | | |||||
* | | | | | Merge pull request #266 from nextcloud/fix-262 | Björn Schießle | 2016-06-30 | 1 | -1/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | [stable9] getShareByToken() should also consider remote shares | ||||
| * | | | | | getShareByToken() should also consider remote shares | Bjoern Schiessle | 2016-06-30 | 1 | -1/+11 |
| | | | | | | |||||
* | | | | | | Merge pull request #260 from nextcloud/fix-versions-stable9 | Lukas Reschke | 2016-06-30 | 1 | -5/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [stable9] check permissions before rollback | ||||
| * | | | | | | check permissions before rollback | Bjoern Schiessle | 2016-06-30 | 1 | -5/+11 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #249 from nextcloud/add-exemption-for-acs | Lukas Reschke | 2016-06-30 | 1 | -0/+17 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [stable9] Add exemption for ACS endpoint | ||||
| * | | | | | | Add exemption for ACS endpoint | Lukas Reschke | 2016-06-29 | 1 | -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-fix243 | Marius Blüm | 2016-06-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | [stable9] targets 3rdparty submodule from Nc instead of oC | ||||
| * | | | | | targets 3rdparty submodule from Nc instead of oC | Marius Blüm | 2016-06-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | * backport of #245 * fixes #243 |