Commit Graph

36831 Commits

Author SHA1 Message Date
John Molakvoæ 2cfedb3623 Merge pull request #3150 from nextcloud/highlight-active-navigation
highlight active navigation entry better, fix #2096
2017-01-19 06:47:30 +01:00
Morris Jobke 3798f842c0
theme app navigation menu highlight color
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-18 21:42:50 -06:00
Lukas Reschke 2d73a003d7 Merge pull request #3081 from nextcloud/2fa-backup-codes-test-coverage
2fa backup codes test coverage
2017-01-19 02:26:39 +01:00
Lukas Reschke 5809164163 Merge pull request #3050 from nextcloud/header-scss-optimisation
Header scss optimisation
2017-01-19 02:25:26 +01:00
Nextcloud bot f58f3d7aab
[tx-robot] updated from transifex 2017-01-19 01:08:09 +00:00
Jan-Christoph Borchardt ad1385a8e1 highlight active navigation entry better, fix #2096
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-01-19 01:49:54 +01:00
Morris Jobke 61d4198ae1 Merge pull request #3133 from nextcloud/j-ed-master
added parameter default values
2017-01-18 15:03:39 -06:00
Christoph Wurst 65f303164f fix file ending
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 2f30a71b19 make sure files end with emtpy line
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 85e4febc24 ignore code we're unable to test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 3b4b49fa95 test activity provider
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 6f6eb5b301 increase GenericProvider's test coverage
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Morris Jobke 40c64e6a9c Merge pull request #3142 from senden9/patch-1
Fix style in comment
2017-01-18 10:38:23 -06:00
Morris Jobke a3f835872f Merge pull request #3120 from nextcloud/brute-force-protection-api
brute force protection for api calls
2017-01-18 10:23:26 -06:00
Stefano Probst 9df58081d6 Fix style in comment
Add missing grave accent to fix the highlighting in the documentation.
2017-01-18 16:39:44 +01:00
Lukas Reschke 29d2ca5991 Merge pull request #3078 from nextcloud/2fa-backup-codes-entropy
Increase 2fa backup codes entropy
2017-01-18 16:08:59 +01:00
Bjoern Schiessle cdf01feba7
add action to existing brute force protection
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-18 15:25:16 +01:00
Bjoern Schiessle 0271ae3b46
add some unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-18 15:25:16 +01:00
Bjoern Schiessle 32e0ec3e58
handle optional annotation parameters
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-18 15:25:16 +01:00
Joas Schilling 29a0a23918
Fix the regex for annotations with values
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 15:25:16 +01:00
Bjoern Schiessle df296249d6
introduce brute force protection for api calls
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-18 15:25:15 +01:00
Nextcloud bot 4bbd52b3f9
[tx-robot] updated from transifex 2017-01-18 01:07:38 +00:00
Morris Jobke 08cdcf8f7f Merge pull request #2776 from nextcloud/prevent-quotes-from-being-a-problem
Escape the name for the jquery selector
2017-01-17 18:40:11 -06:00
j-ed cd84cba32b
added parameter default values
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>
2017-01-17 18:29:38 -06:00
Lukas Reschke 4009d3db03 Merge pull request #3116 from nextcloud/spreed-turnserver-secret-is-sensitive
Make sure the spreed TURN server secret stays a secret
2017-01-17 14:49:43 +01:00
Joas Schilling ce973929e8 Merge pull request #3075 from nils/debug-no-versionhash
Do not add version hash in debug mode
2017-01-17 11:44:50 +01:00
Joas Schilling 35b8f03c07 Merge pull request #3106 from nextcloud/spreed-calls-are-objects
Define spreed calls
2017-01-17 11:42:13 +01:00
Joas Schilling 30b9262a5a
Make sure the spreed TURN server secret stays a secret
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:29:10 +01:00
Björn Schießle 61c68d4ebe Merge pull request #3114 from nextcloud/menuitem-fix
Add menuitem to popover menu
2017-01-17 11:12:49 +01:00
Joas Schilling aea1b72f54 Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions
Markdown support for app descriptions
2017-01-17 11:11:16 +01:00
Christoph Wurst 012708e1ba Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appconfigs
Filter out sensitive appconfig values
2017-01-17 11:01:42 +01:00
John Molakvoæ 75587cf135 Add menuitem to popover menu
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-17 10:11:08 +01:00
Joas Schilling 377e536417
Add call-type in case the information shall be used for styling or something else in the future
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 10:08:02 +01:00
Morris Jobke 6ba7ba6e0c
add a bit of space around paragraphs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-16 22:25:27 -06:00
Morris Jobke aadfadfcf1
fix list style of app description
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-16 22:22:05 -06:00
Nextcloud bot b1a82969e6
[tx-robot] updated from transifex 2017-01-17 01:07:54 +00:00
Morris Jobke 250b7119b7 Merge pull request #3096 from nextcloud/update-theme-urls
Prevent Example-Theme from using invalid URLs
2017-01-16 11:42:08 -06:00
Joas Schilling 745b707cd9
Define spreed calls
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-16 18:41:00 +01:00
Marius Blüm 5e2995923d
Prevent Example-Theme from using invalid URLs
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-01-16 17:52:28 +01:00
Joas Schilling 182f570b04 Merge pull request #3070 from dnel/Clarify-English-setting
Clarify that English refers to US English
2017-01-16 15:17:09 +01:00
Joas Schilling 76bc3bcdef
Allow ordered lists as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-16 15:00:54 +01:00
Christoph Wurst 6726c98bbd
use constant and clean up unit test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-16 13:14:15 +01:00
Björn Schießle 6c7a7e0c1a Merge pull request #3033 from nextcloud/share-by-mail-use-display-name
generate correct path for owner and use the display name instead of t…
2017-01-16 12:29:16 +01:00
Christoph Wurst 3b76699c9c
Increase 2fa backup codes entropy
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-16 11:24:03 +01:00
Nextcloud bot 203436b16b
[tx-robot] updated from transifex 2017-01-16 01:15:50 +00:00
Nils ba3506c431 [Enhancement] Do not add version hash in debug mode
Signed-off-by: Nils <git@to.nilsschnabel.de>
2017-01-15 13:29:32 +01:00
Lukas Reschke ddfc7e6a3f
Manually whitelist tags
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-13 18:58:18 +01:00
Lukas Reschke 6a047a045a
Apply DOMPurify over HTML
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-13 18:58:18 +01:00
Morris Jobke 4d7dee5996
Fix JSUnit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-13 18:33:43 +01:00
Joas Schilling fcfb4205bc
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:43 +01:00