summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorazul <azul@leap.se>2015-09-30 10:51:21 +0200
committerazul <azul@leap.se>2015-09-30 10:51:21 +0200
commitd45f6c61f6a13be06f1977b857e0cb31e79c5317 (patch)
treed3089b334c2663ea2fd76cf62dea853bdd57b047 /config
parenta894966e425f27c31e7da196658c6ddee3fc3714 (diff)
parentd4f10a8d47572bcab4c44878b952146732d64d2e (diff)
Merge pull request #194 from Alster-Hamburgers/feature/invite_code
Request for feedback on invite code feature
Diffstat (limited to 'config')
-rw-r--r--config/defaults.yml1
-rw-r--r--config/locales/en/users.en.yml2
2 files changed, 3 insertions, 0 deletions
diff --git a/config/defaults.yml b/config/defaults.yml
index dfa2a9a..906b446 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -82,6 +82,7 @@ common: &common
- support
- billing
allow_registration: true
+ invite_required: false
config_file_paths:
soledad-service: 'public/1/config/soledad-service.json'
eip-service: 'public/1/config/eip-service.json'
diff --git a/config/locales/en/users.en.yml b/config/locales/en/users.en.yml
index 89307dd..4c6bbc0 100644
--- a/config/locales/en/users.en.yml
+++ b/config/locales/en/users.en.yml
@@ -8,6 +8,8 @@ en:
account_settings: "Account Settings"
username: "Username"
password: "Password"
+ password_confirmation: "Password confirmation"
+ invite_code: "Invite code"
change_password: "Change Password"
invalid_user_pass: "Not a valid username/password combination"
invalid_ephemeral: "Invalid random key used. This looked like an attempt to hack the site to us. If it wasn't please contact support so we can look into the issue."