move ga to include
This commit is contained in:
Uncle Cheese
parent
0d19a79d70
commit
2a1af2b8a0
|
|
@ -4,7 +4,7 @@
|
|||
"require": {
|
||||
"ext-gd": "*",
|
||||
"ext-mbstring": "*",
|
||||
"silverstripe/docsviewer": "dev-develop",
|
||||
"silverstripe/docsviewer": "dev-master",
|
||||
"silverstripe/framework": "^3.2",
|
||||
"silverstripe/toolbar": "^4.0"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -4,23 +4,26 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "e9df82c706bdf4a50be03672eecc0741",
|
||||
"content-hash": "5e821e68a1865d0d7d41f2389f49218d",
|
||||
"hash": "cd69d6da542e5a55eb70de4717509fec",
|
||||
"content-hash": "2d681db39312cbcf607f72a193a9c2b1",
|
||||
"packages": [
|
||||
{
|
||||
"name": "composer/installers",
|
||||
"version": "v1.0.21",
|
||||
"version": "v1.0.22",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/composer/installers.git",
|
||||
"reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45"
|
||||
"reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
|
||||
"reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
|
||||
"url": "https://api.github.com/repos/composer/installers/zipball/bd9b14f094c89c8b5804a4e41edeb7853bb85046",
|
||||
"reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"composer-plugin-api": "1.0.0"
|
||||
},
|
||||
"replace": {
|
||||
"roundcube/plugin-installer": "*",
|
||||
"shama/baton": "*"
|
||||
|
|
@ -29,9 +32,9 @@
|
|||
"composer/composer": "1.0.*@dev",
|
||||
"phpunit/phpunit": "4.1.*"
|
||||
},
|
||||
"type": "composer-installer",
|
||||
"type": "composer-plugin",
|
||||
"extra": {
|
||||
"class": "Composer\\Installers\\Installer",
|
||||
"class": "Composer\\Installers\\Plugin",
|
||||
"branch-alias": {
|
||||
"dev-master": "1.0-dev"
|
||||
}
|
||||
|
|
@ -100,7 +103,7 @@
|
|||
"zend",
|
||||
"zikula"
|
||||
],
|
||||
"time": "2015-02-18 17:17:01"
|
||||
"time": "2015-10-29 23:28:48"
|
||||
},
|
||||
{
|
||||
"name": "erusev/parsedown",
|
||||
|
|
@ -187,16 +190,16 @@
|
|||
},
|
||||
{
|
||||
"name": "silverstripe/docsviewer",
|
||||
"version": "dev-develop",
|
||||
"version": "dev-master",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
|
||||
"reference": "720b35d8311a65800ca2ad2f4afea39a76e46e55"
|
||||
"reference": "2f0cbfe4f675dd3957623055cfbeccd8ebf1bfef"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/720b35d8311a65800ca2ad2f4afea39a76e46e55",
|
||||
"reference": "720b35d8311a65800ca2ad2f4afea39a76e46e55",
|
||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/2f0cbfe4f675dd3957623055cfbeccd8ebf1bfef",
|
||||
"reference": "2f0cbfe4f675dd3957623055cfbeccd8ebf1bfef",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -224,20 +227,20 @@
|
|||
"documentation",
|
||||
"silverstripe"
|
||||
],
|
||||
"time": "2015-10-12 21:30:27"
|
||||
"time": "2015-11-17 03:04:08"
|
||||
},
|
||||
{
|
||||
"name": "silverstripe/framework",
|
||||
"version": "3.2.0",
|
||||
"version": "3.2.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/silverstripe/silverstripe-framework.git",
|
||||
"reference": "0092792568fb8a33674669aa200c7c81b163a365"
|
||||
"reference": "0178fa5a1873a0f1d6100268c86dab81a18c23a5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/0092792568fb8a33674669aa200c7c81b163a365",
|
||||
"reference": "0092792568fb8a33674669aa200c7c81b163a365",
|
||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/0178fa5a1873a0f1d6100268c86dab81a18c23a5",
|
||||
"reference": "0178fa5a1873a0f1d6100268c86dab81a18c23a5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -273,24 +276,24 @@
|
|||
"framework",
|
||||
"silverstripe"
|
||||
],
|
||||
"time": "2015-10-11 19:44:34"
|
||||
"time": "2015-11-16 03:17:10"
|
||||
},
|
||||
{
|
||||
"name": "silverstripe/toolbar",
|
||||
"version": "4.0.8",
|
||||
"version": "4.1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git",
|
||||
"reference": "ff9003d784f48edb526754d741c2ac9a282c5269"
|
||||
"reference": "108fc37a26d5c96780a4c4c29a79dbcc79fb9c70"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/ff9003d784f48edb526754d741c2ac9a282c5269",
|
||||
"reference": "ff9003d784f48edb526754d741c2ac9a282c5269",
|
||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/108fc37a26d5c96780a4c4c29a79dbcc79fb9c70",
|
||||
"reference": "108fc37a26d5c96780a4c4c29a79dbcc79fb9c70",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"unclecheese/display-logic": "1.0.*"
|
||||
"unclecheese/display-logic": "1.3.*"
|
||||
},
|
||||
"type": "silverstripe-module",
|
||||
"license": [
|
||||
|
|
@ -314,27 +317,27 @@
|
|||
"silverstripe"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/4.0.8",
|
||||
"source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/4.1.0",
|
||||
"issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues"
|
||||
},
|
||||
"time": "2015-10-14 00:00:39"
|
||||
"time": "2015-11-03 22:53:02"
|
||||
},
|
||||
{
|
||||
"name": "unclecheese/display-logic",
|
||||
"version": "1.0.8",
|
||||
"version": "1.3.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/unclecheese/silverstripe-display-logic.git",
|
||||
"reference": "df95d85a0886009ce5ccae2993bbb1d0d04bc182"
|
||||
"reference": "6f8870aeddc56821d00cabdf6d9d9f040ae90c4c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/unclecheese/silverstripe-display-logic/zipball/df95d85a0886009ce5ccae2993bbb1d0d04bc182",
|
||||
"reference": "df95d85a0886009ce5ccae2993bbb1d0d04bc182",
|
||||
"url": "https://api.github.com/repos/unclecheese/silverstripe-display-logic/zipball/6f8870aeddc56821d00cabdf6d9d9f040ae90c4c",
|
||||
"reference": "6f8870aeddc56821d00cabdf6d9d9f040ae90c4c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"silverstripe/framework": "3.*"
|
||||
"silverstripe/framework": "3.2.*"
|
||||
},
|
||||
"replace": {
|
||||
"silverstripe/display-logic": "*"
|
||||
|
|
@ -361,7 +364,7 @@
|
|||
"logic",
|
||||
"silverstripe"
|
||||
],
|
||||
"time": "2014-12-07 23:30:55"
|
||||
"time": "2015-10-30 08:29:38"
|
||||
}
|
||||
],
|
||||
"packages-dev": [
|
||||
|
|
@ -729,24 +732,21 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/yaml",
|
||||
"version": "v2.7.5",
|
||||
"version": "v2.7.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/yaml.git",
|
||||
"reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770"
|
||||
"reference": "eca9019c88fbe250164affd107bc8057771f3f4d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
|
||||
"reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
|
||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d",
|
||||
"reference": "eca9019c88fbe250164affd107bc8057771f3f4d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.9"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/phpunit-bridge": "~2.7"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -774,7 +774,7 @@
|
|||
],
|
||||
"description": "Symfony Yaml Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2015-09-14 14:14:09"
|
||||
"time": "2015-10-11 09:39:48"
|
||||
}
|
||||
],
|
||||
"aliases": [],
|
||||
|
|
|
|||
|
|
@ -32,27 +32,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<%-- New tracking code, added to fix tracking across all domains (which was a problem for Platform section) --%>
|
||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
||||
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
||||
|
||||
<%-- Linker is used to track people across the domains, Single-origin Policy prevents cookie-based tracking --%>
|
||||
ga('create', 'UA-84547-17', 'auto', {'allowLinker': true});
|
||||
ga('require', 'linker');
|
||||
ga('linker:autoLink', [
|
||||
'silverstripe.com',
|
||||
'silverstripe.org',
|
||||
'addons.silverstripe.org',
|
||||
'api.silverstripe.org',
|
||||
'doc.silverstripe.org',
|
||||
'userhelp.silverstripe.org',
|
||||
'demo.silverstripe.org'
|
||||
]);
|
||||
ga('send', 'pageview')
|
||||
|
||||
<% include DocumentationGA %>
|
||||
<% include DocumentationEnd %>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
<script>
|
||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
||||
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
||||
|
||||
ga('create', 'UA-84547-17', 'auto', {'allowLinker': true});
|
||||
ga('require', 'linker');
|
||||
ga('linker:autoLink', [
|
||||
'silverstripe.com',
|
||||
'silverstripe.org',
|
||||
'addons.silverstripe.org',
|
||||
'api.silverstripe.org',
|
||||
'doc.silverstripe.org',
|
||||
'userhelp.silverstripe.org',
|
||||
'demo.silverstripe.org'
|
||||
]);
|
||||
ga('send', 'pageview')
|
||||
</script>
|
||||
Loading…
Reference in New Issue