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

8640 commits

Author SHA1 Message Date
Morris Jobke
ede723f1b1
Merge pull request #8796 from nextcloud/varadic_qb 
Make QueryBuilder varadic
 2018-03-13 14:11:19 +01:00
Morris Jobke
45895de531
Merge pull request #8794 from nextcloud/swift-v3-cache-token 
Properly cache swift v3 token
 2018-03-13 11:35:38 +01:00
Morris Jobke
7488218535
Merge pull request #8792 from nextcloud/cleanup-oc_response 
Remove unused methods of OC_Response
 2018-03-13 09:47:29 +01:00
Roeland Jago Douma
46c195b58b
Made IExpressionBuilder varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:35:09 +01:00
Roeland Jago Douma
0009358c17
Made orHaving varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:32:31 +01:00
Roeland Jago Douma
408c2103db
Made addHaving varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:31:33 +01:00
Roeland Jago Douma
2c585afea1
Make having varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:31:04 +01:00
Roeland Jago Douma
c6eba3c925
Made addGroupBy varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:30:14 +01:00
Roeland Jago Douma
afbad7e15e
Made groupBy varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:29:36 +01:00
Roeland Jago Douma
d6b93e6620
Made orWhere varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:28:27 +01:00
Roeland Jago Douma
07cb6aaeff
Made andWhere varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:27:43 +01:00
Roeland Jago Douma
222dbb7bc9
Made where varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:27:11 +01:00
Roeland Jago Douma
2976b39102
Made AddSelect varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:25:32 +01:00
Morris Jobke
53a899a1f5
Fix the HTTP 1.0 status code and properly detect 1.0 vs 1.1&2.0 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-13 09:22:26 +01:00
Morris Jobke
57eaa48e3d
Merge pull request #8788 from nextcloud/cleanup-oc_api 
Remove unused methods and constants from legacy OC_API
 2018-03-13 08:52:24 +01:00
Roeland Jago Douma
c8aee70a0b
Made select varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 08:07:08 +01:00
Roeland Jago Douma
4e8d5504d2
Properly cache swift v3 token 
The V3 token has an export function. Without this the token is
effectively never cached.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-12 20:53:50 +01:00
Morris Jobke
e758cfcdc8
Remove unused methods of OC_Response 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 18:42:30 +01:00
Morris Jobke
a1232f46ca
Remove unused methods and constants from legacy OC_API 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 18:03:25 +01:00
Morris Jobke
2b335fd607
Use insertIfNotExist of the new interface 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 17:45:49 +01:00
Morris Jobke
3655951dd7
Merge pull request #8787 from nextcloud/remove-deprecated-and-unused-methods-of-db 
Remove deprecated and unsused methods of OCP\DB
 2018-03-12 16:34:37 +01:00
Morris Jobke
432e529827
Merge pull request #8784 from nextcloud/remove-unused-deprecated-apphelper 
Remove unused and deprecated class and interface AppHelper
 2018-03-12 16:33:46 +01:00
Morris Jobke
f5c5c5181f
Remove unused and deprecated class and interface AppHelper 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:27:10 +01:00
Morris Jobke
44289ff134
Use proper method to format absolute timestamp 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:16:52 +01:00
Morris Jobke
8195b17ed7
Remove deprecated and unsused methods of OCP\DB 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:13:37 +01:00
blizzz
054a45c079
Merge pull request #8710 from nextcloud/followup/8596/tests-for-user-pagination 
Tests for email collaborators pagination
 2018-03-09 11:21:21 +01:00
Roeland Jago Douma
129a608ebe
OCP\AppFramework\App strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-09 08:42:03 +01:00
Roeland Jago Douma
7a7c350a2d
Merge pull request #8716 from nextcloud/fix-cache-prefixing 
Remove base url from global cache prefix
 2018-03-08 21:12:54 +01:00
Roeland Jago Douma
d05469959e
Merge pull request #8715 from nextcloud/objectstore-no-part-files 
disable part files for object stores
 2018-03-08 20:52:16 +01:00
John Molakvoæ (skjnldsv)
00122fa027
Use group displayNames in users list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-08 17:13:49 +01:00
Joas Schilling
82137f443d
Correctly return the group name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 17:13:48 +01:00
Joas Schilling
aef86a5f5a
Show the displayname in the users group list 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 17:13:48 +01:00
Joas Schilling
882096653e
Fix calculation if there are more results 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 16:22:16 +01:00
Morris Jobke
a2db959f5c
Merge pull request #8593 from eneiluj/master 
Allow public page access to apps with group restrictions
 2018-03-08 11:27:52 +01:00
Roeland Jago Douma
3ad7daeda5
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-08 11:05:18 +01:00
Roeland Jago Douma
340e8ef16c
Make SecurityMiddleware strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-08 10:11:47 +01:00
Morris Jobke
069e3f50a7
Merge pull request #8711 from nextcloud/objectstore-write-only-fopen 
don't read existing file when overwriting using object store
 2018-03-08 09:32:39 +01:00
Roeland Jago Douma
af55b03386
Merge pull request #8662 from nextcloud/better-debugging-unit-tests 
Better debugging for "Your test case is not allowed to access the dat…
 2018-03-07 21:53:34 +01:00
