Commit Graph

  • ce87afe945 Merge branch 'documentation' of git+ssh://github.com/team-melbourne-rgsoc2015/discourse-adplugin into documentation vi 2015-09-07 13:28:40 +10:00
  • 2891a3e355 polished up the authorship ladydanger 2015-09-07 13:18:08 +10:00
  • d2ab2d99ff Further refinement to the plugin wording ladydanger 2015-09-07 13:13:06 +10:00
  • a960d01976 added links to coaches ladydanger 2015-09-07 13:04:46 +10:00
  • a1cc02a8e5 finalised structure of readme and credits remaining ladydanger 2015-09-07 12:18:13 +10:00
  • 51b9aa4992 Added details to plugin and fixed next line ladydanger 2015-09-07 12:09:08 +10:00
  • ab9aca7c99 Add line formatting ladydanger 2015-09-07 11:53:35 +10:00
  • c68a5a4f1b added licence and modified content ladydanger 2015-09-07 11:51:39 +10:00
  • c83b1c8336 cleaned up features ladydanger 2015-09-07 10:44:47 +10:00
  • 0c8873d37d cleaned up features ladydanger 2015-09-07 10:44:28 +10:00
  • bd551b0a15 Added location table and edited input details ladydanger 2015-09-07 10:39:46 +10:00
  • d80c557d47 Edited input details + added items to features ladydanger 2015-09-07 10:22:07 +10:00
  • 4a4c972813 added images to the readme and features ladydanger 2015-09-07 10:14:20 +10:00
  • 9e9d056d75 edited sizes for post bottom and fixed dfp googletag reload vi 2015-09-04 14:52:08 +10:00
  • a0ab6a607b Corrected sizes ladydanger 2015-09-04 11:26:37 +10:00
  • b9945a6e4b Added comments to pre and post google vars vi 2015-09-04 10:51:44 +10:00
  • 3f56934278 Added minor changes vi 2015-09-04 09:24:10 +10:00
  • e797ef55e4 Fetched and merged - fixed conflicts vi 2015-09-04 09:14:06 +10:00
  • 457274287c Added outline for usage in quick start Ladydanger 2015-09-03 22:19:53 +10:00
  • fa3d25e4fd Working mobile ads that follow desktop custom targeting Sarah Ni 2015-09-03 21:08:21 +10:00
  • 8fc9f91a53 Value_list instead of user_list Sarah Ni 2015-09-03 18:41:06 +10:00
  • dbdd60dbf1 Table of sizes done Ladydanger 2015-09-03 16:47:54 +10:00
  • 8abed03dac Fixed up tables Ladydanger 2015-09-03 16:46:48 +10:00
  • fcee1ba621 Check if tables are rendering Ladydanger 2015-09-03 16:45:35 +10:00
  • 58d4834562 Table of location and sizes Ladydanger 2015-09-03 16:44:41 +10:00
  • 5d3ce94023 Table of sizes Ladydanger 2015-09-03 16:39:41 +10:00
  • 49d6c52b01 Fixed up typos and added sample table Ladydanger 2015-09-03 16:37:46 +10:00
  • 57d12604c5 Changed structure for quick start installation Ladydanger 2015-09-03 16:17:15 +10:00
  • 9ca46b8128 Further modification Ladydanger 2015-09-03 10:42:45 +10:00
  • 0f2341115d Paragraphing Ladydanger 2015-09-03 10:37:25 +10:00
  • 5274f65b62 Restructured usage for plan and fixed up formatting in installation Ladydanger 2015-09-03 10:31:32 +10:00
  • a3e6fdc8ac Modified installation instructions Ladydanger 2015-09-03 10:18:59 +10:00
  • 916e53884c working custom targeting for all locations Sarah Ni 2015-09-02 15:23:17 +10:00
  • b0a97df0da Fixed merge conflicts Sarah Ni 2015-09-02 14:28:33 +10:00
  • d656795bc1 Added all desktop slots to custom targeting Sarah Ni 2015-09-02 14:21:17 +10:00
  • dbb7d1a784 Refactored trust levels Sarah Ni 2015-09-02 13:50:47 +10:00
  • 14bd843ac1 Merged mobile slots and trust levels to multiple targeting keys branch Sarah Ni 2015-09-02 13:33:49 +10:00
  • 060c5d1b7a Added publisher id to mobile slots for dfp Sarah Ni 2015-09-02 13:21:44 +10:00
  • afa2262b1c Topic list top custom targeting multiple keys working Sarah Ni 2015-09-02 13:13:53 +10:00
  • e255a65e32 Custom targeting working for one key and associated values for that one key per ad slot available - problem in multiple keys vi 2015-09-01 16:04:21 +10:00
  • 5eecf0d731 Fixed up properties in ad mobile sizes for dfp and adsense vi 2015-09-01 13:44:56 +10:00
  • 67141dd884 Added mobile code to topic list top position to test vi 2015-09-01 13:20:52 +10:00
  • 6452c9c5b1 Added trust levels to site settings for dfp vi 2015-09-01 11:27:31 +10:00
  • 2f1ac77380 Added trust levels to site setting and bug found in adsense reload comment out in line 30 to 57 vi 2015-09-01 11:16:07 +10:00
  • 189e149081 Modified readme for todo and changed name of plugin for dfp vi 2015-09-01 10:28:47 +10:00
  • 7f13e0a1fb Merge pull request #8 from team-melbourne-rgsoc2015/mobile-works ladydanger 2015-09-01 10:10:09 +10:00
  • 9daa9ad3fe Added test file vi 2015-09-01 10:05:03 +10:00
  • a03d2532d5 Merge pull request #7 from team-melbourne-rgsoc2015/test-initializer-function Sarah Ni 2015-08-31 16:12:51 +10:00
  • c38eb3134e Fixed post-bottom if statement and reduced duplication in connectors Sarah Ni 2015-08-31 16:10:26 +10:00
  • a7258f4848 For loop replaces while loop but line 50 doesn't work Sarah Ni 2015-08-31 15:25:42 +10:00
  • cdb4c50eff Added custom targeting function error on line 50 when calling f.bar Sarah Ni 2015-08-31 14:44:47 +10:00
  • 8989d9c5ea fixed up with Jo's help setTargeting base method Sarah Ni 2015-08-31 13:49:09 +10:00
  • 6d8cbb72e4 Added key slots via url_list and created prototype setTargeting function Sarah Ni 2015-08-31 12:21:43 +10:00
  • 6d93faf871 Successful mobile slots - default to 320*50 Sarah Ni 2015-08-28 15:34:14 +10:00
  • e3dded27d9 how to approach the .setTargeting issue vi 2015-08-28 15:25:11 +10:00
  • f94bf79192 Added custom targeting to all slots and Sebastian fixed the variable issue in adsense - thanks Seb! vi 2015-08-28 12:21:40 +10:00
  • 514fed55c9 custom targeting multiple values working vi 2015-08-26 16:03:15 +10:00
  • 010d11f969 key working, value not working Sarah Ni 2015-08-26 15:35:30 +10:00
  • 67d3504296 Added working custom targeting to topic list top for one key and one value Sarah Ni 2015-08-26 12:04:03 +10:00
  • 50ee40cdfe Myles fixed it - fixed cmd undefined and fixed up adsense code that was undefining all vars beginning with google vi 2015-08-26 10:42:43 +10:00
  • d272a71b08 Working ads however, on change url dfp plain ad not displaying vi 2015-08-25 15:53:22 +10:00
  • a67e02368e Removed console log and dfp code working without adsense - conflict when together vi 2015-08-25 14:40:03 +10:00
  • d179ed4fe9 Successfully merge with bug in cmd push vi 2015-08-25 14:30:23 +10:00
  • 3808410ac2 Master branch working with dfp and wrapper vi 2015-08-24 12:36:40 +10:00
  • 5fba1ad4d1 Merge branch 'adding-custom-targeting' vi 2015-08-24 12:34:14 +10:00
  • d75190c027 Removed custom targeting vi 2015-08-24 12:33:54 +10:00
  • 83389e2a83 Fixed merge conflicts with addition of google publisher id vi 2015-08-24 10:33:29 +10:00
  • 86054c5164 Added input slots for custom targeting in dfp vi 2015-08-21 11:19:18 +10:00
  • 9e56fae22a Added gender inventory level slot targeting to be tested vi 2015-08-20 21:14:50 +10:00
  • 3271acf840 Mobile slots now within htmlSafe Sarah Ni 2015-08-20 10:58:31 +10:00
  • f98751323e Added publisher id to code vi 2015-08-20 10:19:29 +10:00
  • c566f0c71d Mobile slots now within htmlSafe Sarah Ni 2015-08-20 10:07:51 +10:00
  • 3ef8699900 Mobile slots added within htmlSafe wrappers Sarah Ni 2015-08-20 09:34:52 +10:00
  • ce83cb121c Temporarily removed custom targeting vi 2015-08-20 08:23:55 +10:00
  • fbb27c6060 htmlSafe and clean up Sarah Ni 2015-08-19 11:44:14 +10:00
  • 2124073de9 Initial planning of custom targeting locations Ladydanger 2015-08-19 10:45:03 +10:00
  • 2237164075 Put css back to class name vi 2015-08-11 10:57:13 +10:00
  • c30b5f0fd4 Merge branch 'master' of https://github.com/team-melbourne-rgsoc2015/discourse-adplugin Sarah Ni 2015-08-10 14:24:51 +10:00
  • ecda5bd246 Merged and added dropdown Sarah Ni 2015-08-10 14:22:59 +10:00
  • 13fd01e6c2 Container responsive to ad sizes Sarah Ni 2015-08-10 14:19:51 +10:00
  • 013d6bc363 Dropdown boxes added for each location Sarah Ni 2015-08-10 14:04:21 +10:00
  • 2156f66caf Update README.md Sarah Ni 2015-08-10 09:28:19 +10:00
  • 8202caea9d Update README.md Sarah Ni 2015-08-10 09:26:21 +10:00
  • cc3ac1bda0 Modified to match connector hbs names vi 2015-08-05 13:02:18 +10:00
  • a033d5ecc6 Error with loading the ad from if statement vi 2015-08-05 11:07:30 +10:00
  • d5dc468987 Merge pull request #2 from team-melbourne-rgsoc2015/Improve-Nth ladydanger 2015-08-04 15:46:30 +10:00
  • 9aa1bb3f4a Added input for nth post for users Sarah Ni 2015-08-04 14:52:58 +10:00
  • 9e7b33f7c1 Successful ads between nth post Sarah Ni 2015-08-04 11:25:00 +10:00
  • 648a91a6e5 Attempting to create Nth post within plugin framework Sarah Ni 2015-07-31 15:20:00 +10:00
  • 49b89e90a8 post-bottom additions and test.hbs Sarah Ni 2015-07-30 11:05:33 +10:00
  • 4e896abd4d Update README.md Sarah Ni 2015-07-29 10:48:07 +10:00
  • ad865d6ea2 Added link to working images vi 2015-07-28 10:15:01 +10:00
  • c436cb2e8e Todo added to fix up images at one point vi 2015-07-28 10:08:08 +10:00
  • e2aec6bbe7 Fixed dropbox codes vi 2015-07-28 09:52:04 +10:00
  • ff319b11a1 Merge branch 'master' of https://github.com/team-melbourne-rgsoc2015/discourse-adplugin vi 2015-07-28 09:41:12 +10:00
  • 07b312d58c Added ad code settings and display vi 2015-07-28 09:39:49 +10:00
  • d7fd6bd3ef Minor spelling changes Sarah Ni 2015-07-24 15:06:42 +10:00
  • 36b7489327 Add sample ad codes for testing vi 2015-07-24 14:58:21 +10:00
  • bbbe059021 Updated Readme for coaches installation instructions vi 2015-07-24 14:37:43 +10:00
  • dc99b3d2f0 Modified hbs text to test symlink vi 2015-07-24 14:14:03 +10:00