summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
|\ \ \ \ \
| * | | | | Add menuitem to popover menuJohn Molakvoæ2017-01-171-1/+2
* | | | | | Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptionsJoas Schilling2017-01-1718-51/+625
|\ \ \ \ \ \
| * | | | | | add a bit of space around paragraphsMorris Jobke2017-01-161-0/+3
| * | | | | | fix list style of app descriptionMorris Jobke2017-01-162-4/+18
| * | | | | | Allow ordered lists as wellJoas Schilling2017-01-161-1/+2
| * | | | | | Manually whitelist tagsLukas Reschke2017-01-131-1/+16
| * | | | | | Apply DOMPurify over HTMLLukas Reschke2017-01-137-3/+434
| * | | | | | Fix JSUnit testsMorris Jobke2017-01-133-1/+13
| * | | | | | Fix testsJoas Schilling2017-01-132-16/+20
| * | | | | | Don't render non HTTP links, images and quotesJoas Schilling2017-01-131-1/+47
| * | | | | | Fix "broken" app descriptionsJoas Schilling2017-01-132-6/+4
| * | | | | | Remove the magic parsing of the descriptionJoas Schilling2017-01-131-24/+2
| * | | | | | Render markdownJoas Schilling2017-01-132-2/+6
| * | | | | | Add markedJoas Schilling2017-01-135-0/+68
* | | | | | | Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appco...Christoph Wurst2017-01-177-12/+103
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix testsJoas Schilling2017-01-123-1/+29
| * | | | | | Filter out sensitive appconfig valuesJoas Schilling2017-01-114-11/+74
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-1718-472/+492
* | | | | | | Merge pull request #3096 from nextcloud/update-theme-urlsMorris Jobke2017-01-161-3/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Prevent Example-Theme from using invalid URLsMarius Blüm2017-01-161-3/+3
|/ / / / / /
* | | | | | Merge pull request #3070 from dnel/Clarify-English-settingJoas Schilling2017-01-161-1/+1
|\ \ \ \ \ \
| * | | | | | Update personal.phpDavid Nelson2017-01-131-1/+1
* | | | | | | Merge pull request #3033 from nextcloud/share-by-mail-use-display-nameBjörn Schießle2017-01-161-7/+12
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | generate correct path for owner and use the display name instead of the user idBjoern Schiessle2017-01-121-7/+12