Commit Graph

154 Commits

Author SHA1 Message Date
Robin Ward f9ba0e4ae1 Merge pull request #21 from nlalonde/master
DFP: Send category slug for targeting
2015-10-28 11:11:51 -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
Vi Nguyen a923d9a196 Merge pull request #20 from nlalonde/master
FIX: refresh DFP ads after navigating between topics and lists
2015-10-16 19:02:34 +11: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
Vi Nguyen e0b3e64962 Updated readme for newline 2015-09-21 18:17:10 +10:00
Sarah Ni 5a2d4889ec Concise Ad location Preview Screenshot
Added a screenshot that outlines all offered ad locations.
2015-09-21 12:08:53 +10:00
Sarah Ni 3a01792e3c .gitignore added and server files minor changes 2015-09-21 11:03:43 +10:00
vi df584b5f0c Updated readme for disable button removal, version numbers and added amazon plugin in spanish and french client 2015-09-21 10:53:39 +10:00
Sarah Ni fe9c53ce58 removed all disable boxes and changed trust levels for amazon 2015-09-21 10:44:37 +10:00
Sarah Ni 1d762c1c00 Updated README to include Amazon Instructions
Additions:
1. Description
2. Screenshot
2015-09-18 11:57:54 +10:00
vi 05706b2d35 Merge branch 'master' of git+ssh://github.com/team-melbourne-rgsoc2015/discourse-adplugin 2015-09-18 11:53:55 +10:00
vi f9bd4a2f1a Added amazon spanish translations 2015-09-18 11:53:31 +10:00
Sarah Ni 42c589d47c chinese version for amazon server in config 2015-09-18 11:33:47 +10:00
vi 87a3650259 Added amazon french translations 2015-09-18 11:29:40 +10:00
Sarah Ni 9c0d43bb3b updated descriptions on server.en.yml for amazon 2015-09-18 11:14:23 +10:00
vi 541506a929 Forgot some server settings 2015-09-18 10:47:29 +10:00
vi adedda900c Merge branch 'master' of git+ssh://github.com/team-melbourne-rgsoc2015/discourse-adplugin 2015-09-18 10:46:26 +10:00
vi 335b7cd8dc Merged amazon with master 2015-09-18 10:46:14 +10:00
ladydanger b5ec98743b Update README.md 2015-09-17 18:16:07 +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
ladydanger d8e4d8a798 completed additional credit 2015-09-15 07:55:31 +10:00
ladydanger e627c37f74 completed additional credit 2015-09-15 07:51:33 +10:00
ladydanger e926c141d1 Updated with html elements 2015-09-15 07:49:57 +10:00
ladydanger 97b1ac2174 Added additional credits 2015-09-15 07:42:33 +10:00
Ladydanger 2fec81481b Updated readme for spanish language update 2015-09-12 09:26:51 +10:00
Ladydanger b1ce21af2d Merge branch 'languages' 2015-09-12 09:25:34 +10:00
Ladydanger 1cca5ade73 Added spanish language files 2015-09-12 09:24:39 +10:00
Sarah Ni b4f177d947 Product and Easy Ads work, still building Native Ads 2015-09-11 16:33:55 +10:00
ladydanger 3624f8847c successful bullet points 2015-09-11 12:32:39 +10:00
ladydanger d72f6d1e07 Added html 2015-09-11 12:31:34 +10:00
ladydanger 3a8d101aac Updated wording for category name change 2015-09-11 12:19:08 +10:00
Sarah Ni b9e3226673 Update README.md 2015-09-11 10:46:28 +10:00
Sarah Ni b33516552e minor chinese lang changes 2015-09-11 10:26:12 +10:00
Sarah Ni 2d752d8b2f basic amazon product link inputs added and works 2015-09-10 22:48:14 +10:00
Ladydanger 85d9122420 Completed french translations and changed wording in English version 2015-09-10 22:43:48 +10:00
Ladydanger b0da003394 Completed french translations and changed wording in English version 2015-09-10 22:38:04 +10:00
Sarah Ni 0bd6b60446 Chinese version 2015-09-10 21:38:21 +10:00
Ladydanger f54b3923fa Fixed up dfp setting descriptions 2015-09-10 17:26:39 +10:00
Ladydanger f4a5c095be Polished up working in server.yml, fixed missing dfp on ad sizes, started french translation 2015-09-10 17:07:11 +10:00
Sarah Ni 082f4e336d amazon settings 2015-09-10 12:23:36 +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 8f5c8db352 Merge branch 'acceptance-tests' 2015-09-08 13:39:33 +10:00
ladydanger 0ca6953ba9 Added link to installation instructions 2015-09-08 10:09:00 +10:00
vi c868d4892a Removed unused css and irrelevant comments and cleaned up formatting 2015-09-07 20:51:59 +10:00
vi b421fbc22b Merge branch 'documentation' 2015-09-07 20:41:08 +10:00
vi bdc8a2dff5 Added comment to adsense 2015-09-07 20:38:53 +10:00