summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* avoid duplicate files in google with the same namegvmura2017-04-211-0/+13
* Merge pull request #4408 from nextcloud/accesslist_ngRoeland Jago Douma2017-04-212-14/+18
|\
| * Move systemtags and comments to new accesslist functionsRoeland Jago Douma2017-04-202-14/+18
* | [tx-robot] updated from transifexNextcloud bot2017-04-2126-0/+78
* | Merge pull request #4412 from individual-it/masterMorris Jobke2017-04-201-1/+0
|\ \
| * | deleted forgotten code in testArtur Neumann2017-04-201-1/+0
* | | Merge pull request #4409 from nextcloud/socialharing_mailMorris Jobke2017-04-202-8/+16
|\ \ \
| * | | Allow social sharing to specify if a new window is openedRoeland Jago Douma2017-04-202-8/+16
* | | | Merge pull request #4404 from Ardinis/masterMorris Jobke2017-04-201-6/+6
|\ \ \ \
| * | | | reviewedArdinis2017-04-201-0/+7
| * | | | Remove json handling for files_external:configArdinis2017-04-141-7/+0
* | | | | Merge pull request #3595 from nextcloud/dav-sharing-changesMorris Jobke2017-04-205-62/+85
|\ \ \ \ \
| * | | | | Fix unit testsMorris Jobke2017-04-202-1/+5
| * | | | | Fix remaining "PHP Inspection" warningsJoas Schilling2017-04-202-34/+27
| * | | | | Add public access modifier to all methodsJoas Schilling2017-04-202-20/+20
| * | | | | Restrict share handling to the owner onlyJoas Schilling2017-04-203-8/+34
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4411 from nextcloud/fix-itMorris Jobke2017-04-201-0/+0
|\ \ \ \ \
| * | | | | Remove accidentially commited moduleMorris Jobke2017-04-201-0/+0
|/ / / / /
* | | | | Merge pull request #4402 from nextcloud/fix-clickable-areaBjörn Schießle2017-04-201-0/+11
|\ \ \ \ \
| * | | | | Fix clickable area in share permissions menuMorris Jobke2017-04-191-0/+11
* | | | | | Merge pull request #4303 from nextcloud/enforce-password-mailshareBjörn Schießle2017-04-2015-51/+354
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fix typoMorris Jobke2017-04-201-1/+1
| * | | | | Fix casingMorris Jobke2017-04-202-1/+1
| * | | | | 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
|\ \ \ \ \ \