Author SHA1 Message Date
Penar Musaraj d6af1d2e20 FEAT: ads.txt support
Adds a plugin setting that holds text content served on a new /ads.txt route.
2019-02-04 16:15:26 -05:00
Neil Lalonde 79d5f144a6 Merge branch 'master' into stable 2019-02-01 14:04:22 -05:00
Neil Lalonde 408b043046 Merge branch 'master' into stable 2019-02-01 11:56:46 -05:00
Penar Musaraj e628bc859b Revert "Add support for ads.txt redirect"
This reverts commit f6c7c2d1af.

Ads.txt redirection can be done directly in core, in admin/customize/permalinks.
2019-01-29 16:02:02 -05:00
Penar Musaraj f6c7c2d1af Add support for ads.txt redirect 2019-01-29 11:06:42 -05:00
Eric Berry a669381a71 Remove need to only allow UUID as CodeFund Property ID (#71)
* Remove need to only allow UUID as CodeFund Property ID

* Do not apply format check
2019-01-29 11:06:26 -05:00
Joffrey JAFFEUX 75a56891d2 Reverts Ember.String.prototype.w monkey patching causing exception
The git blame of the commit is unclear on the reasons leading to this, and how to reproduce a failure.
2019-01-09 21:18:06 +01:00
Gerhard Schlager 0d4e6bb4fa Inherit rubocop config from discourse repo 2019-01-09 21:17:55 +01:00
Neil Lalonde 5eed122002 Merge branch 'master' into stable 2018-11-29 11:05:04 -05:00
Neil Lalonde 4c45a27a72 Merge branch 'master' into stable 2018-09-10 13:48:57 -04:00
Neil Lalonde c838f10467 Merge branch 'master' into stable 2018-07-19 13:50:15 -04:00
Joshua Rosenfeld 8b404b9ffb Add URL to plugin.rb on stable branch 2018-06-19 22:39:51 -04:00
Jeff Wong 97f56a95bd FIX: resolve collision on ember's builtin w string function 2018-05-16 13:58:33 -07:00
Gerhard Schlager 73d010ef49 Merge branch 'master' into stable 2017-12-14 12:26:44 +01:00
Neil Lalonde 8e1041ec75 Merge branch 'master' into stable 2017-12-05 15:19:21 -05:00
Neil Lalonde 40c0a64bb9 Merge branch 'master' into stable 2017-11-13 16:27:57 -05:00
Neil Lalonde 3f71c80e89 Merge branch 'master' into stable 2017-11-08 13:39:37 -05:00
Guo Xiang Tan 392fd76679 Merge pull request #48 from discourse/merge_master_changes
Merge master changes
2016-12-09 02:19:47 +01:00
3 changed files with 98 additions and 76 deletions
+1
View File
@@ -51,6 +51,7 @@ en:
adsense_post_bottom_ad_sizes: "Choose your ad size" adsense_post_bottom_ad_sizes: "Choose your ad size"
adsense_mobile_post_bottom_ad_size: "Choose your ad size" adsense_mobile_post_bottom_ad_size: "Choose your ad size"
adsense_nth_post_code: "Show an ad after every N posts, where N is this value." adsense_nth_post_code: "Show an ad after every N posts, where N is this value."
adsense_ads_txt: "Contents of your ads.txt file. More details available at <a href='https://support.google.com/adsense/answer/7532444?hl=en' target='_blank'>this Google AdSense help page</a>."
amazon_through_trust_level: "Show your ads to users based on trust levels. Users with trust level higher than this value will not see ads." amazon_through_trust_level: "Show your ads to users based on trust levels. Users with trust level higher than this value will not see ads."
amazon_topic_list_top_src_code: "Enter src code to display at topic list top location" amazon_topic_list_top_src_code: "Enter src code to display at topic list top location"
+80 -76
View File
File diff suppressed because it is too large Load Diff
+17
View File
@@ -5,3 +5,20 @@
# url: https://github.com/discourse/discourse-adplugin # url: https://github.com/discourse/discourse-adplugin
register_asset "stylesheets/adplugin.scss" register_asset "stylesheets/adplugin.scss"
after_initialize do
require_dependency 'application_controller'
class ::AdstxtController < ::ApplicationController
skip_before_action :check_xhr
def index
raise Discourse::NotFound unless SiteSetting.adsense_ads_txt.present?
render plain: SiteSetting.adsense_ads_txt
end
end
Discourse::Application.routes.append do
get '/ads.txt' => "adstxt#index"
end
end