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

40943 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Roeland Jago Douma
c3491e3f14
Add annotation 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 16:18:50 +02:00
Roeland Jago Douma
894958e3e2
For images we have a preview for use the preview link 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 16:18:50 +02:00
Roeland Jago Douma
7d8c5f73f5
Add direct preview link to single shared image files 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 16:18:50 +02:00
Roeland Jago Douma
29fb315ffc
Allow requesting the max preview 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 16:18:48 +02:00
John Molakvoæ (skjnldsv)
ab1c34c5a5
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-25 16:17:33 +02:00
Morris Jobke
1ad79e3039 Merge pull request #6630 from nextcloud/same_site_cookie_middleware 
Handle SameSiteCookie check for index.php in AppFramework Middleware
 2017-09-25 16:17:12 +02:00
John Molakvoæ (skjnldsv)
9ff6dab07c
Fix typo 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-25 13:07:18 +02:00
Joas Schilling
e0a4c61350 Merge pull request #6633 from nextcloud/dav-remove-like-when-not-needed 
Don't add a LIKE condition when it's not needed
 2017-09-25 12:12:50 +02:00
Morris Jobke
4677af1a91 Merge pull request #6631 from nextcloud/fix_6170 
Add indexes to cards and cards_properties tables
 2017-09-25 12:01:25 +02:00
Roeland Jago Douma
4ac32223da
Add indexes to cards and cards_properties tables 
Fixes #6170

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 10:27:46 +02:00
Stephan Müller
f7790c2960
expect call of getSlogan() exactly twice 
Signed-off-by: Stephan Müller <mail@stephanmueller.eu>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 09:20:46 +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
Thomas Citharel
f1bfd4433e
Don't add a LIKE condition when it's not needed 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-09-25 09:10:44 +02:00
Nextcloud bot
199c4b2ff9
[tx-robot] updated from transifex 2017-09-25 00:08:01 +00: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
Roeland Jago Douma
4ee731c1ab Merge pull request #6591 from nextcloud/unify-appearance-of-avatars-for-undefined-and-unknown-users 
Unify appearance of avatars for undefined and unknown users
 2017-09-24 13:12:58 +02:00
Roeland Jago Douma
24a881f75e Merge pull request #6623 from nextcloud/fix-app-nav-img 
Fix app nav img margin
 2017-09-24 13:07:21 +02:00
John Molakvoæ (skjnldsv)
308e1c0ed2
Icons & default classes 
Changed categories order same as app store

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-24 08:59:09 +02:00
John Molakvoæ (skjnldsv)
7cee919f57
Fix busy state loading animation in files 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-23 18:18:14 +02:00
John Molakvoæ (skjnldsv)
d169e3fd59
Removed unused filter for opacity, fix #6408 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-23 18:18:14 +02:00
John Molakvoæ (skjnldsv)
f41f4f1932
Settings button as nav entry 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-23 18:18:14 +02:00
John Molakvoæ (skjnldsv)
65353af374
Replaced colours by variables 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-23 18:17:44 +02:00