wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
42697 commits 157 branches 562 tags 714 MiB
Commit graph

15134 commits

Author SHA1 Message Date
Roeland Jago Douma
4859775893
Don't try to match on false 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 20:38:14 +01:00
Roeland Jago Douma
aa060f5332
Strict OCP\AppFramework\Utility\IControllerMethodReflector 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 19:55:49 +01:00
Roeland Jago Douma
8b17f0d224
Fix other tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 19:53:44 +01:00
Roeland Jago Douma
2b0d640225
Proper closure for function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 19:46:29 +01:00
Roeland Jago Douma
541056f6c2
Make OCP\IL10N strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 14:32:04 +01:00
Joas Schilling
2c840ca278
Log exceptions that happen when writing the app store reply to storage 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-21 14:14:33 +01:00
Roeland Jago Douma
4b50fe7560
Merge pull request #8466 from nextcloud/strict_middlewaredipatcher 
Make the middlewareDispatcher strict
 2018-02-21 13:57:04 +01:00
Roeland Jago Douma
5825c27a12
Make sure that render always returns a string 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 13:28:40 +01:00
Roeland Jago Douma
8b44c16ddc
Merge pull request #8471 from nextcloud/fix_upgrade 
getIncompatibleApps needs a string not an array
 2018-02-21 13:28:10 +01:00
Roeland Jago Douma
4d5f2e64a5
Make OC\IntegrityCheck strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 13:27:29 +01:00
Roeland Jago Douma
4a41e0cc42
getIncompatibleApps needs a string not an array 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 13:00:41 +01:00
Roeland Jago Douma
7c6cc013eb
Merge pull request #8468 from nextcloud/fix-unicode-avatars 
Use mb_* string methods to extract first character for generated avatars
 2018-02-21 11:08:33 +01:00
Roeland Jago Douma
ca9f364fd4
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 10:55:52 +01:00
Roeland Jago Douma
a773b055fc
Make the middlewareDispatcher strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 10:55:24 +01:00
Morris Jobke
3bea8e05ad
Use mb_* string methods to extract first character for generated avatars 
This fixes #8451 where the first character is a non-ASCII character. The `$string[0]` notation only extracted one byte and thus resulting in an invalid code. The `mb_strtoupper` method also allows to convert characters independently from the current locale on the server.

See also http://php.net/manual/en/function.mb-strtoupper.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-21 10:32:46 +01:00
Roeland Jago Douma
bb0c7b2943
Make AppFramework/Http/Dispatcher strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 08:51:46 +01:00
Nextcloud bot
6591a3bc36
[tx-robot] updated from transifex 2018-02-21 01:12:10 +00:00
blizzz
8e5120ce66
Merge pull request #8206 from nextcloud/bugfix/noid/fix-collaboration-result-size 
Better result handling of email search
 2018-02-20 23:02:53 +01:00
Joas Schilling
b30e035e25
Better result handling of email search 
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>
 2018-02-20 17:38:32 +01:00
Roeland Jago Douma
cf83eb5e77
Merge pull request #8336 from nextcloud/cleanup-unused-parameter 
Cleanup unused parameter
 2018-02-20 10:16:59 +01:00
Nextcloud bot
c48332a14f
[tx-robot] updated from transifex 2018-02-20 01:11:55 +00:00
Roeland Jago Douma
980c78048b
Merge pull request #8314 from nextcloud/openstack 
update openstack sdk
 2018-02-19 22:22:55 +01:00
Roeland Jago Douma
26a741fd36
Merge pull request #8428 from nextcloud/fix_8189 
Use TTF fonts for avatar generation
 2018-02-19 22:12:05 +01:00
Robin Appelman
a80f72c6c8
fix controller test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-19 19:41:16 +01:00
Robin Appelman
817f2f8f49
adjust swift external storage to new openstack sdk 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-19 19:41:16 +01:00
Robin Appelman
3192efc415
adjust swift object storage to new openstack sdk 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-19 19:41:16 +01:00
Roeland Jago Douma
4e6d98ea8c
Merge pull request #8424 from nextcloud/fix/update-app 
Fix updating an app
 2018-02-19 15:54:49 +01:00
