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

7763 commits

Author SHA1 Message Date
Arthur Schiwon
3db3e65121
add tests for Lookup Plugin 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:25 +02:00
Arthur Schiwon
a28b1d91f9
split off former searchSharee unit test 
also moves registering default plugins to Server for proper unit testing

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
3d1d03a511
split off getEmail tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
c92f7ee767
split off getRemote unit tests 
adds two small fixes → they actually work \o/

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
dd9e191d37
split off getUsers unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
f446ec83dd
minor fixes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
9db3b04f1b
finetune the appinfo parser 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
c55583d1b4
allow more than one plugin per share type 
however it does not dedupe (appears too complex/expensive while we don't
havve the issue currently)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
f7713e5f3f
make it possible to register plugins and kick out the circle one 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
4a96e22258
don't keep result types hard coded 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
ea3ac4e656
Splits off the logic from sharees endpoint thus making it available from 
within Nc/via PHP.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:17 +02:00
John Molakvoæ
fc46e98fc6 Merge pull request #6647 from nextcloud/scss-no-take-only-throw 
Do not stop on scss compilation failure
 2017-09-26 16:26:43 +02:00
John Molakvoæ (skjnldsv)
dec713fc92
Do not stop on scss compilation failure 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-26 15:29:37 +02:00
Morris Jobke
11c31e94fe
Improve exception handling 
If there is an exception in the template handling then a white page is shown.
This improves the handling of this and shows text only about the internal
error.

To test this just setup redis as cache and then disable the php-redis module.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-26 13:54:51 +02:00
Morris Jobke
292a704648 Merge pull request #6544 from nextcloud/fix/duplicate-session-token 
Fix duplicate session token after remembered login
 2017-09-25 17:39:02 +02:00
Roeland Jago Douma
3bd4e7e541 Merge pull request #6632 from nextcloud/do_not_show_hyphen 
Do not show hyphen
 2017-09-25 16:34:50 +02:00
Stephan Müller
86265320b8
do not show hyphen after instance name in emails if slogan does not exist 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 09:20:46 +02:00
Roeland Jago Douma
c257cd57d4
Handle SameSiteCookie check for index.php in AppFramework Middleware 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-24 21:07:16 +02:00
John Molakvoæ (skjnldsv)
4a5eeb2ce7
Fixed webroot detection 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-22 07:20:31 +02:00
Morris Jobke
38568c362b Merge pull request #6605 from nextcloud/oc_ocs_response_is_dep 
OC_OCS_Response is deprecated
 2017-09-21 20:38:18 +02:00
Roeland Jago Douma
2207fdcd8c
Remove private legacy OC_OCS_Response 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-21 17:56:56 +02:00
Roeland Jago Douma
87e10f9e6a
OC_OCS_Response is deprecated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-21 17:56:00 +02:00
John Molakvoæ (skjnldsv)
0e17b65bcf
Avoid error undefined index classes in log 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-21 14:00:39 +02:00
Christoph Wurst
38bb6e1477
Fix duplicate session token after remembered login 
On a remembered login session, we create a new session token
in the database with the values of the old one. As we actually
don't need the old session token anymore, we can delete it right
away.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-09-20 21:39:31 +02:00
Roeland Jago Douma
8358c63f53 Merge pull request #6573 from nextcloud/nonfound-webroot-empty-string 
Fix "webroot not found" when installed to the root of the webserver
 2017-09-20 20:04:27 +02:00
Robin Appelman
5430d73a0e
Fix "webroot not found" when installed to the root of the webserver 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-20 14:19:15 +02:00
Roeland Jago Douma
6d7ca1092d
Read appinfo from a local cache 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-19 14:34:11 +02:00
Robin Appelman
d526969a68
fix path style 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-18 15:16:28 +02:00
Robin Appelman
d70607104e
reuse object read/write/delete logic in s3 implementations 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-18 15:16:27 +02:00
Robin Appelman
dad18baec8
update aws sdk and move it to 3rdparty 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-18 15:16:27 +02:00
Roeland Jago Douma
ca5c3f839a Merge pull request #6490 from nextcloud/share_pagination_query 
Improve sharing pagination
 2017-09-18 14:34:15 +02:00
Morris Jobke
a0132a49a6 Merge pull request #6549 from nextcloud/fix-6534 
don't pass User object when uid string is expected
 2017-09-18 14:28:14 +02:00
Lukas Reschke
53057f2bd0 Merge pull request #5462 from nextcloud/add-frameancestor-support 
Add CSP frame-ancestors support
 2017-09-18 14:25:44 +02:00
Arthur Schiwon
0837745477
don't pass User object when uid string is expected 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-18 13:19:47 +02:00
Roeland Jago Douma
ae1fdf73c2
Improve sharing pagination 
Basically we did in almost all cases did a query to much.
This resulted in an extra query for each share type.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-15 19:44:19 +02:00
Lukas Reschke
705432ca6f
Add filter for shareapi_allow_share_dialog_user_enumeration 
This adjusts the contacts menu to also support searching by email address which is relevant in scenarios where no UID is known such as LDAP, etc.

Furthermore, if `shareapi_allow_share_dialog_user_enumeration` is disabled only results are shown that match the full user ID or email address.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-09-15 15:58:04 +02:00
Thomas Citharel
ecf347bd1a Add CSP frame-ancestors support 
Didn't set the @since annotation yet.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-09-15 15:23:10 +02:00
Tobia De Koninck
5896176d69
Fix issue when disabling the shareapi_only_share_with_group_members option + fix findOne 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-09-15 14:31:41 +02:00
Tobia De Koninck
7dfa527da2
Improve code style 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-09-15 14:31:40 +02:00
Tobia De Koninck
f0370c0244
Some code improvements 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-09-15 14:31:40 +02:00
Tobia De Koninck
fa402c74d2
Add tests 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-09-15 14:31:40 +02:00
Tobia De Koninck
473a1ecad1
Fix tests 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-09-15 14:31:39 +02:00
Tobia De Koninck
92c238e0f0
Privacy enhancements for contacts menu 
- Groups, which are excluded from sharing should not see local users at all
 - If sharing is restricted to users own groups, he should only see contacts from his groups:

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-09-15 14:31:39 +02:00
John Molakvoæ (skjnldsv)
1a0ac912b2
Fix webroot throw 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-14 08:41:10 +02:00
Morris Jobke
883574974d Merge pull request #6458 from nextcloud/rethrow-correct-exception 
Rethrow the correct exception when there was an error in an app conta…
 2017-09-14 00:32:13 +02:00
Lukas Reschke
8ef4fcb4b7 Merge pull request #6452 from lukanetconsult/hotfix/issue-6415-undefined-variable 
Fix undefined variable $tmpRoot
 2017-09-13 22:42:42 +02:00
Roeland Jago Douma
9163cf9241
Fix AppPassword 2FA auth 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-12 22:28:43 +02:00
Axel Helmert
01d4967130 Fix undefined variable $tmpRoot 
Refactoring of webroot detection left an unused variable.

Fixes: #6415
Signed-off-by: Axel Helmert <info@luka.de>
 2017-09-12 12:14:27 +02:00
Joas Schilling
c4b3198ac2
Rethrow the correct exception when there was an error in an app container 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-12 11:54:13 +02:00
Julius Härtl
8391ca8792
Use IAppManager instead of private API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 09:28:22 +02:00