summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #287 from nextcloud/rc1-for-9-0-52v9.0.52RC1Lukas Reschke2016-07-011-2/+2
|\
| * 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
* Merge pull request #277 from nextcloud/traversal-directory-jsBjörn Schießle2016-07-012-2/+15
|\
| * 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
* | Merge pull request #282 from nextcloud/fix-testsBjörn Schießle2016-07-0112-50/+53
|\ \
| * | 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
|\ \
| * | 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
|\ \ \ | |_|/ |/| |
| * | Merge remote-tracking branch 'upstream/stable9' into stable9-sync-upstreamLukas Reschke2016-07-012-2/+10
| |\ \
| | * \ Merge pull request #25264 from owncloud/stable9-search-fixsearchfromotherfile...Vincent Petry2016-07-011-2/+9
| | |\ \
| | | * | Hide search results after switching directoryVincent Petry2016-06-241-0/+7
| | | * | Fix search result link for file results outside default listVincent Petry2016-06-241-2/+2
| | * | | Merge pull request #25234 from owncloud/stable9-iedavclient-nullheadersVincent Petry2016-07-011-0/+1
| | |\ \ \
| | | * | | 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
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | check permissions before rollbackBjoern Schiessle2016-06-301-5/+11
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #249 from nextcloud/add-exemption-for-acsLukas Reschke2016-06-301-0/+17
|\ \ \ \ \ \
| * | | | | | Add exemption for ACS endpointLukas Reschke2016-06-291-0/+17
| |/ / / / /
* | | | | | Merge pull request #261 from nextcloud/stable9-fix243Marius Blüm2016-06-301-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | targets 3rdparty submodule from Nc instead of oCMarius Blüm2016-06-301-1/+1
* | | | | | Merge pull request #265 from nextcloud/stable9-add-wndMorris Jobke2016-06-3012-5/+679
|\ \ \ \ \ \
| * | | | | | [stable9] Backport WNDLukas Reschke2016-06-3012-5/+679
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #251 from nextcloud/make-it-user-samlMarius Blüm2016-06-301-2/+2
|\ \ \ \ \ \
| * | | | | | Mark user_saml official and kill user_shibbolethLukas Reschke2016-06-301-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #263 from nextcloud/dav-permission-check-stable9Morris Jobke2016-06-304-6/+97
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Name method properlyLukas Reschke2016-06-301-1/+1
| * | | | | add some additonal permission checks to the webdav backendBjoern Schiessle2016-06-304-6/+97
| | |/ / / | |/| | |
* | | | | Merge pull request #240 from nextcloud/password_policy_events_stable9Lukas Reschke2016-06-308-63/+138
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add events to check passwords with the password policy appBjoern Schiessle2016-06-288-63/+138
| |/ / /
* | | | Merge pull request #259 from nextcloud/stable9-set-dispositionLukas Reschke2016-06-302-2/+7
|\ \ \ \ | |/ / / |/| | |
| * | | [stable9] Set content-type to "application/octet-stream"Lukas Reschke2016-06-302-2/+7
|/ / /