Commit Graph

42 Commits

Author SHA1 Message Date
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
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 335b7cd8dc Merged amazon with master 2015-09-18 10:46:14 +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 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
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 9e9d056d75 edited sizes for post bottom and fixed dfp googletag reload 2015-09-04 14:52:08 +10:00
Sarah Ni 8fc9f91a53 Value_list instead of user_list 2015-09-03 18:41:06 +10:00
Sarah Ni dbb7d1a784 Refactored trust levels 2015-09-02 13:50:47 +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
Sarah Ni 6d8cbb72e4 Added key slots via url_list and created prototype setTargeting function 2015-08-31 12:21:43 +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
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 d179ed4fe9 Successfully merge with bug in cmd push 2015-08-25 14:30:23 +10:00
vi d75190c027 Removed custom targeting 2015-08-24 12:33:54 +10:00
vi 86054c5164 Added input slots for custom targeting in dfp 2015-08-21 11:19:18 +10:00
vi f98751323e Added publisher id to code 2015-08-20 10:19:29 +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 9aa1bb3f4a Added input for nth post for users 2015-08-04 14:52:58 +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 21362c7632 Transfer files from Discourse plugin to here 2015-07-24 14:01:47 +10:00