diff --git a/.holo/branches/emergence-site/_codeforphilly.toml b/.holo/branches/emergence-site/_codeforphilly.toml index e9a07744..3897826f 100644 --- a/.holo/branches/emergence-site/_codeforphilly.toml +++ b/.holo/branches/emergence-site/_codeforphilly.toml @@ -1,3 +1,3 @@ [holomapping] files = "*/**" -after = [ "laddr" ] +after = "*" diff --git a/.holo/branches/emergence-site/_laddr.toml b/.holo/branches/emergence-site/_laddr.toml index 76c4570c..94db1844 100644 --- a/.holo/branches/emergence-site/_laddr.toml +++ b/.holo/branches/emergence-site/_laddr.toml @@ -1,2 +1,3 @@ [holomapping] files = "*/**" +before = "*" diff --git a/.holo/sources/laddr.toml b/.holo/sources/laddr.toml index 15f9e6fe..3ea9bec3 100644 --- a/.holo/sources/laddr.toml +++ b/.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" diff --git a/.studiorc b/.studiorc index eb04fee8..66daba17 100644 --- a/.studiorc +++ b/.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 ' 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 -} diff --git a/php-config/Laddr/ProfileRequestHandler.config.d/newsletter.php b/php-config/Laddr/ProfileRequestHandler.config.d/newsletter.php new file mode 100644 index 00000000..aeed721e --- /dev/null +++ b/php-config/Laddr/ProfileRequestHandler.config.d/newsletter.php @@ -0,0 +1,4 @@ +