diff options
| author | spag <spag@golwen.net> | 2012-12-31 08:50:27 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2012-12-31 08:50:27 +0100 |
| commit | aed84444142604a62e37e57acfaaf957219e2c8d (patch) | |
| tree | e00b1f5844590393171e0bc839ab516d39f5144d /config | |
| parent | c24bd3a8212e85894b2f7c26e190fe5e89fbaaf2 (diff) | |
| parent | 12c8f4c82770ded6ea6b519e4451ed6757419ddf (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/gemeinschaft_parameters.rb | 2 | ||||
| -rw-r--r-- | config/locales/views/phones/de.yml | 1 | ||||
| -rw-r--r-- | config/locales/views/phones/en.yml | 1 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/config/initializers/gemeinschaft_parameters.rb b/config/initializers/gemeinschaft_parameters.rb index ffb8fee..1624165 100644 --- a/config/initializers/gemeinschaft_parameters.rb +++ b/config/initializers/gemeinschaft_parameters.rb @@ -1,6 +1,6 @@ # Use this file to set generic parameters for Gemeinschaft -GEMEINSCHAFT_VERSION = '5.0.1' +GEMEINSCHAFT_VERSION = '5.0.2-nightly-build' SUPER_TENANT_NAME = 'Super-Tenant' # System defaults diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml index dafe279..814267c 100644 --- a/config/locales/views/phones/de.yml +++ b/config/locales/views/phones/de.yml @@ -34,6 +34,7 @@ de: http_password: 'http password' nightly_reboot: 'Nachts automatischer Reboot' fallback_sip_account_id: 'Fallback SIP Account' + manual: 'Handbuch' actions: confirm: 'Sind Sie sicher, dass Sie diese Telefon aus Gemeinschaft entfernen möchten?' destroy: 'Löschen' diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml index ecd5a91..15e212e 100644 --- a/config/locales/views/phones/en.yml +++ b/config/locales/views/phones/en.yml @@ -34,6 +34,7 @@ en: nightly_reboot: 'Nightly reboot' provisioning_key_active: 'Provisioning key active' fallback_sip_account_id: 'Fallback SIP Account' + manual: 'Manual' actions: confirm: 'Are you sure you want to delete this phone?' destroy: 'Delete phone' diff --git a/config/routes.rb b/config/routes.rb index 64d64cf..33238dc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -199,6 +199,7 @@ Gemeinschaft42c::Application.routes.draw do get "page/index" get "page/conference" + get "page/beginners_intro" root :to => "page#index" |