From e64c935b071dff30952af200b82d1266665689c5 Mon Sep 17 00:00:00 2001 From: psserver Date: Wed, 6 Sep 2017 21:09:40 +1200 Subject: [PATCH 1/2] Add dev tools --- .gitignore | 3 +- composer.json | 6 +- composer.lock | 202 +++++++++++++++++------------------------------ site/favicon.ico | Bin 0 -> 1086 bytes 4 files changed, 77 insertions(+), 134 deletions(-) create mode 100644 site/favicon.ico diff --git a/.gitignore b/.gitignore index b350d56..6c82882 100644 --- a/.gitignore +++ b/.gitignore @@ -9,13 +9,12 @@ sitemap.xml /betterbuttons/ /blog/ /cms/ +/dev-tools/ /framework/ /gridfieldextensions/ /lumberjack/ /reports/ -/segment-field/ /siteconfig/ /sortablegridfield/ /tagfield/ -/userforms/ # END of GitIgnoreEditor \ No newline at end of file diff --git a/composer.json b/composer.json index 056cc20..3b76a33 100644 --- a/composer.json +++ b/composer.json @@ -1,14 +1,14 @@ { - "name": "plasticstudio/skeletor", - "description": "The PlasticStudio base SilverStripe project / installer.", + "name": "Divine Laziness", + "description": "Divine Laziness website.", "require": { "silverstripe/cms": "3.4.1", "silverstripe/framework": "3.4.1", "silverstripe-australia/gridfieldextensions": "1.1.0", - "silverstripe/userforms": "dev-master", "undefinedoffset/sortablegridfield": "dev-master", "unclecheese/betterbuttons": "1.3.14", "silverstripe/blog": "2.4.5", + "plasticstudio/dev-tools": "1.1.0", "gdmedia/ss-auto-git-ignore": "0.0.3" }, "minimum-stability": "dev", diff --git a/composer.lock b/composer.lock index ec2ea35..4157071 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "c893d7e91c1de5f671c050ce93f88493", - "content-hash": "6831bdba983936b731767c9708cb8ddd", + "hash": "e2d7cfe6cc2b982f7828404b0040a9ce", + "content-hash": "7c0cc13f1ba353e462a86581a425019f", "packages": [ { "name": "composer/installers", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "79ad876c7498c0bbfe7eed065b8651c93bfd6045" + "reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/79ad876c7498c0bbfe7eed065b8651c93bfd6045", - "reference": "79ad876c7498c0bbfe7eed065b8651c93bfd6045", + "url": "https://api.github.com/repos/composer/installers/zipball/9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b", + "reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b", "shasum": "" }, "require": { @@ -64,6 +64,7 @@ "Hurad", "ImageCMS", "Kanboard", + "Lan Management System", "MODX Evo", "Mautic", "Maya", @@ -87,6 +88,7 @@ "croogo", "dokuwiki", "drupal", + "eZ Platform", "elgg", "expressionengine", "fuelphp", @@ -103,6 +105,7 @@ "mediawiki", "modulework", "moodle", + "osclass", "phpbb", "piwik", "ppi", @@ -119,7 +122,7 @@ "zend", "zikula" ], - "time": "2017-04-24 06:37:16" + "time": "2017-08-09 07:53:48" }, { "name": "gdmedia/ss-auto-git-ignore", @@ -151,6 +154,50 @@ "description": "A Composer post-update-cmd script to automatically add Composer managed SilverStripe modules and themes to .gitignore", "time": "2015-03-05 23:18:02" }, + { + "name": "plasticstudio/dev-tools", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/PlasticStudio/dev-tools.git", + "reference": "1007418f25e610dd76f958af0f44bb0086db1742" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PlasticStudio/dev-tools/zipball/1007418f25e610dd76f958af0f44bb0086db1742", + "reference": "1007418f25e610dd76f958af0f44bb0086db1742", + "shasum": "" + }, + "require": { + "silverstripe/cms": "~3.1", + "silverstripe/framework": "~3.1" + }, + "type": "silverstripe-module", + "extra": { + "installer-paths": { + "{$name}": [ + "vendor/package" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "James Barnsley", + "email": "james@plasticstudio.co.nz", + "homepage": "http://plasticstudio.co.nz" + } + ], + "description": "Development tools for SilverStripe", + "homepage": "http://plasticstudio.co.nz", + "keywords": [ + "silverstripe" + ], + "time": "2017-07-30 22:18:53" + }, { "name": "silverstripe-australia/gridfieldextensions", "version": "1.1.0", @@ -199,6 +246,7 @@ "gridfield", "silverstripe" ], + "abandoned": "symbiote/silverstripe-gridfieldextensions", "time": "2015-03-04 01:28:24" }, { @@ -353,12 +401,12 @@ "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-lumberjack.git", - "reference": "e85feffec01c414024bd1ba9e6cd668f2056631b" + "reference": "7115455b68782b1065e2f3bc29dfda12fd77de84" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-lumberjack/zipball/e85feffec01c414024bd1ba9e6cd668f2056631b", - "reference": "e85feffec01c414024bd1ba9e6cd668f2056631b", + "url": "https://api.github.com/repos/silverstripe/silverstripe-lumberjack/zipball/7115455b68782b1065e2f3bc29dfda12fd77de84", + "reference": "7115455b68782b1065e2f3bc29dfda12fd77de84", "shasum": "" }, "require": { @@ -371,7 +419,7 @@ "type": "silverstripe-module", "extra": { "branch-alias": { - "1.x-dev": "1.2.x-dev" + "1.x-dev": "1.4.x-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -385,7 +433,7 @@ } ], "description": "A module to make managing pages in a GridField easy without losing any of the functionality that you're used to in the CMS.", - "time": "2016-11-16 04:32:56" + "time": "2017-06-15 18:18:50" }, { "name": "silverstripe/reports", @@ -393,12 +441,12 @@ "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-reports.git", - "reference": "7172eecd083276760d3776b76b816de27d0c7bf8" + "reference": "6025de29cc079d7112d20326d4c28909586f78ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-reports/zipball/7172eecd083276760d3776b76b816de27d0c7bf8", - "reference": "7172eecd083276760d3776b76b816de27d0c7bf8", + "url": "https://api.github.com/repos/silverstripe/silverstripe-reports/zipball/6025de29cc079d7112d20326d4c28909586f78ba", + "reference": "6025de29cc079d7112d20326d4c28909586f78ba", "shasum": "" }, "require": { @@ -435,46 +483,7 @@ "reports", "silverstripe" ], - "time": "2017-04-21 15:13:40" - }, - { - "name": "silverstripe/segment-field", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/silverstripe/silverstripe-segment-field.git", - "reference": "0b1445307bac488ddc35d624564f4300e8080029" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-segment-field/zipball/0b1445307bac488ddc35d624564f4300e8080029", - "reference": "0b1445307bac488ddc35d624564f4300e8080029", - "shasum": "" - }, - "require": { - "silverstripe/cms": "^3.1", - "silverstripe/framework": "^3.1" - }, - "require-dev": { - "mockery/mockery": "^0.9", - "phpunit/phpunit": "^3.7" - }, - "type": "silverstripe-module", - "autoload": { - "psr-4": { - "SilverStripe\\Forms\\": "code" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "A reusable approach to segment-generating fields", - "keywords": [ - "segment", - "silverstripe" - ], - "time": "2015-08-18 04:44:43" + "time": "2017-07-26 09:45:27" }, { "name": "silverstripe/siteconfig", @@ -482,12 +491,12 @@ "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-siteconfig.git", - "reference": "f2f4dafb10be6c401222abf575156c55b3dcca31" + "reference": "a336b45065e8ba1ba5fd39b4d24856d139642654" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-siteconfig/zipball/f2f4dafb10be6c401222abf575156c55b3dcca31", - "reference": "f2f4dafb10be6c401222abf575156c55b3dcca31", + "url": "https://api.github.com/repos/silverstripe/silverstripe-siteconfig/zipball/a336b45065e8ba1ba5fd39b4d24856d139642654", + "reference": "a336b45065e8ba1ba5fd39b4d24856d139642654", "shasum": "" }, "require": { @@ -517,7 +526,7 @@ "silverstripe", "siteconfig" ], - "time": "2017-05-08 15:36:11" + "time": "2017-07-26 10:34:38" }, { "name": "silverstripe/tagfield", @@ -561,70 +570,6 @@ ], "time": "2017-03-30 16:11:29" }, - { - "name": "silverstripe/userforms", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/silverstripe/silverstripe-userforms.git", - "reference": "b78927a87baebf87469d48b47969f355df31013d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-userforms/zipball/b78927a87baebf87469d48b47969f355df31013d", - "reference": "b78927a87baebf87469d48b47969f355df31013d", - "shasum": "" - }, - "require": { - "silverstripe-australia/gridfieldextensions": "~1.1", - "silverstripe/cms": "~3.1", - "silverstripe/framework": "~3.1", - "silverstripe/segment-field": "^1.0" - }, - "suggest": { - "colymba/gridfield-bulk-editing-tools": "Allows for bulk management of form submissions", - "silverstripe/gridfieldqueuedexport": "Export large submission as CSV through queued jobs in the background", - "silverstripe/secureassets": "Enables files uploaded via userforms to be secured from public access" - }, - "type": "silverstripe-module", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "David Craig", - "email": "david@silverstripe.com" - }, - { - "name": "Damian Mooyman", - "email": "damian@silverstripe.com" - }, - { - "name": "Will Rossiter", - "email": "will@fullscreen.io" - }, - { - "name": "Christopher Pitt", - "email": "chris@silverstripe.com" - }, - { - "name": "Scott Hutchinson", - "email": "scott@silverstripe.com" - } - ], - "description": "UserForms enables CMS users to create dynamic forms via a drag and drop interface and without getting involved in any PHP code", - "keywords": [ - "silverstripe", - "userforms" - ], - "time": "2017-05-08 11:17:00" - }, { "name": "unclecheese/betterbuttons", "version": "1.3.14", @@ -667,17 +612,17 @@ "source": { "type": "git", "url": "https://github.com/UndefinedOffset/SortableGridField.git", - "reference": "2d8cd6540f2c948cbe0c8f73adab7fd9e2aec803" + "reference": "2b03ab81f73511241016844b4a7969c218fd99d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/UndefinedOffset/SortableGridField/zipball/2d8cd6540f2c948cbe0c8f73adab7fd9e2aec803", - "reference": "2d8cd6540f2c948cbe0c8f73adab7fd9e2aec803", + "url": "https://api.github.com/repos/UndefinedOffset/SortableGridField/zipball/2b03ab81f73511241016844b4a7969c218fd99d2", + "reference": "2b03ab81f73511241016844b4a7969c218fd99d2", "shasum": "" }, "require": { "composer/installers": "*", - "silverstripe/framework": ">=3.0.1" + "silverstripe/framework": ">=3.0.1 <4.0.0" }, "type": "silverstripe-module", "extra": { @@ -699,14 +644,13 @@ "gridfield", "silverstripe" ], - "time": "2017-05-11 15:17:40" + "time": "2017-08-14 12:38:34" } ], "packages-dev": [], "aliases": [], "minimum-stability": "dev", "stability-flags": { - "silverstripe/userforms": 20, "undefinedoffset/sortablegridfield": 20 }, "prefer-stable": false, diff --git a/site/favicon.ico b/site/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..0a76012e24888d6b956b2af006b1df1d3fbdcb0c GIT binary patch literal 1086 zcmbtTJ8NQ55Wb6xB8x;MEW{}IfS4a)ZJ)}Y5YRS_#9AyY(u=PuSXhZz2x>rrMS@LI z_=p-6ANUByXVm!Zo!LE-)H|0sGiS~`&iQ7pB>j-TBdsK_Ch7dAB>k2o>0IU`nN2d2 zohYx6B;BvS%m#VEKicp27>~zjwOV+6eMPU=!~6R?s?{nonGEjl?=hdx*_(U?tyU}4 zYBluxeJmCWESF2nW-~lIJiu%=gGvzVbUOHaK74$9aOiry=G-K|(&y(VZ=ar?pwVdH za5#|7W)Y9akxr*UwO?LdxCS|jyHFhIVxLSVF&GREso&n-IIdVMvhDKn5+09-b&8!# zCMcCkEZgli+ud$ATrL;u<#HK;K!Ej|n;S$T5!UHW$H&L~#*>p1M59r*he9EQ!(rAb zpVew*Y}p_$olXY^gW-S;VPvsb7(en6I8Yz-dOc20PZ>Yz&E4G{$JuN)#^LPjjQ7va z&zxRhOukoFSA0e|5)Fq#Xti3XR4O=~PAHX1-jkh(>JnEf6`lvtH$IdXzu(XK6bc1P zfr;oNy-VPp%jJ+rBsg@p+p)~&^YD7Th{a+MHaciFn-I8D59zGYXmAWI0uNz$e0;?1 z?JX`YF8GaP-)^^u{@3gE1D13~vweMi%`;6iu2!r0{;5=oj=7$go#}M?tv21wWHNzr zZZ;dn&ThAJ94#VFNctD3h9L3IU@!=y(fIA1!iS`YAB{$gKjoml6bc2td$-$V_peyU IbMs&H2RXqM^8f$< literal 0 HcmV?d00001 From 4728ac53c588312a0152677b232a391a3f11b786 Mon Sep 17 00:00:00 2001 From: psserver Date: Wed, 6 Sep 2017 21:11:04 +1200 Subject: [PATCH 2/2] DebugInfo --- site/templates/Includes/DocumentFoot.ss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/templates/Includes/DocumentFoot.ss b/site/templates/Includes/DocumentFoot.ss index 73e3613..ffd9735 100644 --- a/site/templates/Includes/DocumentFoot.ss +++ b/site/templates/Includes/DocumentFoot.ss @@ -1,5 +1,5 @@ - $DebugTools + $DebugInfo \ No newline at end of file