summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #4418 from nextcloud/fix_3380Roeland Jago Douma2017-04-212-2/+2
|\ \ \ \
| * | | | No need to log guzzle exceptionRoeland Jago Douma2017-04-212-2/+2
|/ / / /
* | | | Merge pull request #4406 from nextcloud/fix-unit-test-problemsRoeland Jago Douma2017-04-2122-356/+142
|\ \ \ \
| * | | | Fix invalid Dav testJoas Schilling2017-04-202-7/+17
| * | | | Make sure we use a new encryption module all the timeJoas Schilling2017-04-201-7/+16
| * | | | Don't assume the admin didn't configure Opcache correctly...Joas Schilling2017-04-202-4/+6
| * | | | Fix theming testsJoas Schilling2017-04-203-11/+11
| * | | | Use the correct classJoas Schilling2017-04-201-1/+1
| * | | | Import some classesJoas Schilling2017-04-201-80/+51
| * | | | Use the correct Dummy and Backend classJoas Schilling2017-04-201-2/+2
| * | | | Kill dead codeJoas Schilling2017-04-204-216/+0
| * | | | Fix warning with undefined methodJoas Schilling2017-04-201-4/+4
| * | | | Don't use deprecated getMock() anymoreJoas Schilling2017-04-204-19/+22
| * | | | Restoring the error handler within the error handler causes unexpected resultsJoas Schilling2017-04-201-3/+10
| * | | | Delete the correct config valueJoas Schilling2017-04-201-1/+1
| * | | | Only loop over Test casesJoas Schilling2017-04-201-1/+1
| |/ / /
* | | | 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