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

40965 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
90d7e8f6f4 Merge pull request #6586 from nextcloud/fix/app-install-extract-check 
Check whether an app archive can be extracted
 2017-09-27 10:41:21 +02:00
Morris Jobke
b87914be9c Merge pull request #6645 from nextcloud/fix-6642-only-colons-for-ipv6 
Only allow colons in db host for IPv6 addresses
 2017-09-27 10:17:36 +02:00
Morris Jobke
b30b4cddd9 Merge pull request #6660 from nextcloud/remove_saml_hack 
Remove SAML hack from base.php
 2017-09-27 10:13:36 +02:00
Morris Jobke
1fc8ac6db2 Merge pull request #6658 from nextcloud/fix_6618 
Don't show placeholder when we have loaded the avatar image
 2017-09-27 10:11:19 +02:00
Roeland Jago Douma
95cc831ed7
Remove SAML hack from base.php 
This is no longer required now that
https://github.com/nextcloud/user_saml/pull/159 is in

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-27 08:28:09 +02:00
Nextcloud bot
de2dc3c919
[tx-robot] updated from transifex 2017-09-27 00:08:23 +00:00
Arthur Schiwon
937a80c941
reduce nesting of the required app XML 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-27 01:22:17 +02:00
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
c43685e6fc
shareeAPIController unit test clean up and last fixes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:25 +02:00
Arthur Schiwon
f2c8e1ed2f
remove unused method 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:25 +02:00
Arthur Schiwon
a7a651f4a4
move splitUserRemote unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:25 +02:00
Arthur Schiwon
3888b3a285
adapt unit test for ensuring exception 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +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
4a315ede81
adjust ShareeAPIController invalid-input search unit test 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
38ff7eaece
adjust ShareeAPIController search test 
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
b35760de27
split off getGroups unit tests 
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
2eff174deb
add missing PHP doc 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
7122739dd6
updated autoloader 
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
579c1476a3
missing PHP doc for public interfaces 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:22 +02:00
Arthur Schiwon
88db314f0c
update autoloader 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:22 +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
Roeland Jago Douma
b0c9380114
Don't show placeholder when we have loaded the avatar image 
Fixes #6618
Else it shows up as background to transparent avatars

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-26 22:50:16 +02:00
Roeland Jago Douma
271959b1d9 Merge pull request #6646 from nextcloud/federation-active 
Highlight active federation scope menu entry with bold heading
 2017-09-26 21:13:53 +02:00
Jan-Christoph Borchardt
2450b67cb7 Merge pull request #6650 from nextcloud/tooltip-shadow-use-variable 
Fit the tooltip shadow to the default variable
 2017-09-26 17:46:17 +02:00
Daniel Calviño Sánchez
de3138104c Remove unneeded CSS rules 
There are currently no "img" or "span" descendants of "td.quota"
elements, so those rules can be removed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-09-26 17:43:54 +02:00
Daniel Calviño Sánchez
401322bf61 Remove "cursor: pointer" from quota cell 
The quota is set through a dropdown, and this dropdown is only shown
when clicking on the select element itself. Therefore, the cell should
not show a pointer when hovering on it but outside the select element.

Note that although the removed "&.quota" selector also set a "width"
declaration that declaration was later overriden by
"#userlist td.quota", so it was not needed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-09-26 17:43:25 +02:00
Daniel Calviño Sánchez
8363aceb74 Set "cursor: pointer" for email addresses 
Clicking anywhere on the cell shows the input field to set the email
address, so the cursor is set as a pointer not only on the text and
icon, but on the whole cell as well (like done for the full name and the
password).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-09-26 16:59:57 +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)
4febc4811a
Fit the tooltip shadow to the default variable 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-26 15:43:36 +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
Jan-Christoph Borchardt
a5c1e5f952 Highlight active federation scope menu entry with bold heading 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-09-26 15:08:17 +02:00
Morris Jobke
3bde76302f Merge pull request #6643 from nextcloud/improved-redis-warning 
Improve exception handling
 2017-09-26 14:44:47 +02:00
Joas Schilling
fe3b2385ab
Code clean up 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-26 14:27:42 +02:00
Joas Schilling
1287d6ddb3
Only allow colons in db host for IPv6 addresses 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-26 14:20:04 +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
Nextcloud bot
ef3e8faea2
[tx-robot] updated from transifex 2017-09-26 00:08:26 +00:00
Roeland Jago Douma
4077f684e1
Only have direct preview urls for image files 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 21:47:09 +02:00
Roeland Jago Douma
05c37526a7
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 21:44:42 +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
John Molakvoæ
9080976975 Merge pull request #6372 from nextcloud/scss-normalization 
Scss normalization
 2017-09-25 16:50:30 +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
Joas Schilling
f2b7205a88 Merge pull request #6627 from nextcloud/icon-on-apps-settings 
Icon on apps settings
 2017-09-25 16:29:26 +02:00