Merge pull request #6 from CodeForPhilly/develop

Release: codeforphilly v1.0.0

.holo/branches/emergence-site/_codeforphilly.toml

@@ -1,3 +1,3 @@
 [holomapping]
 files = "*/**"
-after = [ "laddr" ]
+after = "*"

.holo/branches/emergence-site/_laddr.toml

@@ -1,2 +1,3 @@
 [holomapping]
 files = "*/**"
+before = "*"

.holo/sources/laddr.toml

@@ -1,6 +1,3 @@
 [holosource]
 url = "https://github.com/CodeForPhilly/laddr"
-ref = "refs/heads/develop"
-
-[holosource.project]
-holobranch = "emergence-skeleton"
+ref = "refs/heads/emergence/skeleton/v3"

.studiorc

@@ -1,9 +1,3 @@
 #!/bin/bash
-
 hab pkg install emergence/studio
 source "$(hab pkg path emergence/studio)/studio.sh"
-
-echo "    * Use 'load-into-mysql <files>' to load .sql.bz2 files into local mysql database"
-load-into-mysql() {
-    bzcat "$@" | hab pkg exec core/mysql mysql -u root -h 127.0.0.1 default
-}

php-config/Laddr/ProfileRequestHandler.config.d/newsletter.php

@@ -0,0 +1,4 @@
+<?php
+
+// uncomment to enable newsletter opt-in/out option in user profiles
+Laddr\ProfileRequestHandler::$enableNewsletterOptIn = true;