summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-20130-48/+478
|
* Merge pull request #4384 from nextcloud/renderHtml-fixMorris Jobke2017-04-1911-23/+23
|\ | | | | Rename renderHTML to renderHtml
| * Rename renderHTML to renderHtmlMorris Jobke2017-04-1911-23/+23
|/ | | | | | | * fixes #4383 * improves consistency Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #4387 from nextcloud/fix-little-glitchMorris Jobke2017-04-191-1/+1
|\ | | | | Fix font-weight of settings button
| * Fix font-weight of settings buttonMorris Jobke2017-04-181-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4388 from nextcloud/remove-unused-stuffMorris Jobke2017-04-191-58/+0
|\ \ | | | | | | Remove unused CSS styles
| * | Remove unused CSS stylesMorris Jobke2017-04-181-58/+0
| |/ | | | | | | | | | | * could not find an traces of .popup and .arrow anywhere else Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4386 from nextcloud/improve-menu-cssMorris Jobke2017-04-194-72/+28
|\ \ | | | | | | Improve menu CSS
| * | Improve menu CSSMorris Jobke2017-04-194-72/+28
|/ / | | | | | | | | | | | | | | * fix mess with menus and actions in the files app * reduces amount of !important usages * keeps the behaviour on mobile as well as on desktop Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4385 from nextcloud/remove-unused-cssRoeland Jago Douma2017-04-192-57/+5
|\ \ | | | | | | Remove unused CSS
| * | Remove unused CSSMorris Jobke2017-04-182-57/+5
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4395 from nextcloud/fix_4394Lukas Reschke2017-04-191-0/+4
|\ \ | | | | | | Do not show empty admin sections
| * | Do not show empty admin sectionsRoeland Jago Douma2017-04-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4393 It is far from efficient code. But then again it is easy to understand and I doubt admins will browse it 24/7 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4382 from nextcloud/use-proper-reply-toLukas Reschke2017-04-193-10/+289
|\ \ \ | |/ / |/| | Add "Reply-To" on ShareByMailProvider mails
| * | Fix indentationLukas Reschke2017-04-191-1/+1
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Add "Reply-To" on ShareByMailProvider mailsLukas Reschke2017-04-183-10/+289
| | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/4209 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4350 from ↵Roeland Jago Douma2017-04-198-72/+43
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/adjust-old-bruteforce-protection-annotations Adjust existing bruteforce protection code
| * | | Adjust existing bruteforce protection codeLukas Reschke2017-04-148-72/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Moves code to annotation - Adds the `throttle()` call on the responses on existing annotations Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #4371 from nextcloud/dont-allow-dot-usernamesMorris Jobke2017-04-182-1/+48
|\ \ \ \ | | | | | | | | | | Better validation of allowed user names
| * | | | Better validation of allowed user namesJoas Schilling2017-04-182-1/+48
| | |/ / | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-1914-0/+48
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-18442-2152/+1486
| | | |
* | | | Merge pull request #4369 from nextcloud/fix-translationsMorris Jobke2017-04-1831-46/+46
|\ \ \ \ | | | | | | | | | | Fix translations
| * | | | Fix translationsJoas Schilling2017-04-1831-46/+46
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #3585 from nextcloud/popover-clickable-areaMorris Jobke2017-04-181-0/+1
|\ \ \ \ | | | | | | | | | | expand clickable area of popover menu entries to full width
| * | | | expand clickable area of popover menu entries to full widthJan-Christoph Borchardt2017-04-181-0/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #4379 from nextcloud/nicely-designed-confirmation-mailMorris Jobke2017-04-182-4/+18
|\ \ \ \ | | | | | | | | | | Beautify test email
| * | | | Beautify test emailLukas Reschke2017-04-182-4/+18
| |/ / / | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #4380 from nextcloud/show-instance-name-in-fromMorris Jobke2017-04-181-1/+1
|\ \ \ \ | |/ / / |/| | | Add instance name to default sender
| * | | Add instance name to default senderLukas Reschke2017-04-181-1/+1
| |/ / | | | | | | | | | | | | | | | Otherwise your mail program shows "foo@mail.com" instead of "Nextcloud" or whatever your instance name is. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4372 from nextcloud/smtp-passwordMorris Jobke2017-04-186-134/+113
|\ \ \ | | | | | | | | Don't put the SMTP password into the HTML code
| * | | Fix unit testsMorris Jobke2017-04-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix some more stuffJoas Schilling2017-04-182-16/+22
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix testsJoas Schilling2017-04-182-47/+17
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Don't put the SMTP password into the HTML codeJoas Schilling2017-04-184-74/+77
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-1882-120/+96
| | |
* | | Merge pull request #4376 from ↵Christoph Wurst2017-04-182-40/+35
|\ \ \ | |/ / |/| | | | | | | | nextcloud/add-bruteforce-protection-to-change-self-password Add bruteforce protection to changePersonalPassword
| * | Add bruteforce protection to changePersonalPasswordLukas Reschke2017-04-182-40/+35
|/ / | | | | | | | | | | While the risk is actually quite low because one would already have the user session and could potentially do other havoc it makes sense to throttle here in case of invalid previous password attempts. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | [tx-robot] updated from transifexNextcloud bot2017-04-1854-42/+296
| |
* | [tx-robot] updated from transifexNextcloud bot2017-04-1738-344/+448
| |
* | [tx-robot] updated from transifexNextcloud bot2017-04-1628-346/+624
| |
* | Merge pull request #2834 from nextcloud/accesListToShareManagerMorris Jobke2017-04-1517-32/+1287
|\ \ | | | | | | Access list to share manager
| * | Mail shares trigger the public keyRoeland Jago Douma2017-04-132-17/+17
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Update autoloaderRoeland Jago Douma2017-04-132-0/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Fix server container registrationRoeland Jago Douma2017-04-131-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Not needed in the DIContainer anymoreRoeland Jago Douma2017-04-131-6/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Do not set full path if not currentAccessRoeland Jago Douma2017-04-131-6/+11
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add samples to the docsJoas Schilling2017-04-131-0/+38
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add more tests for the share helperJoas Schilling2017-04-131-0/+111
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Catch exceptions and use as many results as possibleJoas Schilling2017-04-131-24/+59
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>