Joas Schilling
1dd40b1f45
Single quotes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-07 16:50:18 +01:00
Joas Schilling
559978c50e
Suppress phan error 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-07 16:43:16 +01:00
Julius Härtl
63e261b444
Actually clear cache values for all base urls 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Julius Härtl
f652c28b21
Use JSCombiner from server container when searching for JS files 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Julius Härtl
50a9beb4bb
Move base url from global cache prefix to frontend related ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Morris Jobke
8d865483f4
Merge pull request #8714 from nextcloud/8705 
Check if the cached js file exists
 2018-03-07 14:45:43 +01:00
Robin Appelman
fc35352122
disable part files for object stores 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-07 13:33:35 +01:00
Roeland Jago Douma
34b86edc34
Check if the cached js file exists 
Fixes #8705

If the file does not exist (for whatever reason). It is never cached. No
matter what the depscache etc tell you.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-07 12:55:05 +01:00
Robin Appelman
9764e70494
don't read existing file when overwriting using object store 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-07 12:05:57 +01:00
Morris Jobke
65cc155a11
Merge pull request #8596 from nextcloud/bugfix/8454/sharee-email-matches-not-limited 
Also array_slice wide email matches of local users
 2018-03-06 22:21:03 +01:00
Morris Jobke
de56915605
Merge pull request #7419 from Abijeet/feature-7175 
Fixes #7175 - Allow to search for email address in user management
 2018-03-06 21:53:37 +01:00
Morris Jobke
c88112bb41
Merge pull request #8579 from nextcloud/feature/2692/merge-can-i-update 
Display a list of unavailable apps for updates (aka. merge "Can I update?")
 2018-03-06 21:31:06 +01:00
Morris Jobke
846b0d6a42
Merge pull request #5833 from nextcloud/fix_uninstall_rep_step 
Run repair steps on uninstall in all cases
 2018-03-06 17:57:10 +01:00
Morris Jobke
b2a9ea08a3
Remove unused and outdated hook 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-06 17:56:44 +01:00
Joas Schilling
09d8387b00
Try without autoloading 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-06 13:56:44 +01:00
Tobia De Koninck
96a5752340
Remove unused $enableAppsCache in OC_App 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2018-03-06 10:47:16 +01:00
Tobia De Koninck
55b9a5d886
Remove OC_App::disable method 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2018-03-06 10:45:20 +01:00
Tobia De Koninck
539fdaea1e
Run repair steps on uninstall in all cases 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2018-03-06 10:41:55 +01:00
Roeland Jago Douma
d8332d43f8
Make \OC\Security\IdentityProof strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 19:33:16 +01:00
Roeland Jago Douma
5457373407
Merge pull request #8659 from nextcloud/csrf_token_strict 
Make \OC\Security\CSRF strict
 2018-03-05 19:28:10 +01:00
Joas Schilling
97c4c00e3f
Better debugging for "Your test case is not allowed to access the database." 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-05 16:06:29 +01:00
Roeland Jago Douma
4ed9b74a6b
Make OC\Security\CSP strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 15:27:05 +01:00
Roeland Jago Douma
2c8402aa17
Make \OC\Security\CSRF strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 15:01:02 +01:00
Morris Jobke
a8f56ac8c7
Merge pull request #8603 from nextcloud/enc-cleanup 
kill old encryption migration steps
 2018-03-05 11:16:27 +01:00
Roeland Jago Douma
f6fe04f3d7
Fix comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 09:06:51 +01:00
Roeland Jago Douma
0c500e460f
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 09:06:51 +01:00
Roeland Jago Douma
0cef938299
Make \OCP\Mail strict 
* Fix typehints
* Made strict

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 09:06:51 +01:00
Joas Schilling
e05f338ff1
Add the users result only when non empty so tests stay the same 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-02 11:42:57 +01:00
Joas Schilling
158aac00a0
Merge pull request #8289 from nextcloud/appdata_hardening 
AppData hardening
 2018-03-02 11:26:36 +01:00
Bjoern Schiessle
8042e6b8fb
this was a migration step to ownCloud 8.0 to restructure the encryption folder which is no longer needed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-03-02 10:09:52 +01:00
Roeland Jago Douma
7f736923d9
Merge pull request #8284 from nextcloud/lib_log-storage-test-failed 
External storage test: log exceptions
 2018-03-01 20:32:09 +01:00
Joas Schilling
12420aef42
Also array_slice wide email matches of local users 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-01 12:18:44 +01:00
Julien Veyssier
7da0812186 Do not throw AppNotEnabledException for app public pages - refs #6962, refs #5309 
It allows non-logged user to access public pages of applications restricted to a group

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
 2018-02-28 20:35:53 +01:00
Dan Callahan
8797590099
Correct mistaken regex wildcard in .htaccess 
Fixes #8578

Signed-off-by: Dan Callahan <dan.callahan@gmail.com>
 2018-02-28 13:50:54 +00:00
Joas Schilling
029e8cdc5b
Also allow to specify the cache file name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-28 11:31:33 +01:00
Morris Jobke
640db3d5fe
Merge pull request #8219 from nextcloud/fix-overwrite-url-on-cli-install 
Fix proper overwrite URL on CLI install
 2018-02-27 13:49:39 +01:00
Morris Jobke
7bc3c2e057
Merge pull request #7363 from nextcloud/default-share-perms 
Let the admin configure the default share permissions
 2018-02-27 13:44:34 +01:00
