Commit Graph

286 Commits

Author SHA1 Message Date
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
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 ce87afe945 Merge branch 'documentation' of git+ssh://github.com/team-melbourne-rgsoc2015/discourse-adplugin into documentation 2015-09-07 13:28:40 +10:00
ladydanger 2891a3e355 polished up the authorship 2015-09-07 13:18:08 +10:00
ladydanger d2ab2d99ff Further refinement to the plugin wording 2015-09-07 13:13:06 +10:00
ladydanger a960d01976 added links to coaches 2015-09-07 13:04:46 +10:00
ladydanger a1cc02a8e5 finalised structure of readme and credits remaining 2015-09-07 12:18:13 +10:00
ladydanger 51b9aa4992 Added details to plugin and fixed next line 2015-09-07 12:09:08 +10:00
ladydanger ab9aca7c99 Add line formatting 2015-09-07 11:53:35 +10:00
ladydanger c68a5a4f1b added licence and modified content 2015-09-07 11:51:39 +10:00
ladydanger c83b1c8336 cleaned up features 2015-09-07 10:44:47 +10:00
ladydanger 0c8873d37d cleaned up features 2015-09-07 10:44:28 +10:00
ladydanger bd551b0a15 Added location table and edited input details 2015-09-07 10:39:46 +10:00
ladydanger d80c557d47 Edited input details + added items to features 2015-09-07 10:22:07 +10:00
ladydanger 4a4c972813 added images to the readme and features 2015-09-07 10:14:20 +10:00
vi 9e9d056d75 edited sizes for post bottom and fixed dfp googletag reload 2015-09-04 14:52:08 +10:00
ladydanger a0ab6a607b Corrected sizes
corrected sizes on table
2015-09-04 11:26:37 +10:00
vi b9945a6e4b Added comments to pre and post google vars 2015-09-04 10:51:44 +10:00