summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* php script which updates the license header in all php file in the repoThomas Müller2015-02-221-0/+166
|
* Merge pull request #14414 from owncloud/add-ini-helperThomas Müller2015-02-223-1/+29
|\ | | | | Add helper to check for `ini` values in `OC_Util::checkServer`
| * 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
| | | | | | | | | | | | | | | | | | This allows to check for specific values in the PHP.ini that ownCloud requires for full compatibility. `mbstring.func_overload`: https://github.com/owncloud/core/issues/14372 `output_buffering`: http://doc.owncloud.org/server/8.0/admin_manual/configuration/big_file_upload_configuration.html#configuring-php Fixes https://github.com/owncloud/core/issues/14372 and https://github.com/owncloud/core/issues/14412
* | 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 tests
| * | 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
|\ | | | | Close cursor for appframework and manipulation queries if applicable
| * 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 one
| * | 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 quotes
| * | | Correctly create the expected key for plurals with quotesJoas Schilling2015-02-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ported from the administration repo: https://github.com/owncloud/administration/commit/c67eaa11c04d0989ee9331c97788a0225a82e7f5 and https://github.com/owncloud/administration/commit/41b0f9fa3a9c6183972f971eea3875b98e22217a
* | | | Merge pull request #14278 from owncloud/fix-indexLukas Reschke2015-02-202-16/+277
|\ \ \ \ | | | | | | | | | | Check if the offset exists before accessing
| * | | | Check if the offset exists before accessingLukas Reschke2015-02-172-16/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This checks if the offset exists before accessing it and also adds unit tests to this function which would have catched this before :see_no_evil: Fixes https://github.com/owncloud/core/issues/14277
* | | | | Merge pull request #14359 from owncloud/add-satisfy-allLukas Reschke2015-02-201-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add `Satisfy All`
| * | | | | Add `Satisfy All`Lukas Reschke2015-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/14356
* | | | | | Merge pull request #13645 from owncloud/fix-breadcrumb-backslashMorris Jobke2015-02-204-1/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | Parse backslash as directory separator in breadcrumb
| * | | | | | apply backslash fix to _setCurrentDirThomas Müller2015-02-192-1/+6
| | | | | | |
| * | | | | | Parse backslash as directory separator in breadcrumbLukas Reschke2015-01-242-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will parse backslashes as directory separators in breadcrumbs. Thus when accessing something like `/index.php/apps/files?dir=foo\foo` the breadcrumb will properly resolve this instead of showing `foo\foo` Fixes https://github.com/owncloud/core/issues/13643
* | | | | | | [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 anymore
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Manually type-cast all AJAX files
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support :see_no_evil: Fixes https://github.com/owncloud/core/issues/14196 for core
* | | | | | | | | Merge pull request #13505 from owncloud/streamline-scanning-codeThomas Müller2015-02-191-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Streamline auth and CSRF check in scan.php
| * | | | | | | | | Streamline auth and CSRF check in scan.phpLukas Reschke2015-01-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Furthermore a not logged-in user was able to access this page before which resulted in a Fatal PHP error since the filesystem could not get setup properly.
* | | | | | | | | | Merge pull request #14267 from owncloud/encode-eventsourceThomas Müller2015-02-191-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Encode requesttoken
| * | | | | | | | | | Encode requesttokenLukas Reschke2015-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One cannot make any assumptions about the requesttoken content. Thus we need to encode it.
* | | | | | | | | | | Merge pull request #14295 from owncloud/encode-request-token-for-avatarsThomas Müller2015-02-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Encode Requesttoken for avatars
| * | | | | | | | | | | Encode Requesttoken for avatarsLukas Reschke2015-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes new avatar selection in master half, other half will work when https://github.com/owncloud/core/pull/14266 has get merged. Shocking to see how much places in our code do it wrong :gun:
* | | | | | | | | | | | Merge pull request #14311 from raimund-schluessler/Fix#14310Thomas Müller2015-02-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #14310
| * | | | | | | | | | | | Fix #14310Raimund Schlüßler2015-02-171-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #14377 from owncloud/port-14041Thomas Müller2015-02-191-3/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of #14041 to master
| * | | | | | | | | | | | | Port of #14041 to masterArthur Schiwon2015-02-191-3/+37
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on ownCloud upgrade: upgrade all apps in order, load important ones Fix "other" app update stack
* | | | | | | | | | | | | Merge pull request #14338 from owncloud/fix-nav-heigtMorris Jobke2015-02-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | If no link text has been set for the navigation show the link nonetheless
| * | | | | | | | | | | | if no link text has been set for the navigation show the link nonethelessBernhard Posselt2015-02-181-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #14342 from owncloud/disallow-path-traversals-in-file-viewThomas Müller2015-02-192-6/+149
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disallow path traversals in file view
| * | | | | | | | | | | | | Add some basic PHPDoc to functionsLukas Reschke2015-02-181-6/+124
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Prevent directory traversals in ctr of \OC\Files\ViewLukas Reschke2015-02-182-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents a misusage of \OC\Files\View by calling it with user-supplied input. In such cases an exception is now thrown.
* | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1944-170/+236
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #13836 from owncloud/part-no-cache-updateThomas Müller2015-02-192-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | Dont update the cache when working with part files
| * | | | | | | | | | | | | Dont bother updating the cache when working with part filesRobin Appelman2015-02-051-0/+12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Dont update the cache after fopenRobin Appelman2015-02-051-1/+1
| | | | | | | | | | | | | |