Roeland Jago Douma
0f57bce06c
Avatar generation use ttf (for ancient compatibility) 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-19 12:35:35 +01:00
Roeland Jago Douma
bffdcd76f0
Merge pull request #8334 from nextcloud/lib-strict-typing 
Make lib/autoloader.php strictly typed and p…
 2018-02-19 10:50:38 +01:00
Christoph Wurst
1a8916af59
Fix updating an up 
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>
 2018-02-19 10:28:41 +01:00
Morris Jobke
70b1f510f2
Use normal header() calls instead of private method calls 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-19 09:40:25 +01:00
Nextcloud bot
b3ca73dc27
[tx-robot] updated from transifex 2018-02-19 01:11:54 +00:00
Morris Jobke
ac63c207a9
Merge pull request #8411 from nextcloud/add-strict-types-to-oc_app 
Add strict types to OC_App
 2018-02-17 21:34:20 +01:00
Morris Jobke
9b68f80c4b
Add remaining type hints, that were already okay 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:23 +01:00
Morris Jobke
9fcf185c7d
Always return a string in OC_App::getCurrentApp and no boolean 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:23 +01:00
Morris Jobke
e4077672e1
Use empty array as group list in OC_App::enable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:23 +01:00
Morris Jobke
2e15c0d871
Refactor dependencies in setAppTypes 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:23 +01:00
Morris Jobke
9dc3b04802
Fix app version to be always string and neither array nor null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:13 +01:00
Morris Jobke
edee243b27
OC_App::loadApps now only accepts an array as type list 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 15:27:43 +01:00
Morris Jobke
2a2833e30f
Migrate to short array syntax 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 15:18:34 +01:00
Nextcloud bot
d953db8683
[tx-robot] updated from transifex 2018-02-17 01:12:04 +00:00
Morris Jobke
57e0881a9e
Merge pull request #8232 from nextcloud/bugfix/8007/validate-appinfo-against-appstore-schema 
Validate appinfo against appstore schema
 2018-02-16 22:56:10 +01:00
Morris Jobke
45e7bb7f40
Merge pull request #8391 from coder-hugo/feature/mysql_ansi_quotes 
Don't use double quotes in MySQL queries
 2018-02-16 22:55:23 +01:00
Robin Müller
6aa816915a
Don't use double quotes in MySQL queries 
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>
 2018-02-16 15:03:12 +01:00
Joas Schilling
17a26dfcc1
Validate the info.xml against the appstore schema file 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 10:23:51 +01:00
Joas Schilling
a097ecded7
Add info also to public interface 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 09:44:35 +01:00
Morris Jobke
14bc9b1714
Merge pull request #8095 from nextcloud/webapps-capabilities 
Expose navigation entries as API endpoint
 2018-02-15 16:55:12 +01:00
Julius Härtl
f36e8313ff
Add throws annotation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-15 12:23:49 +01:00
Joas Schilling
339e320064
Fix existing usages 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-15 12:18:51 +01:00
Joas Schilling
350e38396f
Allow custom HTML in HTML Emails 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-15 12:09:19 +01:00
Julius Härtl
04053311ee
Properly encapsulate require_once for app.php 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-15 11:20:22 +01:00
Julius Härtl
e694b30a4f
Update phpDoc comments and add more type hinting 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-15 10:38:25 +01:00
Nextcloud bot
01623d4aca
[tx-robot] updated from transifex 2018-02-14 21:37:31 +00:00
Morris Jobke
24f96513fd
Merge pull request #8259 from nextcloud/guzzle6 
update guzzlehttp/guzzle to 6.3.0
 2018-02-14 22:26:19 +01:00
