From fd614eab37069f933f3e592d4bdc0361d941f5eb Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Thu, 5 Jun 2014 15:56:50 +0200
Subject: correct mistake

---
 config/environments/production.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 8f4d09b1c..2599ed0dc 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -111,7 +111,7 @@ ChouetteIhm::Application.configure do
   # paths for external resources
   config.to_prepare do
     Devise::Mailer.layout "mailer"
-    Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? "/usr/local/opt/chouette-command/chouette-cmd_2.4.0/chouette" ; ENV['CHOUETTE_GUI_COMMAND']
+    Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? ? "/usr/local/opt/chouette-command/chouette-cmd_2.4.0/chouette" ; ENV['CHOUETTE_GUI_COMMAND']
     ImportTask.root = "/var/lib/chouette/imports"
     Export.root = "/var/lib/chouette/exports"
   end
-- 
cgit v1.2.3


From 663b01cd8d6f8cf0a8a2dec00878c39fa041fb82 Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Thu, 5 Jun 2014 16:34:39 +0200
Subject: correct mistake

---
 config/environments/production.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2599ed0dc..15fe7d7e8 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -111,7 +111,7 @@ ChouetteIhm::Application.configure do
   # paths for external resources
   config.to_prepare do
     Devise::Mailer.layout "mailer"
-    Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? ? "/usr/local/opt/chouette-command/chouette-cmd_2.4.0/chouette" ; ENV['CHOUETTE_GUI_COMMAND']
+    Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? ? "/usr/local/opt/chouette-command/chouette-cmd_2.4.0/chouette" : ENV['CHOUETTE_GUI_COMMAND']
     ImportTask.root = "/var/lib/chouette/imports"
     Export.root = "/var/lib/chouette/exports"
   end
-- 
cgit v1.2.3


From 6658941452598e01439c5e1f391fe8d5de5b6513 Mon Sep 17 00:00:00 2001
From: Marc Florisson
Date: Fri, 23 May 2014 15:17:07 +0200
Subject: clean useless code, after adding stop_points in route#edit

---
 config/routes.rb | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'config')

diff --git a/config/routes.rb b/config/routes.rb
index de77856f3..92c8b0b20 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -92,11 +92,6 @@ ChouetteIhm::Application.routes.draw do
           get 'select_journey_pattern', :on => :member
           resources :vehicle_translations
         end
-        resources :stop_points do
-          collection do
-            post :sort
-          end
-        end
       end
     end
 
-- 
cgit v1.2.3


From e70fce3776d465639c766f29721bc31849d3cf44 Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Tue, 24 Jun 2014 08:24:32 +0200
Subject: connect to chouette cmd 2.4.1

---
 config/environments/production.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 15fe7d7e8..68002de35 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -111,7 +111,7 @@ ChouetteIhm::Application.configure do
   # paths for external resources
   config.to_prepare do
     Devise::Mailer.layout "mailer"
-    Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? ? "/usr/local/opt/chouette-command/chouette-cmd_2.4.0/chouette" : ENV['CHOUETTE_GUI_COMMAND']
+    Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? ? "/usr/local/opt/chouette-command/chouette-cmd_2.4.1/chouette" : ENV['CHOUETTE_GUI_COMMAND']
     ImportTask.root = "/var/lib/chouette/imports"
     Export.root = "/var/lib/chouette/exports"
   end
-- 
cgit v1.2.3


From 24eac112be18f086f787ca8c828b9b1a4ee6e84c Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Tue, 24 Jun 2014 10:43:36 +0200
Subject: set version to 2.4.1

---
 config/environment.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/environment.rb b/config/environment.rb
index 5353fe344..299eb7b07 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -6,4 +6,4 @@ require File.expand_path('../application', __FILE__)
 ChouetteIhm::Application.initialize!
 
 # Fix version
-APP_VERSION = '2.4.0'
+APP_VERSION = '2.4.1'
-- 
cgit v1.2.3