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

8392 commits

Author SHA1 Message Date
blizzz
76d23a1600
Merge pull request #8806 from nextcloud/add-local-memcache-check 
Properly provide local memcache check to ICacheFactory
 2018-03-13 21:27:24 +01:00
Morris Jobke
dde5353f98
Properly provide local memcache check to ICacheFactory 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-13 18:18:04 +01:00
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