Morris Jobke
236086c457
Merge pull request #8335 from nextcloud/remove-unused-import 
Remove unused import statements
 2018-02-14 22:23:07 +01:00
Morris Jobke
d3d045dd5c
Remove unused import statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-14 16:55:43 +01:00
Joas Schilling
a966d5256c
Merge pull request #8328 from nextcloud/bugfix/noid/filter-out-the-current-user-by-email-too 
Filter out the current user when searching for emails too
 2018-02-14 11:53:48 +01:00
Joas Schilling
c32a94b78d
Merge pull request #8337 from nextcloud/use-non-alias-method 
Use non aliased method instead
 2018-02-14 10:09:09 +01:00
Joas Schilling
d1fb939e86
Merge pull request #8338 from nextcloud/simplify-return-statement 
Simplify return statement
 2018-02-14 10:08:28 +01:00
Nextcloud bot
ff1b343c4a
[tx-robot] updated from transifex 2018-02-14 01:11:53 +00:00
Morris Jobke
5819e5e5b3
Make lib/autoloader.php strictly typed and properly type hinted 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 22:07:58 +01:00
Morris Jobke
e2974f1133
Simplify return statement 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:55:24 +01:00
Morris Jobke
954da26e26
Use non aliased method instead 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:48:24 +01:00
Morris Jobke
d18d323f21
Remove fromMailAddress from MailSettingsController 
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>
 2018-02-13 21:40:38 +01:00
Joas Schilling
cf216ecff2
Filter out the current user when searching for emails too 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-13 17:32:58 +01:00
Nextcloud bot
91c67eb667
[tx-robot] updated from transifex 2018-02-12 21:33:37 +00:00
Julius Härtl
ada5aed35e
Deprecate static methods and use Navigation manager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-12 17:22:33 +01:00
Roeland Jago Douma
39529851a8
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-12 17:22:33 +01:00
Julius Härtl
b6da8c5279
Add getAll to public INavigationManager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-12 17:22:32 +01:00
Julius Härtl
864474b858
Move navigation processing to the NavigationManager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-12 17:22:32 +01:00
Robin Appelman
fe23bb5916
adjust post body for new guzzle 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-09 17:13:33 +01:00
Robin Appelman
97b44605f4
Adjust dav client to new guzzle 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-09 17:13:24 +01:00
Robin Appelman
9b25ff9fcb
adjust httpclient to guzzle6 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-09 17:13:21 +01:00
Nextcloud bot
ee77f37df2
[tx-robot] updated from transifex 2018-02-09 15:28:58 +00:00
Roeland Jago Douma
3e0ef7e3f2
Try to silence phan 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-08 15:18:26 +01:00
Robin Appelman
e34c20af7d
don't swallow exception from touch 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-08 15:18:26 +01:00
Robin Appelman
85d23dd6fc
better error message on catalog error 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-08 15:18:26 +01:00
Morris Jobke
26e0c14c6d
Merge pull request #8033 from nextcloud/s3-uploader 
Use S3Client::upload instead of splitting single/multipart upload ourselves
 2018-02-08 14:30:02 +01:00
Morris Jobke
d767d01a0c
Merge pull request #8218 from nextcloud/display_proper_lang_string 
Display the proper language strings in setttings
 2018-02-08 11:13:10 +01:00
Morris Jobke
e5c08621af
Merge pull request #8023 from nextcloud/webdavsearch_limit_order_fixing 
Respect limit and order in webdav search
 2018-02-08 09:11:39 +01:00
Roeland Jago Douma
b939383049
Merge pull request #8233 from nextcloud/swift-return-stream 
actually return stream from swift
 2018-02-08 08:15:35 +01:00
