summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-01-2110-28/+30
* Merge pull request #3177 from nextcloud/default-value-mail_smtpmodeJoas Schilling2017-01-203-5/+5
|\
| * Adjust the testsJoas Schilling2017-01-201-2/+2
| * Fix default of mail_smtpmode - fixes #3102Morris Jobke2017-01-192-3/+3
|/
* [tx-robot] updated from transifexNextcloud bot2017-01-208-10/+124
* Merge pull request #3144 from nextcloud/use-data-download-responseMorris Jobke2017-01-192-7/+3
|\
| * Use DataDownloadResponseLukas Reschke2017-01-182-7/+3
* | Merge pull request #3152 from nextcloud/add-brute-force-protectionJoas Schilling2017-01-192-19/+28
|\ \
| * | some code cleanup while working on the fileBjoern Schiessle2017-01-191-19/+26
| * | add brute force protection to 'mount public link' operationBjoern Schiessle2017-01-191-0/+1
| * | add brute force protection to password reset to make it harder to guess user ...Bjoern Schiessle2017-01-191-0/+1
* | | Revert "update icewind/streams to 0.5.2"Robin Appelman2017-01-1911-135/+57
* | | update icewind/streams to 0.5.2Robin Appelman2017-01-1911-57/+135
|/ /
* | Merge pull request #3150 from nextcloud/highlight-active-navigationJohn Molakvoæ2017-01-193-1/+8
|\ \
| * | theme app navigation menu highlight colorMorris Jobke2017-01-182-0/+5
| * | highlight active navigation entry better, fix #2096Jan-Christoph Borchardt2017-01-191-1/+3
* | | Merge pull request #3081 from nextcloud/2fa-backup-codes-test-coverageLukas Reschke2017-01-197-17/+184
|\ \ \
| * | | fix file endingChristoph Wurst2017-01-181-1/+1
| * | | make sure files end with emtpy lineChristoph Wurst2017-01-182-2/+2
| * | | ignore code we're unable to testChristoph Wurst2017-01-185-3/+8
| * | | test activity providerChristoph Wurst2017-01-182-0/+136
| * | | increase GenericProvider's test coverageChristoph Wurst2017-01-181-9/+35
* | | | Merge pull request #3050 from nextcloud/header-scss-optimisationLukas Reschke2017-01-191-119/+108
|\ \ \ \
| * | | | Copyright and code formatJohn Molakvoæ (skjnldsv)2017-01-121-13/+25
| * | | | Header scss optimisationJohn Molakvoæ (skjnldsv)2017-01-121-106/+83
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-194-28/+28
| |_|/ / |/| | |
* | | | Merge pull request #3133 from nextcloud/j-ed-masterMorris Jobke2017-01-181-32/+192
|\ \ \ \ | |_|/ / |/| | |
| * | | added parameter default valuesj-ed2017-01-171-32/+192
* | | | Merge pull request #3142 from senden9/patch-1Morris Jobke2017-01-181-1/+1
|\ \ \ \
| * | | | Fix style in commentStefano Probst2017-01-181-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #3120 from nextcloud/brute-force-protection-apiMorris Jobke2017-01-189-25/+152
|\ \ \ \ | |/ / / |/| | |
| * | | add action to existing brute force protectionBjoern Schiessle2017-01-183-10/+10
| * | | add some unit testsBjoern Schiessle2017-01-182-1/+85
| * | | handle optional annotation parametersBjoern Schiessle2017-01-182-3/+20
| * | | Fix the regex for annotations with valuesJoas Schilling2017-01-181-1/+1
| * | | introduce brute force protection for api callsBjoern Schiessle2017-01-183-11/+37
* | | | Merge pull request #3078 from nextcloud/2fa-backup-codes-entropyLukas Reschke2017-01-182-20/+28
|\ \ \ \ | |/ / / |/| | |
| * | | use constant and clean up unit testChristoph Wurst2017-01-162-19/+18
| * | | Increase 2fa backup codes entropyChristoph Wurst2017-01-162-2/+11
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-1810-60/+290
* | | | Merge pull request #2776 from nextcloud/prevent-quotes-from-being-a-problemMorris Jobke2017-01-171-1/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Escape the name for the jquery selectorJoas Schilling2016-12-201-1/+9
* | | | Merge pull request #3116 from nextcloud/spreed-turnserver-secret-is-sensitiveLukas Reschke2017-01-171-0/+4
|\ \ \ \
| * | | | Make sure the spreed TURN server secret stays a secretJoas Schilling2017-01-171-0/+4
* | | | | Merge pull request #3075 from nils/debug-no-versionhashJoas Schilling2017-01-171-3/+12
|\ \ \ \ \
| * | | | | [Enhancement] Do not add version hash in debug modeNils2017-01-151-3/+12
* | | | | | Merge pull request #3106 from nextcloud/spreed-calls-are-objectsJoas Schilling2017-01-171-0/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add call-type in case the information shall be used for styling or something ...Joas Schilling2017-01-171-0/+6
| * | | | | Define spreed callsJoas Schilling2017-01-161-0/+19
* | | | | | Merge pull request #3114 from nextcloud/menuitem-fixBjörn Schießle2017-01-171-1/+2
|\ \ \ \ \ \