Commit Graph

222 Commits

Author SHA1 Message Date
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 0980914d0c UI: Style Ads 2019-04-15 11:54:18 -04:00
Diego Barreiro c5272db7f3 UX: Init Carbon Ads 2019-04-15 11:54:18 -04:00
Régis Hanol 8fda5c3b7d
Delete .DS_Store 2019-03-21 22:10:24 +01: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
Neil Lalonde 0debcbf2e8 Move scss out of plugin.rb into a file in assets/stylesheets 2019-02-01 13:46:11 -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 89f8c7bb53 Remove tabs. 2017-09-05 09:22:23 +08: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
Neil Lalonde cf850b273d FIX: refresh DFP ads after navigating between topics and lists 2015-10-15 13:58:49 -04:00
Sarah Ni 292951e302 Added Advertisement Label on top of Ad 2015-09-30 10:48:26 +10:00
Sarah Ni fe9c53ce58 removed all disable boxes and changed trust levels for amazon 2015-09-21 10:44:37 +10:00
vi 0ef188766d Modified js component 2015-09-16 12:17:46 +10:00
vi 0adc5bfca7 Refactored to only have amazon link/banner ads and refactored for check trust levels 2015-09-16 12:11:50 +10:00
vi cc2572e3f1 Added working product links 2015-09-16 11:44:31 +10:00
Sarah Ni b4f177d947 Product and Easy Ads work, still building Native Ads 2015-09-11 16:33:55 +10:00
Sarah Ni 2d752d8b2f basic amazon product link inputs added and works 2015-09-10 22:48:14 +10:00
Sarah Ni 647eecd95b master - more consistent naming for dfp settings and removed test folder 2015-09-10 12:07:36 +10:00
vi c868d4892a Removed unused css and irrelevant comments and cleaned up formatting 2015-09-07 20:51:59 +10:00
vi bdc8a2dff5 Added comment to adsense 2015-09-07 20:38:53 +10:00
vi 7062254c13 Reload fixed added googletag in - Thank you Myles! 2015-09-07 15:15:12 +10:00
vi 8607cefcec Added mobile slot code for adsense plugin and revisited the reloading issue 2015-09-07 14:26:53 +10:00
vi 9e9d056d75 edited sizes for post bottom and fixed dfp googletag reload 2015-09-04 14:52:08 +10:00
vi b9945a6e4b Added comments to pre and post google vars 2015-09-04 10:51:44 +10:00
Sarah Ni fa3d25e4fd Working mobile ads that follow desktop custom targeting 2015-09-03 21:08:21 +10:00
Sarah Ni 916e53884c working custom targeting for all locations 2015-09-02 15:23:17 +10:00
Sarah Ni b0a97df0da Fixed merge conflicts 2015-09-02 14:28:33 +10:00
Sarah Ni d656795bc1 Added all desktop slots to custom targeting 2015-09-02 14:21:17 +10:00
Sarah Ni dbb7d1a784 Refactored trust levels 2015-09-02 13:50:47 +10:00
Sarah Ni 14bd843ac1 Merged mobile slots and trust levels to multiple targeting keys branch 2015-09-02 13:33:49 +10:00
Sarah Ni 060c5d1b7a Added publisher id to mobile slots for dfp 2015-09-02 13:21:44 +10:00
Sarah Ni afa2262b1c Topic list top custom targeting multiple keys working 2015-09-02 13:13:53 +10:00
vi e255a65e32 Custom targeting working for one key and associated values for that one key per ad slot available - problem in multiple keys 2015-09-01 16:04:21 +10:00
vi 5eecf0d731 Fixed up properties in ad mobile sizes for dfp and adsense 2015-09-01 13:44:56 +10:00
vi 67141dd884 Added mobile code to topic list top position to test 2015-09-01 13:20:52 +10:00
vi 6452c9c5b1 Added trust levels to site settings for dfp 2015-09-01 11:27:31 +10:00
vi 2f1ac77380 Added trust levels to site setting and bug found in adsense reload comment out in line 30 to 57 2015-09-01 11:16:07 +10:00
ladydanger 7f13e0a1fb Merge pull request #8 from team-melbourne-rgsoc2015/mobile-works
Successful mobile slots - default to 320*50
2015-09-01 10:10:09 +10:00
Sarah Ni c38eb3134e Fixed post-bottom if statement and reduced duplication in connectors 2015-08-31 16:10:26 +10:00
Sarah Ni a7258f4848 For loop replaces while loop but line 50 doesn't work 2015-08-31 15:25:42 +10:00
Sarah Ni cdb4c50eff Added custom targeting function error on line 50 when calling f.bar 2015-08-31 14:44:47 +10:00
Sarah Ni 8989d9c5ea fixed up with Jo's help setTargeting base method 2015-08-31 13:49:09 +10:00
Sarah Ni 6d8cbb72e4 Added key slots via url_list and created prototype setTargeting function 2015-08-31 12:21:43 +10:00
Sarah Ni 6d93faf871 Successful mobile slots - default to 320*50 2015-08-28 15:34:14 +10:00
vi e3dded27d9 how to approach the .setTargeting issue 2015-08-28 15:25:11 +10:00
vi f94bf79192 Added custom targeting to all slots and Sebastian fixed the variable issue in adsense - thanks Seb! 2015-08-28 12:21:40 +10:00
vi 514fed55c9 custom targeting multiple values working 2015-08-26 16:03:15 +10:00
Sarah Ni 010d11f969 key working, value not working 2015-08-26 15:35:30 +10:00
Sarah Ni 67d3504296 Added working custom targeting to topic list top for one key and one value 2015-08-26 12:04:03 +10:00
vi 50ee40cdfe Myles fixed it - fixed cmd undefined and fixed up adsense code that was undefining all vars beginning with google 2015-08-26 10:42:43 +10:00
vi d272a71b08 Working ads however, on change url dfp plain ad not displaying 2015-08-25 15:53:22 +10:00
vi a67e02368e Removed console log and dfp code working without adsense - conflict when together 2015-08-25 14:40:03 +10:00
vi d179ed4fe9 Successfully merge with bug in cmd push 2015-08-25 14:30:23 +10:00
vi 3808410ac2 Master branch working with dfp and wrapper 2015-08-24 12:36:40 +10:00
vi 5fba1ad4d1 Merge branch 'adding-custom-targeting' 2015-08-24 12:34:14 +10:00
vi d75190c027 Removed custom targeting 2015-08-24 12:33:54 +10:00
vi 83389e2a83 Fixed merge conflicts with addition of google publisher id 2015-08-24 10:33:29 +10:00
vi 86054c5164 Added input slots for custom targeting in dfp 2015-08-21 11:19:18 +10:00
vi 9e56fae22a Added gender inventory level slot targeting to be tested 2015-08-20 21:14:50 +10:00
Sarah Ni 3271acf840 Mobile slots now within htmlSafe 2015-08-20 10:58:31 +10:00
vi f98751323e Added publisher id to code 2015-08-20 10:19:29 +10:00
Sarah Ni c566f0c71d Mobile slots now within htmlSafe 2015-08-20 10:07:51 +10:00
Sarah Ni 3ef8699900 Mobile slots added within htmlSafe wrappers 2015-08-20 09:34:52 +10:00
vi ce83cb121c Temporarily removed custom targeting 2015-08-20 08:23:55 +10:00
Sarah Ni fbb27c6060 htmlSafe and clean up 2015-08-19 11:44:14 +10:00
Ladydanger 2124073de9 Initial planning of custom targeting locations 2015-08-19 10:45:03 +10:00
Sarah Ni ecda5bd246 Merged and added dropdown 2015-08-10 14:22:59 +10:00
Sarah Ni 13fd01e6c2 Container responsive to ad sizes 2015-08-10 14:19:51 +10:00
Sarah Ni 013d6bc363 Dropdown boxes added for each location 2015-08-10 14:04:21 +10:00
vi a033d5ecc6 Error with loading the ad from if statement 2015-08-05 11:07:30 +10:00
Sarah Ni 9aa1bb3f4a Added input for nth post for users 2015-08-04 14:52:58 +10:00
Sarah Ni 9e7b33f7c1 Successful ads between nth post 2015-08-04 11:25:00 +10:00
Sarah Ni 648a91a6e5 Attempting to create Nth post within plugin framework 2015-07-31 15:20:00 +10:00
Sarah Ni 49b89e90a8 post-bottom additions and test.hbs 2015-07-30 11:05:33 +10:00
vi dc99b3d2f0 Modified hbs text to test symlink 2015-07-24 14:14:03 +10:00
vi 21362c7632 Transfer files from Discourse plugin to here 2015-07-24 14:01:47 +10:00