Commit Graph

227 Commits

Author SHA1 Message Date
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