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 |
|
vi
|
2237164075
|
Put css back to class name
|
2015-08-11 10:57:13 +10:00 |
|
Sarah Ni
|
c30b5f0fd4
|
Merge branch 'master' of https://github.com/team-melbourne-rgsoc2015/discourse-adplugin
|
2015-08-10 14:24:51 +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 |
|
Sarah Ni
|
2156f66caf
|
Update README.md
|
2015-08-10 09:28:19 +10:00 |
|
Sarah Ni
|
8202caea9d
|
Update README.md
|
2015-08-10 09:26:21 +10:00 |
|
vi
|
cc3ac1bda0
|
Modified to match connector hbs names
|
2015-08-05 13:02:18 +10:00 |
|
vi
|
a033d5ecc6
|
Error with loading the ad from if statement
|
2015-08-05 11:07:30 +10:00 |
ladydanger
|
d5dc468987
|
Merge pull request #2 from team-melbourne-rgsoc2015/Improve-Nth
Added input for nth post for users.
|
2015-08-04 15:46: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 |
|
Sarah Ni
|
4e896abd4d
|
Update README.md
|
2015-07-29 10:48:07 +10:00 |
|
vi
|
ad865d6ea2
|
Added link to working images
|
2015-07-28 10:15:01 +10:00 |
|
vi
|
c436cb2e8e
|
Todo added to fix up images at one point
|
2015-07-28 10:08:08 +10:00 |
|
vi
|
e2aec6bbe7
|
Fixed dropbox codes
|
2015-07-28 09:52:04 +10:00 |
|
vi
|
ff319b11a1
|
Merge branch 'master' of https://github.com/team-melbourne-rgsoc2015/discourse-adplugin
|
2015-07-28 09:41:12 +10:00 |
|
vi
|
07b312d58c
|
Added ad code settings and display
|
2015-07-28 09:39:49 +10:00 |
|
Sarah Ni
|
d7fd6bd3ef
|
Minor spelling changes
|
2015-07-24 15:06:42 +10:00 |
|
vi
|
36b7489327
|
Add sample ad codes for testing
|
2015-07-24 14:58:21 +10:00 |
|
vi
|
bbbe059021
|
Updated Readme for coaches installation instructions
|
2015-07-24 14:37:43 +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 |
|
vi
|
2679384ba1
|
first commit
|
2015-07-24 13:33:49 +10:00 |