Commit Graph

216 Commits

Author SHA1 Message Date
jjaffeux af346fc1c2 FIX: makes houses hads work with sk2 2020-02-07 10:34:58 +01:00
Gerhard Schlager 275921ac70
Make prettier happy 2020-01-16 00:12:27 +01:00
Neil Lalonde 116f9dd238 FEATURE: add support for fluid ad size in Google Ad Manager
No width or height will be set on containers when ad size is fluid.
2020-01-15 16:52:02 -05:00
David Taylor cf27a7be64 DEV: Stop loading external scripts while running tests (#81)
* DEV: Stop loading external scripts while running tests

* Revert "Turn of CSP for tests"

This reverts commit db1bf99277. It had no effect, since CSP is set by the server, and this was only affecting the client
2020-01-06 10:01:40 -07:00
Penar Musaraj 155d9f904c Import Promise from RSVP 2019-11-22 11:04:36 -05:00
Penar Musaraj b59f841944 DEV: Respect radix rule in eslint-config-discourse 1.0.6 2019-11-18 10:07:55 -05:00
Neil Lalonde 8d4df6df91 Rename house ad routes so ad blockers don't detect them
adplugin, house_ads, house_ad_settings become
pluginad, house_creatives, and house_settings.
2019-10-08 17:41:13 -04:00
Sam Saffron 02f9145751 lint file
AdButler is not a whitelisted constant, access it via window.
2019-09-17 13:46:32 +10:00
Neil Lalonde 51c1b89a62 Prettier 2019-09-16 14:35:58 -04:00
discoursehosting 19f0457e8c AdButler support (#80) 2019-09-16 14:26:17 -04:00
Neil Lalonde 62888e734f FIX: handle no ad size given for AdSense and DFP ad units
For AdSense, assume responsive size.
For DFP, don't attempt to render the ad unit.
2019-09-10 17:07:47 -04:00
Neil Lalonde 2ad24e4a60 FEATURE: add option to disable ads in restricted categories
Use the new setting "no ads for restricted categories".
2019-07-22 11:43:39 -04:00
Roman Rizzi 2ceb99e151
DEV: migrate no_ads_for_groups to use IDs instead of group names (#77) [Undo revert] (#79)
This reverts commit dee02ac3ba.
2019-07-19 10:29:52 -03:00
Neil Lalonde 71c51ebd8b FIX: ads always showing in all placements for CodeFund and Carbon Ads
Checkboxes used to choose which placements to have ads were not handled
correctly.
2019-07-17 14:05:58 -04:00
Roman Rizzi dee02ac3ba
Revert "DEV: migrate no_ads_for_groups to use IDs instead of group names (#77)" (#78)
This reverts commit 09a92f3438.
2019-07-16 11:57:20 -03:00
Neil Lalonde 93af4587fa FIX: Amazon ads never showing 2019-07-16 10:55:39 -04:00
Roman Rizzi 09a92f3438
DEV: migrate no_ads_for_groups to use IDs instead of group names (#77) 2019-07-16 11:35:16 -03:00
Neil Lalonde 3aa9cb8a0c FIX: wrong size DFP ads when using multiple sizes
getWidthAndHeight was being called twice for each ad placement:
once when setting the size of the div, and once when calling the 
defineSlot API. getWidthAndHeight always advances to the next size
in the list, so the wrong size ad would be inserted into the div.
2019-07-15 15:34:46 -04:00
Neil Lalonde 1929ac405c lint errors 2019-07-08 15:18:34 -04:00
Neil Lalonde 333f6cef81 FEATURE: support multiple ad sizes in AdSense and Ad Manager
Each ad placement in the AdSense and Ad Manager settings takes a list
of ad sizes instead of only one size. If given multiple sizes, the sizes
will alternate in order for each ad that's rendered.
2019-07-08 15:10:25 -04:00
Neil Lalonde ad939a851a FEATURE: option to disable ads on personal messages
Use the new setting "no ads for personal messages".
2019-06-27 14:13:51 -04:00
Neil Lalonde 2ba276b0fb FIX: DFP ad units being refreshed multiple times on the same render
Ember is firing events multiple times when the ad component is shown.

Only solution I can find is to add a delay between calls to refresh
the ad unit. I chose 3 seconds.
2019-06-26 11:15:04 -04:00
Brahn Partridge 89200f3b99 try io instead of app to maybe workaround CORs problem 2019-06-24 09:59:58 -04:00
Neil Lalonde 3054f2539a FEATURE: use a different Ad Manager publisher ID for mobile
If you want to use one Ad Manager publisher on desktop and a different
one on mobile, use the new dfp_publisher_id_mobile setting.
By default, dfp_publisher_id will be used for both desktop and mobile.
2019-06-19 11:52:23 -04:00
Neil Lalonde 25090a55a1 prettier 2019-06-17 21:00:05 -04:00
Neil Lalonde 92609c7af4 FIX: no_ads_for_tags support for hidden tags
Hidden tags aren't sent to the client, so they couldn't be used to
disable ads on topic pages. Do this calculation on the server.
Topic list pages for tags can continue to check on the client because
non-staff get a 404 error when trying to view a hidden tag's topic list.
2019-06-17 17:20:38 -04:00
Arpit Jalan d34b45627e Fix the build. 2019-06-15 16:01:52 +05:30
Neil Lalonde 31efc7025d FEATURE: new setting to disable ads based on tags
Enter a list of tags in the new setting no_ads_for_tags to prevent
ads from being rendered on topics with one or more of those tags,
and on topic list pages for those tags.
2019-06-14 14:44:09 -04:00
Penar Musaraj 574500ba08 Run Prettier 2019-06-14 13:24:55 -04:00
Penar Musaraj 203e14b639 Fix eslint warnings 2019-06-14 12:10:11 -04:00
Neil Lalonde 3a04f95916 REFACTOR: some changes to be closer to example implementation
https://support.google.com/admanager/answer/4578089?hl=en

* unique div ID for every ad slot
* setTargeting before calling addService
* don't destroySlots async (no examples of correct way to use this...)
2019-06-10 15:43:48 -04:00
Neil Lalonde 04525d0cf1 FIX: dfp category targeting params
DFP category targeting param wasn't always being updated on topic
list pages.

Also remove dependency on a category param being passed in to the
component from a template so that we can now place dfp ads
in places that don't have access to the current category and
targeting will still work.
2019-06-05 17:00:47 -04:00
Neil Lalonde 7af8f1d46b FEATURE: new setting to disable ads based on category of current page
Use the "no ads for categories" setting to define which category pages
(topic list and topics) should not render any ads.
2019-06-05 16:00:24 -04:00
Neil Lalonde 896e5a9838 Prettier 2019-05-08 11:22:21 -04:00
Neil Lalonde 365f441924 FIX: groups with mixed case names not working 2019-05-08 11:01:01 -04:00
Neil Lalonde 4bd2035866 FEATURE: house ads can be configured to alternate with other ads
Use the new "house ads frequency" site setting to configure how often
house ads should show, as a percentage. This only applies in ad
placements where other ad networks are configured to appear.
2019-05-07 19:52:51 -04:00
Neil Lalonde cdc14398ba FIX: linking to house ads URLs shows not found error page 2019-05-07 14:32:32 -04:00
Neil Lalonde d9d7f4c8f4 FIX: house ads randomized instead of showing evenly 2019-05-03 16:04:04 -04:00
Neil Lalonde 26d42e9ed7 Fix compatibility with other js tests 2019-05-03 13:26:16 -04:00
Neil Lalonde 1bd80e1afe FEATURE: House Ads
Allows creating ads within Discourse admin at Plugins > House Ads.
Write the ads in html and style them with CSS in themes.
2019-05-03 11:39:34 -04:00
Neil Lalonde 5272995e74 FEATURE: use groups to control who sees ads 2019-05-03 11:39:34 -04:00
Neil Lalonde 369d5dfc9e oops revert again "FEATURE: use groups to control who sees ads" and all later" 2019-04-17 16:02:19 -04:00
Neil Lalonde e6bcd96d8e FEATURE: use groups to control who sees ads" and all later 2019-04-17 15:40:50 -04:00
Neil Lalonde 50d258dc37 Revert "FEATURE: use groups to control who sees ads" and all later
Revert "Updates to codefund-ad"
Revert "Updates to carbonads-ad"
Revert "Updates to amazon-product-links"
2019-04-17 15:37:09 -04:00
Neil Lalonde 63e604d81b Updates to codefund-ad 2019-04-17 11:36:50 -04:00
Neil Lalonde 8ef02aa351 Updates to carbonads-ad 2019-04-17 11:36:50 -04:00
Neil Lalonde 881a8e5d4c Updates to amazon-product-links 2019-04-17 11:36:50 -04:00
Neil Lalonde 4fd7caffd6 FEATURE: use groups to control who sees ads
A new setting has been added in Admin > Settings > Ad Plugin called
"no ads for groups". Add group names to this list. If a user belongs
to any of the groups, they will not see any ads. This is an alternative
to using trust level settings like "adsense through trust level".
2019-04-17 11:36:50 -04:00
Neil Lalonde 6097e6f097 Clean-up codefund-ad component 2019-04-17 11:36:50 -04:00
Neil Lalonde 943acbfeb1 Add some js tests, and update adsense js 2019-04-17 11:36:47 -04:00
Diego Barreiro 147b1350ea FIX: Switch Property to Computed 2019-04-15 11:54:18 -04:00
Diego Barreiro 23ece34f53 FIX: Switch Var to Const 2019-04-15 11:54:18 -04:00
Diego Barreiro c5272db7f3 UX: Init Carbon Ads 2019-04-15 11:54:18 -04:00
Neil Lalonde ec10ef4483 FIX: wrong size setting being used for post-bottom desktop 2019-03-20 11:22:47 -04:00
Neil Lalonde 9b7a8830b8 FIX: resizing of ad units when they're rendered 2019-02-25 09:53:28 -05:00
Neil Lalonde 9a695cc67d refactor google-dfp-ad component to reduce repetition 2019-02-22 11:15:40 -05:00
Nathan Hopkins de0a47c1a7 Update CodeFund Ads to use new CodeFund API (#1)
Update CodeFund plugin to work with CodeFund's new API
2019-01-30 13:51:22 -05:00
Joffrey JAFFEUX 00789666d7 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 20:58:14 +01:00
David Taylor 2e36e2c656 DEV: Apply prettier 2018-10-22 19:49:32 +01:00
Eric Berry 014ee3187b Ensure CodeFund request is only made if the Property ID is provided
Also updated README with CodeFund instructions and link
2018-06-22 14:41:59 -06:00
Eric Berry 9e84a89f76 Refactors per review 2018-06-20 09:15:15 -06:00
Eric Berry 1b7f642da6 Cleanup 2018-06-12 15:21:23 -06:00
Eric Berry 11a621fd50 Only display ad if content exists 2018-06-07 17:49:15 -06:00
Eric Berry 75439b5af3 Cleaned up debugs 2018-06-07 17:28:20 -06:00
Eric Berry 1cd33da722 Add CodeFund 2018-06-07 17:17:19 -06:00
Neil Lalonde a23386cd17 FIX: DFP ad units not refreshed when navigating between topic lists 2018-06-04 16:52:43 -04:00
Jeff Wong 136cceb1e3 FIX: resolve collision on ember's builtin w string function 2018-05-16 13:37:50 -07:00
Neil Lalonde 1abeea6ff2 FIX: Amazon amazon_mobile_topic_above_suggested_src_code setting did not work 2018-02-15 14:32:10 -05:00
Neil Lalonde cf77b9fdc5 The ADVERTISEMENT label can be translated and customized from admin 2018-01-08 13:54:21 -05:00
Guo Xiang Tan 79d1e87dee Make eslint happy. 2017-08-02 16:45:19 +09:00
Neil Lalonde 9df93c03a7 AdSense: allow choosing ad size for mobile, including responsive 2017-05-30 18:13:49 -04:00
Neil Lalonde 62377e6111 Support for AdSense responsive ad size 2017-05-30 15:54:59 -04:00
Neil Lalonde 620404ab9e FIX: AdSense ads not loading on initial page load. Only load adsbygoogle.js once because it's the async library. 2016-12-05 13:31:11 -05:00
Robin Ward 1cd0bef933 FIX: Support for embedding ads via component 2016-11-23 14:29:30 -05:00
Neil Lalonde de4a8366fc FIX: don't load adsbygoogle.js when adsense publisher id isn't set 2016-11-21 15:58:29 -05:00
Neil Lalonde da1d4e0063 FIX: when dfp/adsense publisher id is missing, don't render blank ad units 2016-11-21 15:55:03 -05:00
Neil Lalonde 910b0d0e4c FIX: showing ads on mobile when mobile ad units are not defined 2016-11-17 11:45:18 -05:00
Robin Ward 883d5ecd85 FIX: Catch exception if ads can't be rendered 2016-11-09 16:46:09 -05:00
Robin Ward a70491c720 FIX: HTMLBars doesn't allow `<SCRIPT>` tags 2016-11-08 16:46:09 -05:00
Neil Lalonde 8ce3acfb3b add ad sizes settings for mobile DFP 2016-06-21 13:13:37 -04:00
Neil Lalonde f930aa14ec FIX: too much memory used by long topics 2016-05-16 14:26:14 -04:00
Neil Lalonde e4405dd486 Add support for showing ad after every nth post, not only after the nth post 2016-04-21 18:53:39 -04:00
Neil Lalonde cee3f66009 Render nth post dfp ads in position where post would be 2016-04-21 18:53:39 -04:00
Neil Lalonde 13b5d21565 Fix dfp ad dimensioned undefined. Refactor dfp ad component to remove unnecessary variables and rewrite copy-pasted code. 2016-04-21 18:53:39 -04:00
Neil Lalonde ef45e3290e Don't hard-code center justify of AdSense ads. Let position be customized with CSS. 2016-04-04 16:51:34 -04:00
Robin Ward 4ab0f0fab8 Upgrade to new Plugin API 2016-02-22 12:16:09 -05:00
Robin Ward ebed90fab7 Support linting, clean up some unused variables and weird spacing 2016-02-19 15:29:00 -05:00
Vi Nguyen 7dd66b75f7 fixed up formatting
fixed up formatting
2015-12-25 04:24:40 +11:00
Vi Nguyen 5dfa24c237 remove div label outside of the adwrapper style
fix for size of ad being cut by line in mobile view for adsense
2015-12-24 22:12:01 +11:00
Vi Nguyen 4eade6a1d9 put sizes back to their original 2015-12-24 22:10:26 +11:00
Vi Nguyen 268d180504 Update google-adsense.js.es6 2015-12-24 21:49:27 +11:00
Vi Nguyen 7759acf5be updated size of ad mobile height to mobile height
updated size of ad mobile height to mobile height
2015-12-24 21:30:09 +11:00
Vi Nguyen 05b053a110 adsense updated to a larger size container
updated to a larger size container
2015-12-24 21:15:23 +11:00
Vi Nguyen a8c0910f5b changed ad mobile height for adsense
temp test for mobile ad height space for testing on mobile.
2015-12-24 20:50:22 +11:00
Sarah Ni c6b753ab67 variable change for amazon mobile ad
instead of user_input_mobile, use userInputMobile
2015-10-30 00:41:45 +11:00
Ken Cooper 31a59a454d Fixed: mobile iframe link for Amazon banners was generating the desktop link. 2015-10-28 19:40:37 -07:00
Ken Cooper ffbd69688e Fixed: mobile viewport was too large when presenting ads, making for a sloppy mobile experience. Restricted length of "Advertisement" label to fix it. 2015-10-28 16:51:53 -07:00
Neil Lalonde 85d357b007 DFP: send a 0 value for discourse-category targeting on /latest, /categories, etc so that ads can show there while targeting categories 2015-10-28 12:20:16 -04:00
Neil Lalonde c5b9392ae5 FIX: ads not refreshing when going from one topic list to another 2015-10-27 17:44:03 -04:00
Neil Lalonde e13a6ecdce DFP: send key discourse-category and value as category slug when loading ads 2015-10-27 16:42:36 -04:00