d6d895dd74
Keep the current quota if no suitable quota is found
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-28 01:13:48 +02:00
5f25dd7095
Merge pull request #6599 from nextcloud/fix_2523
...
Add direct preview link
2017-09-27 23:27:54 +02:00
72889e57ca
Merge pull request #6653 from nextcloud/fix-cursor-on-user-settings-table
...
Fix cursor on user settings table
2017-09-27 23:27:30 +02:00
a90b046a17
Merge pull request #6666 from nextcloud/federation-menu-triangle
...
Fix style of federation scope menu triangles, simplify CSS
2017-09-27 15:19:34 +02:00
291e3d331f
No js for popover positionning
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-27 13:34:29 +02:00
d4f1518533
Fix style of federation scope menu triangles, simplify CSS
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-27 12:20:26 +02:00
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
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
b30b4cddd9
Merge pull request #6660 from nextcloud/remove_saml_hack
...
Remove SAML hack from base.php
2017-09-27 10:13:36 +02:00
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
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
de2dc3c919
[tx-robot] updated from transifex
2017-09-27 00:08:23 +00:00
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
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
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
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
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
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
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
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
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
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
3bde76302f
Merge pull request #6643 from nextcloud/improved-redis-warning
...
Improve exception handling
2017-09-26 14:44:47 +02:00
fe3b2385ab
Code clean up
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-26 14:27:42 +02:00
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
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
ef3e8faea2
[tx-robot] updated from transifex
2017-09-26 00:08:26 +00:00
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
05c37526a7
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 21:44:42 +02:00
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
9080976975
Merge pull request #6372 from nextcloud/scss-normalization
...
Scss normalization
2017-09-25 16:50:30 +02:00
3bd4e7e541
Merge pull request #6632 from nextcloud/do_not_show_hyphen
...
Do not show hyphen
2017-09-25 16:34:50 +02:00
f2b7205a88
Merge pull request #6627 from nextcloud/icon-on-apps-settings
...
Icon on apps settings
2017-09-25 16:29:26 +02:00
c3491e3f14
Add annotation
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 16:18:50 +02:00
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
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
29fb315ffc
Allow requesting the max preview
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 16:18:48 +02:00
ab1c34c5a5
Fixed tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-25 16:17:33 +02:00
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
9ff6dab07c
Fix typo
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-25 13:07:18 +02:00
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
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
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
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
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
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
199c4b2ff9
[tx-robot] updated from transifex
2017-09-25 00:08:01 +00:00
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
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
24a881f75e
Merge pull request #6623 from nextcloud/fix-app-nav-img
...
Fix app nav img margin
2017-09-24 13:07:21 +02:00
Juan Pablo Villafáñez
Morris Jobke
John Molakvoæ
John Molakvoæ (skjnldsv)
Jan-Christoph Borchardt
Roeland Jago Douma
Roeland Jago Douma
Nextcloud bot
Daniel Calviño Sánchez
Joas Schilling
Stephan Müller
Thomas Citharel