Roeland Jago Douma
8b5997483c
Hardening of SimpleFile getContent 
if file_get_contents fails remove the file. And traverse up the tree
checking if the other folders are there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 13:35:09 +01:00
Roeland Jago Douma
01f420c7ac
Merge pull request #8051 from nextcloud/public-template 
Public page template response
 2018-02-27 13:33:19 +01:00
Bjoern Schiessle
3285becdc1
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Bjoern Schiessle
1615312bf1
add share permissions to settings page 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Bjoern Schiessle
7d0102bf73
expose capabilities in js 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Julius Härtl
e5df804834
Expose parameters as variables to templates 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:52 +01:00
Julius Härtl
b89827d761
Enable renderAs public page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:52 +01:00
Julius Härtl
0655df09d6
Pass template parameters to parent template 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:52 +01:00
Morris Jobke
7081bdbea6
Merge pull request #8553 from nextcloud/strict_logger 
Make ILogger strict
 2018-02-27 11:20:06 +01:00
Morris Jobke
8d8b22e294
Merge pull request #8552 from nextcloud/strict_session 
Make ISession strict
 2018-02-27 10:52:55 +01:00
Roeland Jago Douma
6994bce951
Loglevel is an int 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 10:45:35 +01:00
Roeland Jago Douma
83eb548d23
Typehint Throwable 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 10:43:34 +01:00
Roeland Jago Douma
4077f16aec
Make ILogger strict 
* Make implementations strict
* Add scalar typehints

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 10:41:46 +01:00
Morris Jobke
e2cd33adfe
Fix check if theming defaults instance is available 
The check in URLGenerator.php#169 and Server.php#945 are different and thus the DI container could return a \OC_Defaults object which does not provide the wanted method caising a PHP error.

Fixes #8420

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-27 10:15:31 +01:00
Roeland Jago Douma
8cb6bb3987
Make ISession strict 
* Make all implementations strict
* Add scalar types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 22:20:21 +01:00
Morris Jobke
8867629cf1
Merge pull request #8359 from nextcloud/swift-v3 
Support swift v3 authentication
 2018-02-26 18:30:00 +01:00
Morris Jobke
a60d7a8563
Merge pull request #8541 from nextcloud/translate-permission-error-page 
Provide translated error message for permission error
 2018-02-26 17:50:21 +01:00
Morris Jobke
cf35c4b03a
Provide translated error message for permission error 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-26 17:00:29 +01:00
Roeland Jago Douma
812ea354d0
User proper username + pass 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 14:54:18 +01:00
Robin Appelman
31dd6d6aae
add support for v3 swift auth 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-26 14:54:08 +01:00
Roeland Jago Douma
0c4c3676f6
Merge pull request #8504 from nextcloud/bugfix/noid/well-its-not-an-array 
Dont use $info as array when its not an array
 2018-02-26 13:44:57 +01:00
Joas Schilling
226e63695f
Merge pull request #8026 from nextcloud/feature/noid/allow-custom-html-in-html-emails 
Allow custom HTML in HTML Emails
 2018-02-26 13:38:39 +01:00
Joas Schilling
695e32d0a6
Merge pull request #8491 from nextcloud/strict_request 
Make Request strict
 2018-02-26 11:02:30 +01:00
Roeland Jago Douma
043a824e6a
Fix comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-22 15:51:19 +01:00
Roeland Jago Douma
0ee45d3d20
Fix proper types 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-22 15:51:19 +01:00
Roeland Jago Douma
a229095af1
Make Request strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-22 15:51:19 +01:00
Joas Schilling
1aa846107d
Dont use $info as array when its not an array 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-22 14:43:56 +01:00
Roeland Jago Douma
a423860f42
Relax what t accepts so we don't break it all 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-22 12:37:29 +01:00
Roeland Jago Douma
c2c2c06546
Merge pull request #8476 from nextcloud/strict_l10n 
Make OCP\IL10N strict
 2018-02-22 10:03:18 +01:00
Roeland Jago Douma
e1bdeb786e
Merge pull request #8472 from nextcloud/strict_integritycheck 
Make OC\IntegrityCheck strict
 2018-02-22 10:01:50 +01:00
Roeland Jago Douma
a660946ac6
Merge pull request #8490 from nextcloud/strict_systemtags 
Make SystemTag strict
 2018-02-22 10:01:20 +01:00
Roeland Jago Douma
fb41a93a95
Merge pull request #8473 from nextcloud/strict_cmr 
Strict OCP\AppFramework\Utility\IControllerMethodReflector
 2018-02-21 22:56:40 +01:00
Roeland Jago Douma
8e5657014d
Make SystemTag strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 22:08:27 +01:00
Roeland Jago Douma
72e745be26
Handle strict typing in Checker and fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 21:09:08 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
Roland Tapken
dc99442bc1 External storage test: log exceptions 
If an external storage test fails the exception's message is now written
into the logfile (level INFO). Additionally, the stack trace is printed
as DEBUG. This helps to resolve the reason for a failing connection.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2018-02-11 16:45: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
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
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
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
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
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
Roeland Jago Douma
53a780e31c
Do not try to get the jailed path if we can't find the id 
Fixes #8047

If we can't find the file by id there we should just return null instead
of trying to get the jailed path of null.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-03 14:45:28 +01:00
Julius Härtl
c29bf24440
Load guest css on any guest and error page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-02 14:20:13 +01:00
Joas Schilling
c314a07e7f
Merge pull request #8134 from coliff/patch-2 
Update iOS link to geo-detect & show correct store listing
 2018-02-02 12:43:10 +01:00
