Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better validation / desc for embeddable_host

This commit is contained in:
Jeff Atwood 2015-03-11 15:31:27 -07:00
parent 2585962552
commit f3b5a4c888
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/server.en.yml
View File

@ -1105,7 +1105,7 @@ en:
warn_reviving_old_topic_age: "When someone starts replying to a topic where the last reply is older than this many days, a warning will be displayed. Disable by setting to 0."
autohighlight_all_code: "Force apply code highlighting to all preformatted code blocks even when they didn't explicitly specify the language."
embeddable_host: "Host that can embed the comments from this Discourse forum."
embeddable_host: "Host that can embed the comments from this Discourse forum. Hostname only, do not begin with http://"
feed_polling_enabled: "EMBEDDING ONLY: Whether to embed a RSS/ATOM feed as posts."
feed_polling_url: "EMBEDDING ONLY: URL of RSS/ATOM feed to embed."
embed_by_username: "Discourse username of the user who creates the embedded topics."

4
config/site_settings.yml
View File

@ -688,7 +688,9 @@ developer:
client: true
embedding:
embeddable_host: ''
embeddable_host:
default: ''
regex: "^(?!http).+" # don't allow this to start with http:// or https://
feed_polling_enabled: false
feed_polling_url: ''
embed_by_username: