added jwt api_token; using inaturalistjs API wrapper; git ignored web…

…packs for now
inaturalist · Mar 21, 2016 · f508cd7 · f508cd7
1 parent ab79058
commit f508cd7
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 46,809 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,6 @@ notes.txt
 xmp.xml
 
 config/environments/development.rb
+
+app/assets/javascripts/observations-identify-webpack.js
+app/assets/javascripts/webpack/observations/identify/webpack-entry.js
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1,2 @@
+5.8.0
+
diff --git a/Gemfile b/Gemfile
@@ -54,6 +54,7 @@ gem 'i18n-js', :git => 'git://github.com/fnando/i18n-js.git'
 gem 'irwi', :git => 'git://github.com/Programatica/irwi.git'
 gem 'json'
 gem 'jquery-rails'
+gem 'jwt', '~> 1.2.1'
 gem 'koala'
 gem 'dalli'
 gem 'mocha', :require => false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -730,6 +730,7 @@ DEPENDENCIES
   irwi!
   jquery-rails
   json
+  jwt (~> 1.2.1)
   koala
   machinist
   mobile-fu!
@@ -784,4 +785,4 @@ DEPENDENCIES
   yui-compressor
 
 BUNDLED WITH
-   1.10.6
+   1.11.2