Commit Graph

68 Commits

Author SHA1 Message Date
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 a03d2532d5 Merge pull request #7 from team-melbourne-rgsoc2015/test-initializer-function
All plugin outlet locations now have one hbs file for connectors - solved the post-bottom problem.
2015-08-31 16:12:51 +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
vi 2237164075 Put css back to class name 2015-08-11 10:57:13 +10:00
Sarah Ni c30b5f0fd4 Merge branch 'master' of https://github.com/team-melbourne-rgsoc2015/discourse-adplugin 2015-08-10 14:24:51 +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
Sarah Ni 2156f66caf Update README.md 2015-08-10 09:28:19 +10:00
Sarah Ni 8202caea9d Update README.md 2015-08-10 09:26:21 +10:00
vi cc3ac1bda0 Modified to match connector hbs names 2015-08-05 13:02:18 +10:00