summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* and add missing whitespaces to log outoutArthur Schiwon2017-09-281-2/+2
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Adjust unittestJuan Pablo Villafáñez2017-09-281-15/+10
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Keep the current quota if no suitable quota is foundJuan Pablo Villafáñez2017-09-281-1/+0
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* 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
| * | | | Improve exception handlingMorris Jobke2017-09-262-1/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | [tx-robot] updated from transifexNextcloud bot2017-09-2614-4/+68
| | | |
* | | | Merge pull request #6544 from nextcloud/fix/duplicate-session-tokenMorris Jobke2017-09-252-0/+9
|\ \ \ \ | |/ / / |/| | | Fix duplicate session token after remembered login
| * | | Fix duplicate session token after remembered loginChristoph Wurst2017-09-202-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #6372 from nextcloud/scss-normalizationJohn Molakvoæ2017-09-2520-1466/+1342
|\ \ \ \ | | | | | | | | | | Scss normalization
| * | | | Fixed testsJohn Molakvoæ (skjnldsv)2017-09-251-8/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix busy state loading animation in filesJohn Molakvoæ (skjnldsv)2017-09-232-5/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Removed unused filter for opacity, fix #6408John Molakvoæ (skjnldsv)2017-09-2312-78/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Settings button as nav entryJohn Molakvoæ (skjnldsv)2017-09-231-11/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Replaced colours by variablesJohn Molakvoæ (skjnldsv)2017-09-238-109/+83
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Settings scssJohn Molakvoæ (skjnldsv)2017-09-232-1312/+1284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scss conversion Cleanup settings scss Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Removed unneeded bgs and borders. Replaced hard coded colours byJohn Molakvoæ (skjnldsv)2017-09-237-33/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables. Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #6632 from nextcloud/do_not_show_hyphenRoeland Jago Douma2017-09-253-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Do not show hyphen
| * | | | | expect call of getSlogan() exactly twiceStephan Müller2017-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stephan Müller <mail@stephanmueller.eu> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | do not show hyphen after instance name in emails if slogan does not existStephan Müller2017-09-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #6627 from nextcloud/icon-on-apps-settingsJoas Schilling2017-09-2514-6/+73
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Icon on apps settings
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-05 00:22:37 +0000