From 8a4bb1eb66da1140375071ea153b83946b07aa71 Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Thu, 8 Jan 2015 17:12:27 +0100
Subject: manage unauthenticated_root

---
 config/deploy/production.rb        | 4 ++--
 config/deploy/unstable.rb          | 4 ++--
 config/environments/development.rb | 9 +++++----
 config/routes.rb                   | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'config')

diff --git a/config/deploy/production.rb b/config/deploy/production.rb
index 57d36de2d..976a5d9a3 100644
--- a/config/deploy/production.rb
+++ b/config/deploy/production.rb
@@ -1,3 +1,3 @@
 server "chouette.cityway.fr", :app, :web, :db, :primary => true
-set :branch, "V2_5"
-set :gui_cmd, "2.5.1"
\ No newline at end of file
+set :branch, "V2_5_1"
+set :gui_cmd, "2.5.1"
diff --git a/config/deploy/unstable.rb b/config/deploy/unstable.rb
index e8fe08e75..b5e60b53d 100644
--- a/config/deploy/unstable.rb
+++ b/config/deploy/unstable.rb
@@ -1,3 +1,3 @@
 server "chouette-p.aix.cityway.fr", :app, :web, :db, :primary => true
-set :branch, "V2_5"
-set :gui_cmd, "2.5.1"
\ No newline at end of file
+set :branch, "V2_5_1"
+set :gui_cmd, "2.5.1"
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 0d33ac03c..3d7819639 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -69,10 +69,11 @@ ChouetteIhm::Application.configure do
   # Configure the e-mail address which will be shown in Devise::Maile
   config.mailer_sender = "appli@chouette.mobi"
 
-  ActionMailer::Base.smtp_settings = {
-    :address        => "smtp.samle.com",
-    :domain         => "sample.com"
-  }
+ config.action_mailer.delivery_method = :sendmail 
+  # change to true to allow email to be sent during development
+  config.action_mailer.perform_deliveries = true
+  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.default :charset => "utf-8"
 
   # api key to geoportail IGN (development key 3 month validity)
   # config.geoportail_api_key = "f1t6wihbh98njlbaf5cuzxy4"
diff --git a/config/routes.rb b/config/routes.rb
index 530e17409..6879a2191 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,11 +7,11 @@ ChouetteIhm::Application.routes.draw do
 
   devise_scope :user do
     authenticated :user do
-      root :to => 'referentials#index'
+      root :to => 'referentials#index', as: :authenticated_root
     end
 
     unauthenticated do
-      root :to => 'devise/sessions#new'
+      root :to => 'devise/sessions#new', as: :unauthenticated_root
     end
   end
 
-- 
cgit v1.2.3


From bb6980242200a1611d6d192b3284da6e58fd752e Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Fri, 9 Jan 2015 11:26:24 +0100
Subject: manage unauthenticated_root

---
 config/routes.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/routes.rb b/config/routes.rb
index 6879a2191..9fbbe7c29 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -156,6 +156,7 @@ ChouetteIhm::Application.routes.draw do
     resources :clean_ups
 
   end
+  root :to => "referentials#index"
 
   match '/help/(*slug)' => 'help#show'
 
-- 
cgit v1.2.3


From ef4cc372d9dffe91354fb5ea5b44ef46a86677c4 Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Fri, 9 Jan 2015 11:57:10 +0100
Subject: manage unauthenticated_root

---
 config/locales/devise_invitable.fr.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/locales/devise_invitable.fr.yml b/config/locales/devise_invitable.fr.yml
index 23a88aa16..692625f9c 100644
--- a/config/locales/devise_invitable.fr.yml
+++ b/config/locales/devise_invitable.fr.yml
@@ -2,10 +2,10 @@ fr:
   devise:
     invitations:
       send_instructions: "Un email d'invitation a été envoyé à %{email}."
-      invitation_token_invalid: "L'invitation fourni n'est pas valide!"
+      invitation_token_invalid: "L'invitation fournie n'est pas valide!"
       updated: 'Votre mot de passe a été enregistré avec succés. Vous êtes maintenant connecté.'
       no_invitations_remaining: "Pas d'invitations restantes."
-      invitation_removed: 'Votre invitation a été supprimé.'
+      invitation_removed: 'Votre invitation a été supprimée.'
       new:
         header: "Envoyer une invitation"
         submit_button: "Envoyer une invitation"
@@ -14,7 +14,7 @@ fr:
         submit_button: "Valider mon mot de passe"
     mailer:
       invitation_instructions:
-        subject: "Invitation sur l'appication Chouette"
+        subject: "Invitation sur l'application Chouette"
         hello: 'Bonjour %{email}'
         someone_invited_you: "Ce message est une invitation pour accéder à %{url}, , vous pouvez l'accepter en cliquant sur le lien suivant :"
         accept: "Accepter l'invitation"
-- 
cgit v1.2.3