241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
vi	3f56934278	Added minor changes	2015-09-04 09:24:10 +10:00
vi	e797ef55e4	Fetched and merged - fixed conflicts	2015-09-04 09:14:06 +10:00
Ladydanger	457274287c	Added outline for usage in quick start	2015-09-03 22:19:53 +10:00
Sarah Ni	fa3d25e4fd	Working mobile ads that follow desktop custom targeting	2015-09-03 21:08:21 +10:00
Sarah Ni	8fc9f91a53	Value_list instead of user_list	2015-09-03 18:41:06 +10:00
Ladydanger	dbdd60dbf1	Table of sizes done	2015-09-03 16:47:54 +10:00
Ladydanger	8abed03dac	Fixed up tables	2015-09-03 16:46:48 +10:00
Ladydanger	fcee1ba621	Check if tables are rendering	2015-09-03 16:45:35 +10:00
Ladydanger	58d4834562	Table of location and sizes	2015-09-03 16:44:41 +10:00
Ladydanger	5d3ce94023	Table of sizes	2015-09-03 16:39:41 +10:00
Ladydanger	49d6c52b01	Fixed up typos and added sample table	2015-09-03 16:37:46 +10:00
Ladydanger	57d12604c5	Changed structure for quick start installation	2015-09-03 16:17:15 +10:00
Ladydanger	9ca46b8128	Further modification	2015-09-03 10:42:45 +10:00
Ladydanger	0f2341115d	Paragraphing	2015-09-03 10:37:25 +10:00
Ladydanger	5274f65b62	Restructured usage for plan and fixed up formatting in installation	2015-09-03 10:31:32 +10:00
Ladydanger	a3e6fdc8ac	Modified installation instructions	2015-09-03 10:18:59 +10:00
Sarah Ni	916e53884c	working custom targeting for all locations	2015-09-02 15:23:17 +10:00
Sarah Ni	b0a97df0da	Fixed merge conflicts	2015-09-02 14:28:33 +10:00
Sarah Ni	d656795bc1	Added all desktop slots to custom targeting	2015-09-02 14:21:17 +10:00
Sarah Ni	dbb7d1a784	Refactored trust levels	2015-09-02 13:50:47 +10:00
Sarah Ni	14bd843ac1	Merged mobile slots and trust levels to multiple targeting keys branch	2015-09-02 13:33:49 +10:00
Sarah Ni	060c5d1b7a	Added publisher id to mobile slots for dfp	2015-09-02 13:21:44 +10:00
Sarah Ni	afa2262b1c	Topic list top custom targeting multiple keys working	2015-09-02 13:13:53 +10:00
vi	e255a65e32	Custom targeting working for one key and associated values for that one key per ad slot available - problem in multiple keys	2015-09-01 16:04:21 +10:00
vi	5eecf0d731	Fixed up properties in ad mobile sizes for dfp and adsense	2015-09-01 13:44:56 +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
vi	189e149081	Modified readme for todo and changed name of plugin for dfp	2015-09-01 10:28:47 +10:00
ladydanger	7f13e0a1fb	Merge pull request #8 from team-melbourne-rgsoc2015/mobile-works ... Successful mobile slots - default to 320*50	2015-09-01 10:10:09 +10:00
vi	9daa9ad3fe	Added test file	2015-09-01 10:05:03 +10:00
Sarah Ni	a03d2532d5	Merge pull request #7 from team-melbourne-rgsoc2015/test-initializer-function ... All plugin outlet locations now have one hbs file for connectors - solved the post-bottom problem.	2015-08-31 16:12:51 +10:00
Sarah Ni	c38eb3134e	Fixed post-bottom if statement and reduced duplication in connectors	2015-08-31 16:10:26 +10:00
Sarah Ni	a7258f4848	For loop replaces while loop but line 50 doesn't work	2015-08-31 15:25:42 +10:00
Sarah Ni	cdb4c50eff	Added custom targeting function error on line 50 when calling f.bar	2015-08-31 14:44:47 +10:00
Sarah Ni	8989d9c5ea	fixed up with Jo's help setTargeting base method	2015-08-31 13:49:09 +10:00
Sarah Ni	6d8cbb72e4	Added key slots via url_list and created prototype setTargeting function	2015-08-31 12:21:43 +10:00
Sarah Ni	6d93faf871	Successful mobile slots - default to 320*50	2015-08-28 15:34:14 +10:00
vi	e3dded27d9	how to approach the .setTargeting issue	2015-08-28 15:25:11 +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
vi	514fed55c9	custom targeting multiple values working	2015-08-26 16:03:15 +10:00
Sarah Ni	010d11f969	key working, value not working	2015-08-26 15:35:30 +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	50ee40cdfe	Myles fixed it - fixed cmd undefined and fixed up adsense code that was undefining all vars beginning with google	2015-08-26 10:42:43 +10:00
vi	d272a71b08	Working ads however, on change url dfp plain ad not displaying	2015-08-25 15:53:22 +10:00