move messsage resources to separate repo

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "utils/abp-parser"]
 	path = utils/abp-parser
 	url = git@git.bubblev.org:bubblev/abp-parser.git
+[submodule "bubble-server/src/main/resources/messages"]
+	path = bubble-server/src/main/resources/messages
+	url = git@git.bubblev.org:bubblev/bubble-messages.git

bin/first_time_setup.sh

@@ -50,6 +50,9 @@ for repo in ${UTIL_REPOS} ; do
 done
 popd
 
+MESSAGES_REPO=bubble-server/src/main/resources/messages
+pushd ${MESSAGES_REPO} && git checkout master && popd || die "Error installing ${MESSAGES_REPO}"
+
 if [[ -z "${BUBBLE_SETUP_MODE}" || "${BUBBLE_SETUP_MODE}" == "web" ]] ; then
   INSTALL_WEB=web mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar"
 

bin/git_update_bubble.sh

@@ -35,7 +35,7 @@ git pull origin master || die "Error calling git pull origin master"
 git submodule update || die "Error in git submodule update"
 
 pushd utils/cobbzilla-parent
-git fetch && git checkout master && git pull origin master && mvn install || die "Error updating/installing cobbzilla-parent"
+git fetch && git checkout master && git pull origin master && mvn install || die "Error updating cobbzilla-parent"
 popd
 
 UTIL_REPOS="
@@ -49,13 +49,16 @@ abp-parser
 pushd utils
 for repo in ${UTIL_REPOS} ; do
   if [[ ${FAST} -eq 1 ]] ; then
-    pushd ${repo} && git fetch && git checkout master && git pull origin master && mvn -DskipTests=true -Dcheckstyle.skip=true install && popd || die "Error installing ${repo}"
+    pushd ${repo} && git fetch && git checkout master && git pull origin master && mvn -DskipTests=true -Dcheckstyle.skip=true install && popd || die "Error updating ${repo}"
   else
-    pushd ${repo} && git fetch && git checkout master && git pull origin master && mvn -DskipTests=true -Dcheckstyle.skip=true clean install && popd || die "Error installing ${repo}"
+    pushd ${repo} && git fetch && git checkout master && git pull origin master && mvn -DskipTests=true -Dcheckstyle.skip=true clean install && popd || die "Error updating ${repo}"
   fi
 done
 popd
 
+MESSAGES_REPO=bubble-server/src/main/resources/messages
+pushd ${MESSAGES_REPO} && git fetch && git checkout master && git pull origin master && popd || die "Error updating ${MESSAGES_REPO}"
+
 if [[ ${FAST} -eq 1 ]] ; then
   mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar"
 else

bubble-server/src/main/java/bubble/ApiConstants.java