Christian Oliff
18898383c5
Update defaults.php 2018-02-02 20:37:58 +09:00
Morris Jobke
cbbc6187c2
Update doc link version to 14 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-01 13:52:11 +01:00
Roeland Jago Douma
367b5a794d
Merge pull request #8097 from nextcloud/deprecate-static-app 
Deprecate static methods from  \OCP\App
 2018-01-31 16:23:11 +01:00
Morris Jobke
c95f6a1dc9
Merge pull request #8121 from nextcloud/bugfix/8085/migrations-table-has-old-collation 
Create the migrations table also with the UTF8mb4 collation
 2018-01-31 14:43:40 +01:00
Morris Jobke
3fa92a03e5
Add deprecation checks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-31 14:15:12 +01:00
Julius Härtl
efbdad2d0c
Remove OC_App::removeApp 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-31 14:15:12 +01:00
Julius Härtl
a68895e334
Remove OC_App::installApp since it is not used anymore 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-31 14:15:10 +01:00
Julius Härtl
19a0a9a4e7
Move getAppInfo and getAppVersion to IAppManager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-31 14:13:15 +01:00
Joas Schilling
352a48e273
Create the migrations table also with the UTF8mb4 collation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-31 13:15:00 +01:00
Roeland Jago Douma
1429146083
Merge pull request #8096 from nextcloud/feature/6382/do-not-cache-settings-in-db-anymore 
Do not cache the settings/sections in the database anymore
 2018-01-31 12:49:45 +01:00
Morris Jobke
4fcdfbf5de
Merge pull request #8078 from nextcloud/theming-validate-scss 
SCSS hardening
 2018-01-29 16:12:10 +01:00
Joas Schilling
d971b104ed
Do not cache the settings/sections in the database anymore 
This caused more troubles then it had benefits, especially
when an app got disabled or was removed without being disabled.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-29 15:47:37 +01:00
Morris Jobke
01482b32a1
Merge pull request #8062 from nextcloud/use-class 
Use ::class statement instead of string
 2018-01-29 15:25:08 +01:00
Roeland Jago Douma
c0adfa4375
Don't perform CSRF check on OCS routes with Bearer auth 
Fixes #5694

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-29 14:37:18 +01:00
Morris Jobke
eb51f06a3b
Use ::class statement instead of string 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-29 12:03:47 +01:00
Morris Jobke
a661f043e1
Remove unneeded semicolon and parentheses 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 23:46:40 +01:00
Julius Härtl
e4c58fc473
Add typehinting an fix some minor cleanup 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 20:11:37 +01:00
Julius Härtl
6770213649
Do not rewrite absolute URLs 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 19:08:45 +01:00
Julius Härtl
68db09ddce
Clear injectect variables when resetting the cache 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 19:07:30 +01:00
Morris Jobke
9be6050cc4
Merge pull request #8072 from nextcloud/type-casting 
Use type casting instead of *val() method
 2018-01-26 17:34:55 +01:00
Julius Härtl
5eae4819bf
Make sure that injected variables do not break the CSS generation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 17:03:22 +01:00
Julius Härtl
92e93704be
SCSS files are only cached if their size is > 0 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 17:02:54 +01:00
Morris Jobke
97c216ea06
Merge pull request #8071 from nextcloud/remove-silly-code 
Cleanup unused code
 2018-01-26 15:47:06 +01:00
Morris Jobke
4c38d1ed01
Merge pull request #8054 from nextcloud/substr-use-index 
Use index based string access for substr with length of 1
 2018-01-26 15:40:44 +01:00
Morris Jobke
c005fc6755
Cleanup unused code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 15:25:19 +01:00
Morris Jobke
2ad2eb38e8
Use type casting instead of *val() method 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 15:01:27 +01:00
Morris Jobke
9ff51aafc5
Use index based string access for substr with length of 1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 13:38:34 +01:00
Morris Jobke
6bbea33133
Simplify ternary operator statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 12:36:25 +01:00
Morris Jobke
c1e4f9f305
Use type casting instead of *val() method 
It should be up to 6x faster

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 11:35:42 +01:00
Morris Jobke
fe7e726ab2
Merge pull request #8064 from nextcloud/background-jobs 
Deprecated OCP interface to fetch background job type
 2018-01-26 10:43:21 +01:00
Morris Jobke
9ef6148bfa
Deprecated OCP interface to fetch background job type 
* was not used by apps and also is not needed
* migrated the documentation to IJobList

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 10:43:01 +01:00
Joas Schilling
a7ad7cb08e
Merge pull request #8053 from nextcloud/simplify-substr 
Use short for of substr to not need strlen()
 2018-01-26 10:25:09 +01:00
Joas Schilling
c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value 
Return value immediately instead of assigning to a one-time variable
 2018-01-26 10:15:39 +01:00
Roeland Jago Douma
fab951e4b3
Merge pull request #8057 from nextcloud/unneeded-implements 
Implements are not needed because they are already done by base class
 2018-01-26 10:00:25 +01:00
Roeland Jago Douma
e97165e0b5
Merge pull request #8055 from nextcloud/improve-loop 
Improve conditional of loop
 2018-01-26 09:59:45 +01:00
Roeland Jago Douma
5a7a5e5352
Merge pull request #8058 from nextcloud/useless-return 
Remove useless return statements
 2018-01-26 09:51:26 +01:00
