summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14427 from owncloud/fix-some-php-docsBernhard Posselt2015-02-231-3/+4
|\
| * Fix some PHPDocsLukas Reschke2015-02-231-3/+4
* | Merge pull request #14403 from owncloud/update-license-headersThomas Müller2015-02-23802-7443/+15510
|\ \ | |/ |/|
| * Updating license headersJenkins for ownCloud2015-02-23800-7443/+14939
| * Adding .mailmap - helps to add unified authors to the license headerThomas Müller2015-02-221-0/+405
| * php script which updates the license header in all php file in the repoThomas Müller2015-02-221-0/+166
* | Merge pull request #14422 from owncloud/use-off-and-offThomas Müller2015-02-233-3/+6
|\ \
| * | Use "off" and "off" instead of true booleansLukas Reschke2015-02-233-3/+6
* | | Merge pull request #14275 from chris-se/masterLukas Reschke2015-02-231-3/+6
|\ \ \ | |/ / |/| |
| * | DAV authentication: also use Owncloud's internal user for short-circuitChristian Seiler2015-02-161-1/+1
| * | DAV authentication: use Owncloud's internal user instead of HTTP-supplied oneChristian Seiler2015-02-161-2/+5
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2310-18/+202
| |/ |/|
* | Merge pull request #14414 from owncloud/add-ini-helperThomas Müller2015-02-223-1/+29
|\ \
| * | Add expected values to default config as wellLukas Reschke2015-02-212-0/+2
| * | Add helper to check for `ini` values in `OC_Util::checkServer`Lukas Reschke2015-02-211-1/+27
* | | Merge pull request #14413 from owncloud/verify-php-before-running-tests-2Thomas Müller2015-02-221-2/+5
|\ \ \
| * | | Check for PHP configuration before executing unit testsThomas Müller2015-02-211-2/+5
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2015-02-2228-80/+232
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2120-4/+44
* | Merge pull request #13777 from owncloud/close-cursorLukas Reschke2015-02-204-37/+51
|\ \
| * | fix indentionBernhard Posselt2015-01-291-7/+6
| * | add tests for closing the cursorBernhard Posselt2015-01-292-10/+16
| * | ignore cursorclosingBernhard Posselt2015-01-293-29/+38
* | | Merge pull request #13767 from owncloud/issue/13764-mimetype-raceconditionThomas Müller2015-02-201-3/+7
|\ \ \
| * | | Use insertIfNotExists() and reload mimetypes after inserting oneJoas Schilling2015-02-021-3/+7
* | | | Merge pull request #14325 from owncloud/fix-plurals-with-quotesLukas Reschke2015-02-201-2/+5
|\ \ \ \
| * | | | Correctly create the expected key for plurals with quotesJoas Schilling2015-02-181-2/+5
* | | | | Merge pull request #14278 from owncloud/fix-indexLukas Reschke2015-02-202-16/+277
|\ \ \ \ \
| * | | | | Check if the offset exists before accessingLukas Reschke2015-02-172-16/+277
* | | | | | Merge pull request #14359 from owncloud/add-satisfy-allLukas Reschke2015-02-201-0/+1
|\ \ \ \ \ \
| * | | | | | Add `Satisfy All`Lukas Reschke2015-02-191-0/+1
* | | | | | | Merge pull request #13645 from owncloud/fix-breadcrumb-backslashMorris Jobke2015-02-204-1/+32
|\ \ \ \ \ \ \
| * | | | | | | apply backslash fix to _setCurrentDirThomas Müller2015-02-192-1/+6
| * | | | | | | Parse backslash as directory separator in breadcrumbLukas Reschke2015-01-242-0/+26
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-20266-126/+2354
* | | | | | | | Merge pull request #14366 from owncloud/remove-old-l10n-filesLukas Reschke2015-02-1918-108/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove some old l10n files they arent loaded anymoreJoas Schilling2015-02-1918-108/+0
* | | | | | | | | Merge pull request #14199 from owncloud/cast-type-manuallyMorris Jobke2015-02-1947-131/+131
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use `int` instead of `string`Lukas Reschke2015-02-161-1/+1
| * | | | | | | | | Do not change behaviour of 'false'Joas Schilling2015-02-131-2/+2
| * | | | | | | | | This is an arrayLukas Reschke2015-02-131-1/+1
| * | | | | | | | | Manually type-case all AJAX filesLukas Reschke2015-02-1347-133/+133
* | | | | | | | | | Merge pull request #13505 from owncloud/streamline-scanning-codeThomas Müller2015-02-191-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Streamline auth and CSRF check in scan.phpLukas Reschke2015-01-201-1/+5
* | | | | | | | | | | Merge pull request #14267 from owncloud/encode-eventsourceThomas Müller2015-02-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Encode requesttokenLukas Reschke2015-02-161-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #14295 from owncloud/encode-request-token-for-avatarsThomas Müller2015-02-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Encode Requesttoken for avatarsLukas Reschke2015-02-171-2/+2
* | | | | | | | | | | | Merge pull request #14311 from raimund-schluessler/Fix#14310Thomas Müller2015-02-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix #14310Raimund Schlüßler2015-02-171-1/+1