summaryrefslogtreecommitdiffstats
Commit message (Expand)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.52Lukas Reschke2016-07-051-2/+2
|/
* Merge pull request #308 from nextcloud/use-proper-branding-againLukas Reschke2016-07-041-4/+4
|\
| * Use proper branding againLukas Reschke2016-07-041-4/+4
|/
* Merge pull request #304 from nextcloud/versions-fixMorris Jobke2016-07-041-0/+4
|\
| * 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\SystemTagManagerLukas Reschke2016-07-031-4/+1
* | Merge pull request #291 from nextcloud/stable9-update-transifex-linkMorris Jobke2016-07-041-1/+1
|\ \
| * | 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 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