Roeland Jago Douma
43ed8b446c
Merge pull request #8060 from nextcloud/proper-codeflow 
Use proper code flow instead of not needed else branch
 2018-01-26 09:49:30 +01:00
Morris Jobke
0a56d2185e
Return value immediately instead of assigning to a one-time variable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 00:02:03 +01:00
Morris Jobke
16a558871c
Use proper code flow instead of not needed else branch 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 23:01:03 +01:00
Morris Jobke
4dbee99b7b
Remove useless return statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:50:40 +01:00
Morris Jobke
55ef34b23b
Implements are not needed because they are already done by base class 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:42:24 +01:00
Morris Jobke
870fe20acc
Use $var[] = $a instead of array_push - 2x faster 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:36:03 +01:00
Morris Jobke
c314eb74a9
Improve conditional of loop 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:33:43 +01:00
Morris Jobke
e6efa755c9
Use short for of substr to not need strlen() 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:23:48 +01:00
Roeland Jago Douma
eddd135f14
Dispatch event on twofactor failure and success 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-25 13:25:09 +01:00
Robin Appelman
3499cbdb76
Use S3Client::upload instead of splitting single/multipart upload ourselves 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-24 17:22:05 +01:00
Morris Jobke
0e9009989f
Merge pull request #8020 from nextcloud/fix-avatar-migration 
Make sure we always know for sure if an avatar is generated or not
 2018-01-24 15:18:19 +01:00
Morris Jobke
1daddd678e
Merge pull request #8002 from nextcloud/dont_polutelog_dav_emaillogin 
Dont polute the log on DAV emaillogin
 2018-01-24 14:00:01 +01:00
Julius Härtl
ef1265e5f5
Make sure we always know for sure if an avatar is generated or not 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-24 13:10:20 +01:00
Roeland Jago Douma
4537faa5da
Merge pull request #7918 from nextcloud/properly-log-exceptions 
Properly log the full exception instead of only the message
 2018-01-23 11:56:02 +01:00
Morris Jobke
2a38605545
Properly log the full exception instead of only the message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-23 10:57:21 +01:00
Morris Jobke
5c360a41e9
Merge pull request #7858 from nextcloud/fix-local-storage 
Use fallback path if data dir is not available for Storage/Local.php
 2018-01-23 10:52:41 +01:00
Roeland Jago Douma
ef127a30ec
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 10:35:37 +01:00
Morris Jobke
caccf7a2e9
Merge pull request #7989 from nextcloud/cleanup-unused-share-methods 
Remove not used methods of legacy share.php
 2018-01-23 10:00:24 +01:00
Roeland Jago Douma
0660e57b1f
Don't polute log when loggin into dav with email 
* We first try the email as username but this fails
* Then we get the uid from the email and try again

We should not log the first attempt since it polutes the log with failed
login attempts while the login actually is valid.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 09:41:44 +01:00
Roeland Jago Douma
eb3fd4bce6
Merge pull request #7988 from nextcloud/cleanup-old-repair-steps 
Remove old repair steps that aren't executed anymore
 2018-01-22 19:54:46 +01:00
Morris Jobke
71cf31f211
Remove not used methods of legacy share.php 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-22 14:54:07 +01:00
Morris Jobke
d9b1492e03
Remove old repair steps that aren't executed anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-22 14:51:02 +01:00
Roeland Jago Douma
8703df3233
If the preview is size 0 it is invalid 
* delete it
* throw a NotFound Exception
  - This should a proper 404 to the user
  - Next time it is then regenerated

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-22 13:57:00 +01:00
Morris Jobke
80a36380fc
Disable vendor detection when upgrading from 11.0.x 
Upgrade from 11 to 14 is not supported anyways.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-20 11:14:06 +01:00
Morris Jobke
c70927eaa0
Remove not needed 3rdparty app disabling during upgrade for PHP 5.x 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-19 14:00:27 +01:00
Morris Jobke
bcba1a97ad
Use fallback path if data dir is not available for Storage/Local.php 
Found while testing strict types for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-18 16:38:01 +01:00
Morris Jobke
0d9f73a814
Do not show "Not installed warning" during occ install 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-18 14:55:32 +01:00
Julius Härtl
f0b7b2dedf
Merge pull request #7911 from nextcloud/improve-oc_image 
Improve OC_Image code to not guess the type of input
 2018-01-18 14:39:08 +01:00
Morris Jobke
3d4c698f44
Improve OC_Image code to not guess the type of input, but actually request the specific methods to be called 
Followup to #7836

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-18 13:40:55 +01:00
Roeland Jago Douma
1e7b20f615
Remove IAppConfig::setValue 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-17 21:41:57 +01:00
Roeland Jago Douma
09f8a755ec
Remove IAppConfig::getValue 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-17 21:41:56 +01:00
Roeland Jago Douma
ee2617d88c
Simple IAppConfig deprecations 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-17 21:03:04 +01:00
Roeland Jago Douma
6e29b8731e
Merge pull request #7914 from nextcloud/fix-7254 
format self-mentions, but don't offer them
 2018-01-17 14:59:46 +01:00
Arthur Schiwon
39f34603f2
add types to php doc 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-01-17 13:58:42 +01:00
Arthur Schiwon
6fdd686111
do not offer the handle of the current user for auto completion 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-01-17 13:49:18 +01:00
Arthur Schiwon
3784fa2074
comments should compile mentions also if done by author 
it is used by clients for formatting reasons, there is no reason not format
the author if her handle is included in the comment body.
It is unrelated to sending out notifications.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-01-17 13:48:43 +01:00
Morris Jobke
24c58d39f4
Merge pull request #7909 from nextcloud/fix-migration-type-hints 
Fix the type hints of migrations and correctly inject the wrapped sch…
 2018-01-17 13:47:58 +01:00
