Merge pull request #1 from monkeyfeet/feature/devtools

Feature/devtools
monkeyfeet · Sep 6, 2017 · 32a31c2 · 32a31c2
2 parents ac27a86 + 4728ac5
commit 32a31c2
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 135 deletions.
diff --git 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
diff --git 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
diff --git a/site/favicon.ico b/site/favicon.ico
diff --git a/site/templates/Includes/DocumentFoot.ss b/site/templates/Includes/DocumentFoot.ss
@@ -1,5 +1,5 @@
 
-    $DebugTools
+    $DebugInfo
 
 </body>
 </html>