Nextcloud bot
71382daf67
[tx-robot] updated from transifex 2018-02-08 01:10:28 +00:00
Robin Appelman
fd09c06eb4
actually return stream from swift 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-07 17:10:59 +01:00
Roeland Jago Douma
c1ff12e234
CacheJail should apply limit and offset after searching 
Else the results might not be correct.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-07 13:41:15 +01:00
Nextcloud bot
3063131e6d
[tx-robot] updated from transifex 2018-02-07 11:31:55 +00:00
Morris Jobke
4ee539fde8
Fix proper overwrite URL on CLI install 
* regression from #7835

Steps

* having a my.config.php with a proper `overwrite.cli.url` and `htaccess.RewriteBase` set
* install with this
* before: short URLs where broken and you need to call `occ maintenance:update:htaccess` additionally to fix this
* after: occ install results in a proper htaccess like on stable13

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-07 11:40:35 +01:00
Morris Jobke
8d57d68846
Merge pull request #8217 from nextcloud/fix_8180 
Use proper lanugage in langauge code
 2018-02-07 11:37:51 +01:00
Roeland Jago Douma
4ee9315a68
Display the proper language strings in setttings 
Since this was moved to lib, we have to the lib language files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-07 11:13:55 +01:00
Roeland Jago Douma
e5be299101
Use proper lanugage in langauge code 
Fixes #8180

The _ is not valid in language codes use - instead.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-07 11:04:37 +01:00
Nextcloud bot
2a3272331f
[tx-robot] updated from transifex 2018-02-07 01:10:23 +00:00
Morris Jobke
27f505667c
Merge pull request #8182 from robert-scheck/pki-validation 
Handle SSL certificate verifications for others than Let's Encrypt
 2018-02-06 16:43:39 +01:00
Morris Jobke
8fa86bf68b
Merge pull request #8173 from michaelletzgus/fix_for_each 
Fix "undefined index" problem
 2018-02-06 10:23:52 +01:00
Robert Scheck
7583615bab Handle SSL certificate verifications for others than Let's Encrypt 
Do no longer (wrongly) rewrite URLs like

  * http://example.net/.well-known/pki-validation/file.txt (Comodo)
  * http://example.net/.well-known/pki-validation/fileauth.txt (DigiCert, Thawte, GeoTrust)
  * http://example.net/.well-known/pki-validation/gsdv.txt (GlobalSign)
  * http://example.net/.well-known/pki-validation/starfield.htm (Starfield, GoDaddy)
  * http://example.net/.well-known/pki-validation/swisssign-check.txt (SwissSign)

for automated SSL certificate verifications. All (common commercial)
certificate authorities (CA) except Let's Encrypt (via ACME) seem to
use "pki-validation" rather "acme-challenge" for their domain control
validation (DCV).

Signed-off-by: Robert Scheck <robert@fedoraproject.org>
 2018-02-05 15:33:42 +01:00
Morris Jobke
847bd0cf74
Merge pull request #8144 from nextcloud/cache-update-occ 
Repair step to clear frontend related caches
 2018-02-05 12:15:52 +01:00
Morris Jobke
0225ea1b9a
Merge pull request #8155 from nextcloud/use-guest-css 
Fix styling issues of guest pages
 2018-02-05 12:14:09 +01:00
michaelletzgus
05b8eb140c
using isset() 
using isset() instead of array_key_exists()
 2018-02-05 10:50:32 +01:00
michaelletzgus
cfa694ea73
Fix undefined index problem 
Nextcloud 13RC4, error in logfile, triggered by "occ config:list":

Invalid argument supplied for foreach() at lib/private/AppConfig.php#297
PHP	Undefined index: workflowengine at lib/private/AppConfig.php#297

Fix: Check if index exists in array before using it.
 2018-02-04 15:59:23 +01:00
Julius Härtl
b87e5a0f2e
Move depsCache clearing to SCSSCacher/JSCombiner 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-03 15:21:51 +01:00
Julius Härtl
5460166ff5
Add tests and class mapping 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-03 15:21:51 +01:00
Julius Härtl
7381a81d30
Add repair step to clear frontend related caches 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-03 15:21:51 +01:00