Roeland Jago Douma
f8756d96bc
Merge pull request #7847 from nextcloud/avatarmanager_strict 
Fixes for avatarmanager
 2018-01-17 13:46:18 +01:00
Roeland Jago Douma
73cc4ac1f6
Merge pull request #7912 from nextcloud/bugfix/noid/correctly-drop-owncloud-migrations-table 
Correctly drop the ownCloud migrations table
 2018-01-17 13:45:36 +01:00
Joas Schilling
0d37d24b4b
Correctly drop the ownCloud migrations table 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-17 12:17:41 +01:00
Morris Jobke
c121610d5a
Merge pull request #7813 from nextcloud/getHeader-should-only-return-string 
Request->getHeader() should always return a string
 2018-01-17 11:42:31 +01:00
Morris Jobke
9222dcd940
Merge pull request #7836 from nextcloud/image-type-hinting 
Fix float/integer handling in image API
 2018-01-17 11:40:35 +01:00
Joas Schilling
4a5282ba21
Fix the type hints of migrations and correctly inject the wrapped schema into migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-17 11:37:36 +01:00
Roeland Jago Douma
6e95bd7a51
Merge pull request #7899 from nextcloud/strict_discservice 
Strict DiscoveryService
 2018-01-17 10:01:56 +01:00
Morris Jobke
e4b3ee8d8f
Fix float/integer handling in image API 
* IImage::crop/preciseResize now have type hinting for integers
* found while testing strict typing for PHP 7+

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-17 10:00:33 +01:00
Morris Jobke
4ef302c0be
Request->getHeader() should always return a string 
PHPDoc (of the public API) says that this method returns string but it also returns null, which is not allowed in some method calls. This fixes that behaviour and returns an empty string and fixes all code paths that explicitly checked for null to be still compliant.

Found while enabling the strict_typing for lib/private for the PHP7+ migration.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-17 09:51:31 +01:00
Morris Jobke
22b3280ac2
Merge pull request #7897 from nextcloud/strict_lockingproviders 
Made locking providers strict
 2018-01-17 09:33:52 +01:00
Morris Jobke
cb0dbfa987
Merge pull request #7900 from nextcloud/strict_security 
Make OCP\Security stricter
 2018-01-17 09:29:32 +01:00
Roeland Jago Douma
d1420ef481
Merge pull request #7901 from nextcloud/strict_cache_factory 
Made the cache factory strict
 2018-01-17 06:51:04 +01:00
Morris Jobke
0b464e5274
Merge pull request #7884 from nextcloud/cleanup-oc_user 
Cleanup OC_User and OCP\User
 2018-01-17 05:33:07 +01:00
Roeland Jago Douma
569b8413d4
Add extra check so we don't error out on type 
json_decode can return false if we have invalid data.
In that case just assume there was nothing cached

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-16 22:06:57 +01:00
Roeland Jago Douma
0e0db37658
Make OCP\Security stricter 
* Add typehints
* Add return types
* Opcode opts from phpstorm
* Made strict
* Fixed tests: No need to test bogus values anymore strict typing fixes
this

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-16 22:01:19 +01:00
Roeland Jago Douma
c5fcfb0709
Made the cache factory strict 
* Return types
* Typehints
* made strict
* fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-16 21:58:20 +01:00
Roeland Jago Douma
8edbfdb291
Made locking providers strict 
* Added typehints
* Added return types
* Made strict

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-16 21:54:20 +01:00
Morris Jobke
117c1c90df
Merge pull request #7894 from nextcloud/strict_http_client 
Make OCP\Http strict
 2018-01-16 21:49:18 +01:00
Julius Härtl
e7605d9adc
Merge pull request #7892 from nextcloud/cloudid_strict 
Make OCP\Federation strict
 2018-01-16 21:10:53 +01:00
Roeland Jago Douma
cdfffe7bda
Strict DiscoveryService 
* Made strict
* Type hints
* Return types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-16 20:01:38 +01:00
Roeland Jago Douma
2b70c708ab
Merge pull request #7882 from nextcloud/search-and 
Support arbitrary number of arguments for d:or and d:and in search queries
 2018-01-16 19:53:01 +01:00
Roeland Jago Douma
50acde36b7
Make OCP\Federation strict 
* Also internal classes
* Added scalar typehints
* Added return type
* Made strict

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-16 19:25:08 +01:00
Roeland Jago Douma
a345605ec1
Make OCP\Http strict 
* Handle private files
* Add return types
* Add scalar typehints
* Made strict
* Fixed requiring proper guzzle message interface that is passed around

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-16 19:19:58 +01:00
Morris Jobke
55532f19d9
Cleanup OC_User and OCP\User 
* mainly removes deprecated methods and old static code

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-16 18:39:11 +01:00
Joas Schilling
13a787e2f5
Merge pull request #7885 from nextcloud/ocp-user-app-code-check 
Add OCP\User deprecations to app code checker
 2018-01-16 14:17:07 +01:00