@@ -85,7 +85,7 @@ public class ApiConstants {
 
     public static final String SESSION_HEADER = "X-Bubble-Session";
 
-    public static final String MESSAGE_RESOURCE_BASE = "message_templates/";
+    public static final String MESSAGE_RESOURCE_BASE = "messages/";
 
     public static final String ENTITY_CONFIGS_ENDPOINT = "/ec";
 

bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/message.hbs

@@ -1,13 +0,0 @@
-Hello {{account.name}},
-
-Someone has requested deletion of your account named '{{account.name}}' on {{network.nickname}}
-
-The account deletion request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-An approval was received via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-When sufficient approvals are received, the account will be deleted.
-
-If you do not want your account to be deleted, deny this request using another contact method associated with your account.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/subject.hbs

@@ -1 +0,0 @@
-Account Deletion Approval Received -- {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/message.hbs

@@ -1,9 +0,0 @@
-Hello {{account.name}},
-
-A request to download account data for the account named '{{account.name}}' on {{network.nickname}} has been approved.
-
-The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
-
-The approval was received via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/subject.hbs

@@ -1 +0,0 @@
-Download account data approved for {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/message.hbs

@@ -1,11 +0,0 @@
-Hello {{account.name}},
-
-Someone is trying to log in to the account named '{{account.name}}' on {{network.nickname}}
-
-The login request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.request.remoteHost}}.
-
-An approval was received via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-When sufficient approvals are received, login can proceed.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/subject.hbs

@@ -1 +0,0 @@
-Account Login Approval Received -- {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/message.hbs

@@ -1,9 +0,0 @@
-Hello {{account.name}},
-
-The password for the account named '{{account.name}}' on {{network.nickname}} has been reset.
-
-The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
-
-The approval was received via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/subject.hbs

@@ -1 +0,0 @@
-Password Successfully Reset for {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/message.hbs

@@ -1,11 +0,0 @@
-Hello {{account.name}},
-
-The Bubble Restore Key request for {{network.nickname}} has been approved.
-
-The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
-
-The approval was received via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-When all required approvals are received, you will receive another message with a link to view the network keys.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/subject.hbs

@@ -1 +0,0 @@
-Bubble Restore Key request approved on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/message.hbs

@@ -1,19 +0,0 @@
-Hello {{account.name}},
-
-Your account named '{{account.name}}' on {{network.nickname}} has been deleted.
-
-The account deletion request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-The account deletion request was approved and subsequently executed on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-{{#if account.policy.fullDelete}}
-Your account deletion policy was "full deletion". This means that your account record, and all records and data associated with it, have been deleted.
-{{/if}}
-{{#if account.policy.blockDelete}}
-Your account deletion policy was "block deletion". This means that all records and data associated with your account have been deleted, and
-your account record itself has been wiped, except for the username. This will prevent any future user from claiming that username.
-{{/if}}
-
-This action is irrevocable.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/subject.hbs

@@ -1 +0,0 @@
-Account Deletion Completed -- {{account.name}} on {{network.nickname}} has been permanently deleted

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/message.hbs

@@ -1,13 +0,0 @@
-Hello {{account.name}},
-
-The download request for the account named '{{account.name}}' on {{network.nickname}} has been confirmed
-
-The request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-An approval was received via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-Follow this link to download your account data:
-
-  {{publicUri}}/me/download/{{message.requestId}}
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/subject.hbs

@@ -1 +0,0 @@
-Download Account Data for: {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/message.hbs

@@ -1,9 +0,0 @@
-Hello {{account.name}},
-
-A successful login has been made to the account named '{{account.name}}' on {{network.nickname}}
-
-The login request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-An approval was received via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/subject.hbs

@@ -1 +0,0 @@
-Account Login Confirmed -- {{account.name}} on {{network.nickname}} has been permanently deleted

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/message.hbs

@@ -1,9 +0,0 @@
-Hello {{account.name}},
-
-The password for the account named '{{account.name}}' on {{network.nickname}} has been reset.
-
-The password reset request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-An approval was received via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/subject.hbs

@@ -1 +0,0 @@
-Account Password Reset: {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/message.hbs

@@ -1,15 +0,0 @@
-Hello {{account.name}},
-
-The Bubble Network Key request {{network.nickname}} has been approved.
-
-The request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-An approval was received via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-Follow the link below to view your Bubble Restore Key ( code: {{message.requestId}} ):
-
-  {{publicUri}}/bubble/{{network.name}}?keys_code={{message.requestId}}
-
-This link will only work once, and only for the next 15 minutes.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/subject.hbs

@@ -1 +0,0 @@
-Download Bubble Restore Key for {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/message.hbs

@@ -1,9 +0,0 @@
-Hello {{account.name}},
-
-Contact information for your account named '{{account.name}}' on {{network.nickname}} has been successfully verified:
-
-{{contact.type}} - {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}}
-
-Verification was confirmed on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/subject.hbs

@@ -1 +0,0 @@
-Addition of {{contact.type}} / {{contact.info}} {{#if contact.nick}}({{contact.nick}}) {{/if}}has been successfully verified on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/message.hbs

@@ -1,13 +0,0 @@
-Hello {{account.name}},
-
-Someone has requested deletion of your account named '{{account.name}}' on {{network.nickname}}
-
-The account deletion request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-An denial was received via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-This account deletion request has been canceled and cannot be resumed.
-
-If you actually do want your account to be deleted, start a new deletion request.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/subject.hbs

@@ -1 +0,0 @@
-Account Deletion Denied -- {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/message.hbs

@@ -1,9 +0,0 @@
-Hello {{account.name}},
-
-The download request for the account named '{{account.name}}' on {{network.nickname}} has been canceled.
-
-The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
-
-The request was canceled via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/subject.hbs

@@ -1 +0,0 @@
-Download account data denied for account: {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/message.hbs

@@ -1,11 +0,0 @@
-Hello {{account.name}},
-
-Someone is trying to log in to the account named '{{account.name}}' on {{network.nickname}}
-
-The login request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-A denial was received via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-This login attempt has been be denied.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/subject.hbs

@@ -1 +0,0 @@
-Account Login Approval Denied -- {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/message.hbs

@@ -1,9 +0,0 @@
-Hello {{account.name}},
-
-The reset password request for the account named '{{account.name}}' on {{network.nickname}} has been canceled.
-
-The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
-
-The request was canceled via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/subject.hbs

@@ -1 +0,0 @@
-Password Reset was canceled for {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/message.hbs

@@ -1,9 +0,0 @@
-Hello {{account.name}},
-
-The "View Network Keys" request for {{network.nickname}} has been canceled.
-
-The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
-
-The request was canceled via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/subject.hbs

@@ -1 +0,0 @@
-View Network Keys: request denied on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/message.hbs

@@ -1,9 +0,0 @@
-Hello {{account.name}},
-
-Contact information for your account named '{{account.name}}' on {{network.nickname}} has been denied and removed:
-
-{{contact.type}} - {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}}
-
-Verification was denied on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/subject.hbs

@@ -1 +0,0 @@
-Addition of {{contact.type}} / {{contact.info}} {{#if contact.nick}}({{contact.nick}}) {{/if}}has been denied on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/notice/payment/network/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/notice/payment/network/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/notice/payment/network/message.hbs

@@ -1,12 +0,0 @@
-Hello {{account.name}},
-
-Your Bubble has been stopped due to non-payment.
-
-Please check your payment information and pay your bill:
-
-  {{publicUri}}/me/plans/{{message.data}}/bills
-
-NOTE: If you haven't downloaded your Bubble's restore key, you will NOT be able to restore your Bubble.
-You will have to set up a new Bubble.
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/notice/payment/network/subject.hbs

@@ -1 +0,0 @@
-Bubble {{network.nickname}} stopped due to non-payment. Please pay now to resume service.

bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/message.hbs

@@ -1,21 +0,0 @@
-Hello {{account.name}},
-
-Congratulations, your new Bubble is launching!
-
-When your Bubble finishes the self-setup process, it will send you a message letting you know it's ready to use.
-
-While you're waiting for your Bubble to be ready, please install the Bubble app on your devices:
-
-  * Android -- {{appLinks.android}}
-
-  * iOS (iPhone and iPad) -- {{appLinks.ios}}
-
-  * Windows 7 and higher -- {{appLinks.windows}}
-
-  * MacOS X -- {{appLinks.macosx}}
-
-  * Linux -- {{appLinks.linux}}
-
-{{#if support.hasInfo}}If you have any questions or need help, please {{#if support.hasEmailAndSite}}visit our support site: {{support.site}} or contact us at {{support.email}}{{else}}{{#if support.hasEmail}}contact {{support.email}}{{else}}visit {{support.site}}{{/if}}{{/if}}
-{{/if}}
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/subject.hbs

@@ -1 +0,0 @@
-Your new Bubble is launching: {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/message.hbs

@@ -1,11 +0,0 @@
-Hello {{account.name}},
-
-Welcome to Bubble!
-
-Please confirm your email address using this link:
-
-{{publicUri}}/me/action?approve={{confirmationToken}}
-
-{{#if support.hasInfo}}If you have any questions or need help, please {{#if support.hasEmailAndSite}}visit our support site: {{support.site}} or contact us at {{support.email}}{{else}}{{#if support.hasEmail}}contact {{support.email}}{{else}}visit {{support.site}}{{/if}}{{/if}}
-{{/if}}
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/subject.hbs

@@ -1 +0,0 @@
-Welcome to Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/message.hbs

@@ -1,28 +0,0 @@
-Hello {{account.name}},
-
-Someone has requested deletion of your account named '{{account.name}}' on {{network.nickname}}
-
-The account deletion request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
-
-
-If you did not make this request or would like to cancel this request, please click this link:
-
-  {{publicUri}}/me/deny?t={{confirmationToken}}
-
-
-If you DID make this request and are ready to approve this deletion, click the link below.
-
-NOTE: When all required approvals are received, your account will be deleted.
-
-When your account is deleted, ALL OF YOUR DATA WILL BE DELETED. THIS ACTION CANNOT BE UNDONE.
-
-  {{publicUri}}/me/approve?t={{confirmationToken}}
-
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/subject.hbs

@@ -1 +0,0 @@
-Account Deletion Requested -- Please Confirm Deletion of {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/message.hbs

@@ -1,24 +0,0 @@
-Hello {{account.name}},
-
-Someone is trying to download all account data for the account named '{{account.name}}' on {{network.nickname}}
-
-The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
-
-
-If you did not make this request or would like to cancel this request, please click this link:
-
-  {{publicUri}}/action?deny={{confirmationToken}}&user={{account.name}}
-
-
-If you DID make this request and want to download your account data, click the link below.
-
-  {{publicUri}}/action?approve={{confirmationToken}}&user={{account.name}}
-
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/subject.hbs

@@ -1 +0,0 @@
-Download all account data requested for account: {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/message.hbs

@@ -1,25 +0,0 @@
-Hello {{account.name}},
-
-Someone is trying to log in to the account named '{{account.name}}' on {{network.nickname}}
-
-The login request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
-
-
-If you did not make this request or would like to cancel this request, please click this link:
-
-  {{publicUri}}/deny?t={{confirmationToken}}
-
-
-If you DID make this request and are ready to approve this login, enter this code on the
-login authentication page:
-
-  {{confirmationToken}}
-
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/subject.hbs

@@ -1 +0,0 @@
-Account Login -- Please Confirm Login for {{account.name}} on {{network.nickname}}

bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/fromEmail.hbs

@@ -1 +0,0 @@
-no-reply@{{network.networkDomain}}

bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/fromName.hbs

@@ -1 +0,0 @@
-{{network.nickname}} System Account

bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/message.hbs

@@ -1,24 +0,0 @@
-Hello {{account.name}},
-
-Someone is trying to reset the password for the account named '{{account.name}}' on {{network.nickname}}
-
-The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
-
-
-If you did not make this request or would like to cancel this request, please click this link:
-
-  {{publicUri}}/action?deny={{confirmationToken}}&user={{urlEncode account.name}}
-
-
-If you DID make this request and are ready to set a new password for your account, click the link below.
-
-  {{publicUri}}/action?approve={{confirmationToken}}&user={{urlEncode account.name}}
-
-
-Thank you for using Bubble!

bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/subject.hbs

@@ -1 +0,0 @@
-Password Reset for {{account.name}} on {{network.nickname}}