diff options
| -rw-r--r-- | Gemfile | 8 | ||||
| -rw-r--r-- | Gemfile.lock | 35 | ||||
| -rw-r--r-- | config/locales/layouts.yml | 2 |
3 files changed, 25 insertions, 20 deletions
@@ -22,8 +22,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' @@ -36,8 +36,8 @@ gem 'jquery-rails' gem "modernizr-rails", "~> 2.0.6" 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://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe' +#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git' +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 efaaf4112..e15775669 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,4 +1,16 @@ GIT + remote: git://chouette.dryade.priv/ninoxe + revision: a676372aa170b006c3694110fe63f6d0e6ecbbdc + 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,20 +60,8 @@ GIT rgeo (~> 0.3.8) GIT - remote: git://github.com/dryade/ninoxe.git - revision: a676372aa170b006c3694110fe63f6d0e6ecbbdc - 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/dryade/user-interface.git - revision: 6e4654e6805091cb8b485e36730176af3dc4e581 + remote: git://sim.dryade.priv/user_interface + revision: 1afb74d751bbe0cef2736e992788aa7d5237f770 specs: user_interface (0.0.1) rails (> 3.1.0) @@ -70,6 +70,7 @@ GEM remote: http://rubygems.org/ specs: GeoRuby (1.3.4) + RedCloth (4.2.9) RedCloth (4.2.9-java) SyslogLogger (1.4.1) actionmailer (3.2.6) @@ -105,6 +106,7 @@ GEM acts_as_list (0.1.6) addressable (2.2.8) arel (3.0.2) + bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-java) bouncy-castle-java (1.5.0146.1) builder (3.0.0) @@ -154,6 +156,7 @@ GEM factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) railties (>= 3.0.0) + ffi (1.0.11) ffi (1.0.11-java) ffi-geos (0.0.4) ffi (~> 1.0.0) @@ -185,9 +188,10 @@ GEM jruby-rack (1.1.6) jruby-rack-worker (0.3-java) jruby-rack (>= 1.0.1) - json (1.7.4) json (1.7.4-java) json_pure (1.7.3) + launchy (2.1.0) + addressable (~> 2.2.6) launchy (2.1.0-java) addressable (~> 2.2.6) ffi (~> 1.0.9) @@ -213,6 +217,7 @@ GEM net-ssh (2.5.2) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) + nokogiri (1.5.5) nokogiri (1.5.5-java) orm_adapter (0.4.0) polyamorous (0.5.0) diff --git a/config/locales/layouts.yml b/config/locales/layouts.yml index a665578c1..60cac8cda 100644 --- a/config/locales/layouts.yml +++ b/config/locales/layouts.yml @@ -17,4 +17,4 @@ fr: profile: "Mon Profil" sign_out: "Déconnexion" tabs: - dashboard: "tableau de bord" + dashboard: "Tableau de bord" |