Morris Jobke
e13fe076d2
Add OCP\User deprecations to app code checker 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-16 13:32:37 +01:00
Robin Appelman
326d55db81
Support arbitrary number of arguments for d:or and d:and in search queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-16 13:22:28 +01:00
Joas Schilling
c95890f9b0
Keep all shipped apps enabled because they should be okay 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-16 11:39:48 +01:00
Morris Jobke
2997bb9c69
Merge pull request #7870 from nextcloud/remove-core-api 
Remove deprecated core API
 2018-01-15 18:47:34 +01:00
Morris Jobke
fc9f5fdfc4
Merge pull request #7835 from nextcloud/fix-empty-overwrite-url-in-setup 
Fix case when overwrite URL is empty during setup
 2018-01-15 17:55:23 +01:00
Joas Schilling
7bc9a69c3f
Remove deprecated core API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-15 17:54:50 +01:00
Morris Jobke
82869b6d81
Fix case when overwrite URL is empty during setup 
Found while testing strict typing for PHP 7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-15 11:15:38 +01:00
Roeland Jago Douma
0023cb12fd
Merge pull request #7853 from nextcloud/strict_urlgenerator 
Make the URLGenerator strict
 2018-01-15 09:32:29 +01:00
Roeland Jago Douma
d44de92c31
Merge pull request #7838 from nextcloud/timefactory_strict 
Make the ITimeFactory strict + return types
 2018-01-15 09:27:37 +01:00
Morris Jobke
bf680adaa8
Merge pull request #7856 from nextcloud/fix-strict-type 
Move strict type declare statement below PHP tag
 2018-01-14 23:38:55 +01:00
Christoph Wurst
bdd99b096f
Merge pull request #7833 from nextcloud/fix-code-checker 
Fix casting in app code checker
 2018-01-14 22:36:59 +01:00
Roeland Jago Douma
419de27b6d
Merge pull request #7840 from nextcloud/dep_config 
Remove deprecated \OCP\Config
 2018-01-14 22:21:37 +01:00
Roeland Jago Douma
7ffd62bf95
Make the ITimeFactory strict + return types 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 21:55:40 +01:00
Roeland Jago Douma
48ea7251d7
Use \OC\User\Manager internally in the avatarmanager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 21:32:54 +01:00
Roeland Jago Douma
4c56acffd1
Made AvatarManager string and add return types 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 21:32:54 +01:00
Roeland Jago Douma
a3b33bea03
Make the URLGenerator strict 
* Add scalar argument types
* Add return types
* Make strict
* General phpstorm cleanup

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 21:18:48 +01:00
Morris Jobke
c0c4263546
Merge pull request #7850 from nextcloud/strict_ipaddress 
Make IPAddress typed and strict
 2018-01-14 21:16:06 +01:00
Roeland Jago Douma
bb2938a47d
Make IPAddress typed and strict 
* Added scalar typehints
* Added return statements
* Added strict declaration

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 21:15:44 +01:00
Morris Jobke
2ed4bea18f
Merge pull request #7852 from nextcloud/strict_ratelimiting 
Make OC\Security\RateLimiting strict
 2018-01-14 21:08:45 +01:00
Roeland Jago Douma
cf0a339997
Make OC\Security\RateLimiting strict 
* Add return types
* Add scalar argument types
* Made strict
* Cleaned up phpstorm inspections

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 21:08:23 +01:00
Morris Jobke
fcea6e1564
Merge pull request #7849 from nextcloud/strict_securerandom 
Strict ISecure random
 2018-01-14 21:05:19 +01:00
Roeland Jago Douma
6e1ee1e7a7
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 21:04:52 +01:00
Morris Jobke
fc94d1b573
Move strict type declare statement below PHP tag 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-14 20:59:17 +01:00
Morris Jobke
3f2007025a
Merge pull request #7845 from nextcloud/capabilties_manager_strict 
Make the capabilities manager strict
 2018-01-14 20:53:17 +01:00
Morris Jobke
3ade5ccb27
Merge pull request #7839 from nextcloud/dep_dicontainer 
Remove deprecated functions from DI Container
 2018-01-14 20:51:21 +01:00
Christoph Wurst
9e7fce7213
Merge pull request #7834 from nextcloud/database-schema-checker-casts 
Add casts to XML parser in DatabaseSchemaChecker
 2018-01-14 18:58:15 +01:00
Morris Jobke
a2678d56aa
Merge pull request #7842 from nextcloud/dep_isearch 
Removed deprecated search function from ISearch
 2018-01-14 14:47:23 +01:00
Roeland Jago Douma
de5d7aa331
Strict ISecure random 
* Declare strict
* Scalar arguments
* Return type
* Use fully qualified name for strlen

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-13 21:39:34 +01:00
Roeland Jago Douma
758cb4d008
Make the capabilities manager strict 
* Add return types
* Add scalar type hints
* Use [] instead of array_push (PHPStromg inspection recommendation)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-13 19:53:31 +01:00
Roeland Jago Douma
704133d732
Remove deprecated functions from DI Container 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-13 19:29:52 +01:00
Roeland Jago Douma
21a720e026
Removed deprecated search function from ISearch 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-13 19:27:25 +01:00
Roeland Jago Douma
8a41d05761
Remove deprecated \OCP\Config 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-13 14:25:04 +01:00
Morris Jobke
ca28df6fcc
Adds type hinting for scalar types in ICrypto->decrypt 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-13 00:06:03 +01:00
Morris Jobke
16f4d71efd
Merge pull request #7824 from nextcloud/fix-type-in-CryptoSessionData 
Fix type in CryptoSessionData
 2018-01-13 00:01:52 +01:00
