summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3133 from nextcloud/j-ed-masterMorris Jobke2017-01-181-32/+192
|\ | | | | added parameter default values
| * added parameter default valuesj-ed2017-01-171-32/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | based on a source code analysis (looking for getSystemValue() function) I added the default values of the prameters Update config.sample.php replaced three backticks by two. applied various fixes - removed default value for 'objectstore' because it has not default value. - removed default value for 'tempdirectory' because it is unset. - changed default value for 'theme' to "Defaults to the theming app which is shipped since Nextcloud 9" - fixed typo in default value of 'minimum.supported.desktop.version', after double-checking the version number in /apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php:71. Signed-off-by: Juergen Edner <juergen@eisfair.org>
* | Merge pull request #3142 from senden9/patch-1Morris Jobke2017-01-181-1/+1
|\ \ | | | | | | Fix style in comment
| * | Fix style in commentStefano Probst2017-01-181-1/+1
| | | | | | | | | Add missing grave accent to fix the highlighting in the documentation.
* | | Merge pull request #3120 from nextcloud/brute-force-protection-apiMorris Jobke2017-01-189-25/+152
|\ \ \ | |/ / |/| | brute force protection for api calls
| * | add action to existing brute force protectionBjoern Schiessle2017-01-183-10/+10
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | add some unit testsBjoern Schiessle2017-01-182-1/+85
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | handle optional annotation parametersBjoern Schiessle2017-01-182-3/+20
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | Fix the regex for annotations with valuesJoas Schilling2017-01-181-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | introduce brute force protection for api callsBjoern Schiessle2017-01-183-11/+37
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #3078 from nextcloud/2fa-backup-codes-entropyLukas Reschke2017-01-182-20/+28
|\ \ \ | |/ / |/| | Increase 2fa backup codes entropy
| * | use constant and clean up unit testChristoph Wurst2017-01-162-19/+18
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Increase 2fa backup codes entropyChristoph Wurst2017-01-162-2/+11
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | [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 selector
| * | Escape the name for the jquery selectorJoas Schilling2016-12-201-1/+9
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | 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 secret
| * | | Make sure the spreed TURN server secret stays a secretJoas Schilling2017-01-171-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #3075 from nils/debug-no-versionhashJoas Schilling2017-01-171-3/+12
|\ \ \ \ | | | | | | | | | | Do not add version hash in debug mode
| * | | | [Enhancement] Do not add version hash in debug modeNils2017-01-151-3/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nils <git@to.nilsschnabel.de>
* | | | | Merge pull request #3106 from nextcloud/spreed-calls-are-objectsJoas Schilling2017-01-171-0/+25
|\ \ \ \ \ | |_|/ / / |/| | | | Define spreed calls
| * | | | Add call-type in case the information shall be used for styling or something ↵Joas Schilling2017-01-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | else in the future Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Define spreed callsJoas Schilling2017-01-161-0/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #3114 from nextcloud/menuitem-fixBjörn Schießle2017-01-171-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Add menuitem to popover menu
| * | | | | Add menuitem to popover menuJohn Molakvoæ2017-01-171-1/+2
| | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptionsJoas Schilling2017-01-1718-51/+625
|\ \ \ \ \ \ | | | | | | | | | | | | | | Markdown support for app descriptions
| * | | | | | add a bit of space around paragraphsMorris Jobke2017-01-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | fix list style of app descriptionMorris Jobke2017-01-162-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Allow ordered lists as wellJoas Schilling2017-01-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Manually whitelist tagsLukas Reschke2017-01-131-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | Apply DOMPurify over HTMLLukas Reschke2017-01-137-3/+434
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | Fix JSUnit testsMorris Jobke2017-01-133-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Fix testsJoas Schilling2017-01-132-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Don't render non HTTP links, images and quotesJoas Schilling2017-01-131-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Fix "broken" app descriptionsJoas Schilling2017-01-132-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Remove the magic parsing of the descriptionJoas Schilling2017-01-131-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Render markdownJoas Schilling2017-01-132-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Add markedJoas Schilling2017-01-135-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #3023 from ↵Christoph Wurst2017-01-177-12/+103
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/issue-2915-filter-out-sensitive-appconfigs Filter out sensitive appconfig values
| * | | | | | Fix testsJoas Schilling2017-01-123-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Filter out sensitive appconfig valuesJoas Schilling2017-01-114-11/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | [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 URLs
| * | | | | | Prevent Example-Theme from using invalid URLsMarius Blüm2017-01-161-3/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | | | Merge pull request #3070 from dnel/Clarify-English-settingJoas Schilling2017-01-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clarify that English refers to US English
| * | | | | | 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 t…
| * | | | | | generate correct path for owner and use the display name instead of the user idBjoern Schiessle2017-01-121-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-1684-106/+106
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #3062 from nextcloud/user-settings-tooltipJoas Schilling2017-01-131-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | use tooltip in user list