summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-09-2940-136/+576
|
* Merge pull request #6691 from nextcloud/roundingJoas Schilling2017-09-281-1/+1
|\ | | | | Use full percentages in quota bar percentages
| * Use full percentages in quota bar percentagesMorris Jobke2017-09-281-1/+1
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #6669 from nextcloud/various-css-fixesJohn Molakvoæ2017-09-2811-103/+146
|\ | | | | Various css fixes
| * Fix upload progress color to primaryJohn Molakvoæ (skjnldsv)2017-09-281-15/+16
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fix settings button state and opacityJohn Molakvoæ (skjnldsv)2017-09-282-0/+5
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fix progress input overflowJohn Molakvoæ (skjnldsv)2017-09-282-0/+7
| | | | | | | | | | | | removed border-radius on big quota from the main settings page Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Popover to css guidelinesJohn Molakvoæ (skjnldsv)2017-09-283-38/+19
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fix testsJohn Molakvoæ (skjnldsv)2017-09-281-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fix drop shadow with filterJohn Molakvoæ (skjnldsv)2017-09-271-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fixed quota on homepage (files)John Molakvoæ (skjnldsv)2017-09-272-5/+4
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Quota bar fix on user listJohn Molakvoæ (skjnldsv)2017-09-274-22/+24
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Implement progress theming into core and better visual on quota displayJohn Molakvoæ (skjnldsv)2017-09-273-23/+71
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Drop shadow fix on popoverJohn Molakvoæ (skjnldsv)2017-09-271-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #6683 from nextcloud/filelist-show-navigateMorris Jobke2017-09-281-0/+1
|\ \ | | | | | | navigate to the root directory when showing the main filelist
| * | navigate to the root directory when showing the main filelistRobin Appelman2017-09-281-0/+1
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #6676 from nextcloud/confirm-storage-deleteRoeland Jago Douma2017-09-281-7/+14
|\ \ | | | | | | ask for confirmation when deleting an external storage
| * | ask for confirmation when deleting an external storageRobin Appelman2017-09-271-7/+14
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-09-2842-128/+788
| |
* | Merge pull request #6599 from nextcloud/fix_2523Morris Jobke2017-09-276-2/+69
|\ \ | | | | | | Add direct preview link
| * | Only have direct preview urls for image filesRoeland Jago Douma2017-09-251-2/+5
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Fix testsRoeland Jago Douma2017-09-251-1/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add annotationRoeland Jago Douma2017-09-251-0/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | For images we have a preview for use the preview linkRoeland Jago Douma2017-09-252-1/+3
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add direct preview link to single shared image filesRoeland Jago Douma2017-09-252-0/+54
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Allow requesting the max previewRoeland Jago Douma2017-09-251-0/+6
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #6653 from nextcloud/fix-cursor-on-user-settings-tableMorris Jobke2017-09-271-5/+8
|\ \ \ | |_|/ |/| | Fix cursor on user settings table
| * | Remove unneeded CSS rulesDaniel Calviño Sánchez2017-09-261-3/+3
| | | | | | | | | | | | | | | | | | | | | 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>
| * | Remove "cursor: pointer" from quota cellDaniel Calviño Sánchez2017-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Set "cursor: pointer" for email addressesDaniel Calviño Sánchez2017-09-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #6666 from nextcloud/federation-menu-triangleJohn Molakvoæ2017-09-273-31/+30
|\ \ \ | | | | | | | | Fix style of federation scope menu triangles, simplify CSS
| * | | No js for popover positionningJohn Molakvoæ (skjnldsv)2017-09-272-11/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fix style of federation scope menu triangles, simplify CSSJan-Christoph Borchardt2017-09-272-20/+29
|/ / / | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #6586 from nextcloud/fix/app-install-extract-checkRoeland Jago Douma2017-09-271-1/+8
|\ \ \ | | | | | | | | Check whether an app archive can be extracted
| * | | Check whether an app archive can be extractedChristoph Wurst2017-09-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If extraction fails we should not continue the installation/update process as the info.xml cannot be loaded and an unrelated error occurs. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #6645 from nextcloud/fix-6642-only-colons-for-ipv6Morris Jobke2017-09-271-48/+63
|\ \ \ \ | | | | | | | | | | Only allow colons in db host for IPv6 addresses
| * | | | Code clean upJoas Schilling2017-09-261-48/+47
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Only allow colons in db host for IPv6 addressesJoas Schilling2017-09-261-0/+16
| | |/ / | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #6660 from nextcloud/remove_saml_hackMorris Jobke2017-09-271-16/+1
|\ \ \ \ | | | | | | | | | | Remove SAML hack from base.php
| * | | | Remove SAML hack from base.phpRoeland Jago Douma2017-09-271-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge pull request #6658 from nextcloud/fix_6618Morris Jobke2017-09-272-0/+10
|\ \ \ \ \ | | | | | | | | | | | | Don't show placeholder when we have loaded the avatar image
| * | | | | Don't show placeholder when we have loaded the avatar imageRoeland Jago Douma2017-09-262-0/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6618 Else it shows up as background to transparent avatars Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / / / [tx-robot] updated from transifexNextcloud bot2017-09-2716-4/+154
|/ / / /
* | | | Merge pull request #6646 from nextcloud/federation-activeRoeland Jago Douma2017-09-261-3/+5
|\ \ \ \ | | | | | | | | | | Highlight active federation scope menu entry with bold heading
| * | | | Highlight active federation scope menu entry with bold headingJan-Christoph Borchardt2017-09-261-3/+5
| |/ / / | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #6650 from nextcloud/tooltip-shadow-use-variableJan-Christoph Borchardt2017-09-261-1/+1
|\ \ \ \ | | | | | | | | | | Fit the tooltip shadow to the default variable
| * | | | Fit the tooltip shadow to the default variableJohn Molakvoæ (skjnldsv)2017-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #6647 from nextcloud/scss-no-take-only-throwJohn Molakvoæ2017-09-261-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Do not stop on scss compilation failure
| * | | | | Do not stop on scss compilation failureJohn Molakvoæ (skjnldsv)2017-09-261-0/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #6643 from nextcloud/improved-redis-warningMorris Jobke2017-09-262-1/+13
|\ \ \ \ \ | |_|/ / / |/| | | | Improve exception handling