aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Fix testsRoeland Jago Douma2018-02-212-4/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Make the middlewareDispatcher strictRoeland Jago Douma2018-02-211-9/+10
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Make AppFramework/Http/Dispatcher strictRoeland Jago Douma2018-02-211-8/+16
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #8206 from ↵blizzz2018-02-202-0/+4
|\ | | | | | | | | nextcloud/bugfix/noid/fix-collaboration-result-size Better result handling of email search
| * Better result handling of email searchJoas Schilling2018-02-202-0/+4
| | | | | | | | | | | | | | 1. Local users should not be returned when searching for empty string 2. The limit of the response should be respected Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #8336 from nextcloud/cleanup-unused-parameterRoeland Jago Douma2018-02-201-4/+0
|\ \ | | | | | | Cleanup unused parameter
| * | Remove fromMailAddress from MailSettingsControllerMorris Jobke2018-02-131-4/+0
| | | | | | | | | | | | | | | | | | Was removed in https://github.com/nextcloud/server/pull/4379 (0a54d5a) and https://github.com/nextcloud/server/pull/4380 (bae64e8) Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8314 from nextcloud/openstackRoeland Jago Douma2018-02-192-214/+203
|\ \ \ | | | | | | | | update openstack sdk
| * | | adjust swift external storage to new openstack sdkRobin Appelman2018-02-192-34/+51
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | adjust swift object storage to new openstack sdkRobin Appelman2018-02-192-212/+184
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #8428 from nextcloud/fix_8189Roeland Jago Douma2018-02-191-1/+1
|\ \ \ \ | |/ / / |/| | | Use TTF fonts for avatar generation
| * | | Avatar generation use ttf (for ancient compatibility)Roeland Jago Douma2018-02-191-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8424 from nextcloud/fix/update-appRoeland Jago Douma2018-02-192-2/+2
|\ \ \ \ | |/ / / |/| | | Fix updating an app
| * | | Fix updating an upChristoph Wurst2018-02-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OC_App has been made strict recently and the updater code was not compatible to this. This adds the array to string conversion of the Nextcloud version and fixes a typo in OC_App (sstring -> string) Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Use normal header() calls instead of private method callsMorris Jobke2018-02-193-10/+6
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8411 from nextcloud/add-strict-types-to-oc_appMorris Jobke2018-02-174-81/+77
|\ \ \ | | | | | | | | Add strict types to OC_App
| * | | Add remaining type hints, that were already okayMorris Jobke2018-02-171-33/+34
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Always return a string in OC_App::getCurrentApp and no booleanMorris Jobke2018-02-171-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Use empty array as group list in OC_App::enableMorris Jobke2018-02-171-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Refactor dependencies in setAppTypesMorris Jobke2018-02-171-6/+8
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix app version to be always string and neither array nor nullMorris Jobke2018-02-173-8/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | OC_App::loadApps now only accepts an array as type listMorris Jobke2018-02-172-11/+8
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Migrate to short array syntaxMorris Jobke2018-02-171-18/+18
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #8232 from ↵Morris Jobke2018-02-162-91/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/8007/validate-appinfo-against-appstore-schema Validate appinfo against appstore schema
| * | | | Validate the info.xml against the appstore schema fileJoas Schilling2018-02-162-91/+63
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #8391 from coder-hugo/feature/mysql_ansi_quotesMorris Jobke2018-02-161-2/+3
|\ \ \ \ | |/ / / |/| | | Don't use double quotes in MySQL queries
| * | | Don't use double quotes in MySQL queriesRobin Müller2018-02-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL databases with the ANSI_QUOTES mode enabled treat " as an identifier quote (see https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_ansi_quotes). So for such databases the 'occ upgrade' fails with an error message like this: ... unknown column 'oc_*' in where clause. This fix replaces the doulbe quotes with single quotes that should be always used in MySQL queries to quote literal strings. Signed-off-by: Robin Müller <robin.mueller@1und1.de>
* | | | Merge pull request #8095 from nextcloud/webapps-capabilitiesMorris Jobke2018-02-153-39/+49
|\ \ \ \ | | | | | | | | | | Expose navigation entries as API endpoint
| * | | | Update phpDoc comments and add more type hintingJulius Härtl2018-02-151-6/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Deprecate static methods and use Navigation managerJulius Härtl2018-02-122-2/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add getAll to public INavigationManagerJulius Härtl2018-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Move navigation processing to the NavigationManagerJulius Härtl2018-02-122-33/+40
| | |/ / | |/| | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Add throws annotationJulius Härtl2018-02-151-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Properly encapsulate require_once for app.phpJulius Härtl2018-02-151-11/+12
| |/ / |/| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #8259 from nextcloud/guzzle6Morris Jobke2018-02-144-27/+53
|\ \ \ | | | | | | | | update guzzlehttp/guzzle to 6.3.0
| * | | adjust post body for new guzzleRobin Appelman2018-02-091-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Adjust dav client to new guzzleRobin Appelman2018-02-091-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | adjust httpclient to guzzle6Robin Appelman2018-02-093-25/+47
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #8335 from nextcloud/remove-unused-importMorris Jobke2018-02-1412-25/+0
|\ \ \ \ | | | | | | | | | | Remove unused import statements
| * | | | Remove unused import statementsMorris Jobke2018-02-1412-25/+0
| | |/ / | |/| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #8328 from ↵Joas Schilling2018-02-141-2/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/filter-out-the-current-user-by-email-too Filter out the current user when searching for emails too
| * | | | Filter out the current user when searching for emails tooJoas Schilling2018-02-131-2/+9
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #8337 from nextcloud/use-non-alias-methodJoas Schilling2018-02-144-6/+6
|\ \ \ \ | | | | | | | | | | Use non aliased method instead
| * | | | Use non aliased method insteadMorris Jobke2018-02-134-6/+6
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / Simplify return statementMorris Jobke2018-02-131-3/+1
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Try to silence phanRoeland Jago Douma2018-02-081-0/+3
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | don't swallow exception from touchRobin Appelman2018-02-082-2/+10
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | better error message on catalog errorRobin Appelman2018-02-082-1/+6
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #8033 from nextcloud/s3-uploaderMorris Jobke2018-02-081-43/+2
|\ \ | | | | | | Use S3Client::upload instead of splitting single/multipart upload ourselves
| * | Use S3Client::upload instead of splitting single/multipart upload ourselvesRobin Appelman2018-01-241-43/+2
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>