Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

3 files changed, 25 insertions, 26 deletions

diff --git a/Gemfile b/Gemfile
index 76ddb10b0..218fd910f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,8 +23,8 @@ end
 gem "map_layers", "~> 0.0.4"
 gem "georuby-ext", :git => 'git://github.com/dryade/georuby-ext.git'
 
-gem 'user_interface', :git => 'git://github.com/dryade/user-interface.git'
-#gem 'user_interface', :git => 'git://sim.dryade.priv/user_interface' #, :path => '~/Projects/UserInterfaceDryade'
+#gem 'user_interface', :git => 'git://github.com/dryade/user-interface.git'
+gem 'user_interface', :git => 'git://sim.dryade.priv/user_interface' #, :path => '~/Projects/UserInterfaceDryade'
 gem 'json'
 gem 'cocoon'
 gem 'formtastic'
@@ -39,9 +39,9 @@ gem 'gravatar_image_tag'
 gem 'calendar_helper', :git => "git://github.com/topfunky/calendar_helper.git"
 
 gem "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git"
-gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
+#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
 #gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git', :branch => 'V2_0_0'
-#gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
+gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
 #gem 'ninoxe', :path => '~/workspace/chouette/ninoxe'
 gem 'acts_as_list', '0.1.6'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 1072b6404..d404c26a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,16 @@
 GIT
+  remote: git://chouette.dryade.priv/ninoxe
+  revision: 3cdd4be0710cd295c62c3c8050c849cce355682d
+  specs:
+    ninoxe (0.0.8)
+      GeoRuby
+      activerecord (>= 3.1.3)
+      acts_as_list (>= 0.1.6)
+      composite_primary_keys (>= 4.1.2)
+      geokit
+      rails (>= 3.1.3)
+
+GIT
   remote: git://github.com/dnagir/database_cleaner.git
   revision: 0c0aa44f13ae392000a6f506b62d5d1602cb4e53
   branch: postgre_jruby_issue
@@ -48,31 +60,19 @@ GIT
       rgeo (~> 0.3.8)
 
 GIT
-  remote: git://github.com/dryade/ninoxe.git
-  revision: d400baaba492a698b95bee1228466191564c41dc
+  remote: git://github.com/topfunky/calendar_helper.git
+  revision: 763a497dbd8833b98d92815667b367ade938c00c
   specs:
-    ninoxe (0.0.8)
-      GeoRuby
-      activerecord (>= 3.1.3)
-      acts_as_list (= 0.1.6)
-      composite_primary_keys (>= 4.1.2)
-      geokit
-      rails (>= 3.1.3)
+    calendar_helper (0.2.5)
+      open4
 
 GIT
-  remote: git://github.com/dryade/user-interface.git
-  revision: 2a30a4eb3ff446f9d2b2de12ecacb5f923e5623c
+  remote: git://sim.dryade.priv/user_interface
+  revision: d828d7107f2b4025853cbfa7cc0e76cceca27da6
   specs:
     user_interface (0.0.1)
       rails (> 3.1.0)
 
-GIT
-  remote: git://github.com/topfunky/calendar_helper.git
-  revision: 763a497dbd8833b98d92815667b367ade938c00c
-  specs:
-    calendar_helper (0.2.5)
-      open4
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -142,8 +142,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
-    composite_primary_keys (5.0.8)
-      activerecord (~> 3.2.0)
+    composite_primary_keys (5.0.10)
     delayed_job (3.0.3)
       activesupport (~> 3.0)
     delayed_job_active_record (0.3.2)
@@ -263,7 +262,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.4)
+    rake (0.9.5)
     ransack (0.7.0)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
diff --git a/app/views/help/index.textile b/app/views/help/index.textile
index 06a54a636..dbd439a7b 100644
--- a/app/views/help/index.textile
+++ b/app/views/help/index.textile
@@ -3,7 +3,7 @@ layout: default
 title: Chouette v2 
 ---
 
-Version 2.0.0
+Version 2.0.1
 
 h3. Logiciel libre propriété de :