Morris Jobke
24bc8c44da
Add casts to XML parser in DatabaseSchemaChecker 
Preparation for strict_typing for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 23:38:10 +01:00
Morris Jobke
c739ca3c50
Fix casting in app code checker 
Found while adding strict typing for PHP7+. This adds type hinting to all methods in CodeChecker.php and fixes one implicit cast.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 23:24:11 +01:00
Morris Jobke
fe0dbe7fb7
Fix type in CryptoSessionData 
Found while adding strict typing for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 22:41:03 +01:00
Morris Jobke
1efde41333
Check if realpath() returns false 
realpath() returns false in case the directory does not exist. Found it while preparing strict_typing for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 19:40:25 +01:00
Morris Jobke
e4e39910f3
Merge pull request #7819 from nextcloud/fix-explode-in-legacy-helper.php 
Fix explode() call in legacy/helper.php to have correct types
 2018-01-12 17:59:15 +01:00
Roeland Jago Douma
15bbf08774
Merge pull request #7816 from nextcloud/fix-strpos-for-current-app 
Fix strpos if needle is not found
 2018-01-12 16:55:27 +01:00
Morris Jobke
b356d0dfc4
Fix explode() call in legacy/helper.php to have correct types 
Found while enabling strict_typing for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 15:26:49 +01:00
Morris Jobke
e3c0fd6882
Fix strpos if needle is not found 
Found while testing strict_typing for PHP 7+. If `$script` does not contain a `/` then it should extract a string of the length 0.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 15:01:45 +01:00
Morris Jobke
01040daf02
Fix call to clearstatcache to actually use the file path 
* found while adding the strict_typing for PHP 7+ migration
* first argument is a boolean - second one is the path
* see http://php.net/manual/en/function.clearstatcache.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 13:59:58 +01:00
Robin Appelman
42b3aa3a0a
reuse query builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-12 13:57:55 +01:00
Roeland Jago Douma
03a7d9bbfa
Merge pull request #7635 from Abijeet/bug-7106 
Fixes password input being prompted every time.
 2018-01-10 20:10:40 +01:00
Morris Jobke
4823ac969a
Merge pull request #7763 from nextcloud/pos_fix_7751 
Do not instantiate node when not needed
 2018-01-10 15:40:10 +01:00
Roeland Jago Douma
f6d84bdb23
Log a missing setting as INFO not as WARNING 
It can happen for all kinds of reasons that a setting is not available.
(A user removes a folder, a setting got deleted). So don't polute the
log on default settings.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-10 09:02:01 +01:00
Roeland Jago Douma
4596423b14
Do not instantiate node when not needed 
Use the lazy functions is possible. This avoids getting the node if not
required.

Possible fix for #7751

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-09 19:51:50 +01:00
Jan-Christoph Borchardt
9386b07ed8
Merge pull request #7731 from nextcloud/preview_size_inc 
Max preview size to 4096x4096
 2018-01-09 11:07:02 +01:00
Abijeet
de5467811a Fixes password input being prompted every time. 
Fixes #7106

- Echoing the current server time via a JS variable and storing the current time on page load in JS.
- Calculating the diff and taking it into account when deciding whether to show the password confirmation.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-01-08 23:47:52 +05:30
Roeland Jago Douma
e2352cc06f
Max preview size to 4096x4096 
With HiDPI screens. And even normal HD screens you want more detail from
your pictures. Or the ability to somewhat zoom on you previews. For this
we need somewhat larger previews.

Moving the default to 4096x4096 is a step up. Users that want the old
behavior can still set the values in config.php

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-08 15:35:55 +01:00
Roeland Jago Douma
faa68b28cb
Only return 1 type 
Throw proper exception if we can't get the mimetype for a preview. Catch
it later on so we can just return a not found for the preview.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-07 14:36:37 +01:00
Roeland Jago Douma
5b21650097
Don't lie about the preview mimetype 
For legacy reasons we stored all the previews with a png extention.
However we did not put png data in them all the time.

This caused the preview endpoints to always report that a preview is a
png file. Which was a lie.

Since we abstract away from the storage etc in the previewmanager. There
is no need anymore to store them as .png files and instead we can use
the actual file extention.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-07 11:41:54 +01:00
Morris Jobke
68e205e827
Merge pull request #7712 from nextcloud/jsconfig_l10n 
Use correct L10N files for jsconfig
 2018-01-05 15:22:10 +01:00
Roeland Jago Douma
30ac28f950
Use correct L10N files for jsconfig 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-05 14:33:03 +01:00
Morris Jobke
e7aebcfd6b
Merge pull request #7699 from nextcloud/bugfix/7528/drop-owncloud-migrations-table-and-recreate-it 
Drop the ownCloud migration table instead of reusing it
 2018-01-04 16:52:52 +01:00
Joas Schilling
7154050201
Drop the ownCloud migration table instead of reusing it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-04 14:58:01 +01:00
Morris Jobke
e655732458
Merge pull request #7570 from nextcloud/s3-legacy-auth 
add option to use legacy v2 auth with s3
 2018-01-04 13:17:58 +01:00
Morris Jobke
19280adc0d
Merge pull request #7611 from nextcloud/fix-7445 
Don't attempt to translate login names to uids when uids are provided
 2018-01-03 23:45:31 +01:00