summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix unit testsBjoern Schiessle2017-04-202-10/+4
* respect password policy for auto generated passwordsBjoern Schiessle2017-04-203-6/+44
* improve mail textBjoern Schiessle2017-04-201-3/+2
* create activity if a password was send by mailBjoern Schiessle2017-04-202-24/+101
* allow to set a password for shares which where created without a password bef...Bjoern Schiessle2017-04-201-1/+1
* templates no longer neededBjoern Schiessle2017-04-202-91/+0
* allow admin to enforce password on mail sharesBjoern Schiessle2017-04-2015-32/+318
* Merge pull request #4398 from nextcloud/fix_accesslistcodeJoas Schilling2017-04-202-4/+8
|\
| * Get proper accesslist for userFolderRoeland Jago Douma2017-04-202-4/+8
* | Merge pull request #4212 from individual-it/masterJoas Schilling2017-04-203-39/+151
|\ \
| * | remove accidently left over *f*itArtur Neumann2017-04-181-1/+1
| * | JS tests for upload only functionArtur Neumann2017-04-182-1/+101
| * | refactor to make it easier to testArtur Neumann2017-04-181-45/+50
| * | validate file name before uploading in upload only folderArtur Neumann2017-04-051-1/+8
* | | Merge pull request #4381 from nextcloud/2954_take_2Joas Schilling2017-04-202-8/+6
|\ \ \
| * | | Make group settings routes explicitRoeland Jago Douma2017-04-181-1/+5
| * | | Revert "Match slashes in ../{id} resource routes"Roeland Jago Douma2017-04-181-7/+1
* | | | [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 renderHtmlMorris Jobke2017-04-1911-23/+23
|/ / / /
* | | | Merge pull request #4387 from nextcloud/fix-little-glitchMorris Jobke2017-04-191-1/+1
|\ \ \ \
| * | | | Fix font-weight of settings buttonMorris Jobke2017-04-181-1/+1
* | | | | Merge pull request #4388 from nextcloud/remove-unused-stuffMorris Jobke2017-04-191-58/+0
|\ \ \ \ \
| * | | | | Remove unused CSS stylesMorris Jobke2017-04-181-58/+0
| |/ / / /
* | | | | Merge pull request #4386 from nextcloud/improve-menu-cssMorris Jobke2017-04-194-72/+28
|\ \ \ \ \
| * | | | | Improve menu CSSMorris Jobke2017-04-194-72/+28
|/ / / / /
* | | | | Merge pull request #4385 from nextcloud/remove-unused-cssRoeland Jago Douma2017-04-192-57/+5
|\ \ \ \ \
| * | | | | Remove unused CSSMorris Jobke2017-04-182-57/+5
| |/ / / /
* | | | | Merge pull request #4395 from nextcloud/fix_4394Lukas Reschke2017-04-191-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Do not show empty admin sectionsRoeland Jago Douma2017-04-191-0/+4
* | | | | Merge pull request #4382 from nextcloud/use-proper-reply-toLukas Reschke2017-04-193-10/+289
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix indentationLukas Reschke2017-04-191-1/+1
| * | | | Add "Reply-To" on ShareByMailProvider mailsLukas Reschke2017-04-183-10/+289
* | | | | Merge pull request #4350 from nextcloud/adjust-old-bruteforce-protection-anno...Roeland Jago Douma2017-04-198-72/+43
|\ \ \ \ \
| * | | | | Adjust existing bruteforce protection codeLukas Reschke2017-04-148-72/+43
* | | | | | Merge pull request #4371 from nextcloud/dont-allow-dot-usernamesMorris Jobke2017-04-182-1/+48
|\ \ \ \ \ \
| * | | | | | Better validation of allowed user namesJoas Schilling2017-04-182-1/+48
| | |/ / / / | |/| | | |
* | | | | | [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 translationsJoas Schilling2017-04-1831-46/+46
| |/ / / / /
* | | | | | Merge pull request #3585 from nextcloud/popover-clickable-areaMorris Jobke2017-04-181-0/+1
|\ \ \ \ \ \
| * | | | | | expand clickable area of popover menu entries to full widthJan-Christoph Borchardt2017-04-181-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4379 from nextcloud/nicely-designed-confirmation-mailMorris Jobke2017-04-182-4/+18
|\ \ \ \ \ \
| * | | | | | Beautify test emailLukas Reschke2017-04-182-4/+18
| |/ / / / /
* | | | | | Merge pull request #4380 from nextcloud/show-instance-name-in-fromMorris Jobke2017-04-181-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add instance name to default senderLukas Reschke2017-04-181-1/+1
| |/ / / /
* | | | | Merge pull request #4372 from nextcloud/smtp-passwordMorris Jobke2017-04-186-134/+113
|\ \ \ \ \
| * | | | | Fix unit testsMorris Jobke2017-04-181-1/+1
| * | | | | Fix some more stuffJoas Schilling2017-04-182-16/+22