summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #290 from nextcloud/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 #275 from nextcloud/master-sync-upstreamBjörn Schießle2016-07-01202-227/+3213
|\
| * Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-01202-227/+3213
| |\
| | * [tx-robot] updated from transifexJenkins for ownCloud2016-07-018-0/+126
| | * Merge pull request #25304 from owncloud/local-karmaVincent Petry2016-06-301-13/+1
| | |\
| | | * always use local karmaHendrik Leppelsack2016-06-291-13/+1
| | * | Merge pull request #25310 from owncloud/search-preventinfiniteloopVincent Petry2016-06-301-2/+5
| | |\ \
| | | * | Prevent infinite loop in search auto-nextpageVincent Petry2016-06-301-2/+5
| | |/ /
| | * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-308-2/+32
| | * | fix version stringDaniel Molkentin2016-06-291-1/+1
| | * | 9.1.0 RC 1Daniel Molkentin2016-06-291-2/+2
| | * | Various database migration fixes (#25209)Thomas Müller2016-06-2912-4/+1692
| | * | Merge pull request #25288 from owncloud/fix-versionrevertpermsVincent Petry2016-06-294-2/+78
| | |\ \
| | | * | Hide revert button when no permission to revertVincent Petry2016-06-284-2/+78
| | * | | get only vcards which match both the address book id and the vcard uri (#25294)Björn Schießle2016-06-292-1/+5
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2944-10/+486
| | |/ /
| | * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-28148-138/+686
| | * | Fix getting the certificate bundle for dav external storage (#25274)Robin Appelman2016-06-272-2/+7
| | * | Login hooks (#25260)Christoph Wurst2016-06-272-41/+65
| | * | handle unavailable fed shares while testing for availability (#25277)Robin Appelman2016-06-272-5/+20
| | * | fix a ImageExportPlugin Test (#25215)Georg Ehrke2016-06-272-8/+15
* | | | Merge pull request #281 from nextcloud/update-3rdparty-masterBjörn Schießle2016-07-011-0/+0
|\ \ \ \
| * | | | update to 3rdparty masterMorris Jobke2016-07-011-0/+0
| |/ / /
* | | | Merge pull request #278 from nextcloud/master-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 #255 from nextcloud/dav-permission-checkBjörn Schießle2016-06-304-3/+96
|\ \ \
| * | | fix error messageBjoern Schiessle2016-06-301-1/+1
| * | | Fix testsLukas Reschke2016-06-301-0/+20
| * | | Add proper throws PHP docsLukas Reschke2016-06-301-2/+13
| * | | Add required $message parameterLukas Reschke2016-06-301-2/+2
| * | | Add integration testsLukas Reschke2016-06-302-0/+47
| * | | add some additonal permission checks to the webdav backendBjoern Schiessle2016-06-301-1/+16
* | | | Merge pull request #258 from nextcloud/set-dispositionMarius Blüm2016-06-302-2/+7
|\ \ \ \
| * | | | Set content-type to "application/octet-stream"Lukas Reschke2016-06-302-2/+7
| |/ / /
* | | | Merge pull request #253 from nextcloud/fix-versionsMorris Jobke2016-06-301-5/+11
|\ \ \ \ | |/ / / |/| | |
| * | | check permissions before rollbackBjoern Schiessle2016-06-301-5/+11
|/ / /
* | | Merge pull request #247 from nextcloud/l10n-fixesMorris Jobke2016-06-301-1/+3
|\ \ \
| * | | Fix update notification textMorris Jobke2016-06-291-1/+3
* | | | Merge pull request #206 from nextcloud/ci-mysqlMorris Jobke2016-06-304-6/+32
|\ \ \ \
| * | | | mysql only works with 3 byte UTF-8Morris Jobke2016-06-292-1/+9
| * | | | fix mysql error handlingMorris Jobke2016-06-232-1/+1
| * | | | Add mysql job to CIMorris Jobke2016-06-232-6/+24
* | | | | Merge pull request #248 from nextcloud/tx-fixesMorris Jobke2016-06-291-16/+15
|\ \ \ \ \
| * | | | | Update transifex configMorris Jobke2016-06-291-16/+15
| | |/ / / | |/| | |
* | | | | Merge pull request #245 from nextcloud/fix-243Morris Jobke2016-06-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | targets 3rdparty submodule from Nc instead of oCVincent Chan2016-06-281-1/+1
* | | | | Merge pull request #242 from nextcloud/fix-229Morris Jobke2016-06-292-1/+6
|\ \ \ \ \ | |/ / / / |/| | | |