From 6953e1ba68d194ff5fe6ff95ba51d732ced67865 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Tue, 27 May 2014 17:48:52 +0200 Subject: [PATCH] update dependencies and wip for green spec day tomorrow --- Gemfile | 4 ++-- Gemfile.lock | 62 ++++++++++++++++++++++++++-------------------------- wip.md | 35 +++++++++++++++++++++++++++-- 3 files changed, 66 insertions(+), 35 deletions(-) diff --git a/Gemfile b/Gemfile index af8fd368..4a6228ab 100644 --- a/Gemfile +++ b/Gemfile @@ -46,9 +46,9 @@ gem 'couchbase-structures', github: 'bterkuile/couchbase-structures' gem 'couch_potato' , github: 'bterkuile/couch_potato' gem 'simply_stored', path: './../components/simply_stored' #, github: 'bterkuile/simply_stored' -gem 'orm_adapter', github: 'bterkuile/orm_adapter' +#gem 'orm_adapter', github: 'bterkuile/orm_adapter' gem 'devise' #, '3.1.0' #, '2.0.4' -#gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored' +gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored' gem "omniauth-facebook" gem 'simple_form' gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator' diff --git a/Gemfile.lock b/Gemfile.lock index 9855102e..d386d556 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/bterkuile/couch_potato.git - revision: 7712a8d12c319f2e165733800795acbb599638d2 + revision: c84d3d8931505cfb3a6c25599e08a5d4b6975168 specs: couch_potato (0.7.1) activemodel @@ -17,20 +17,20 @@ GIT couchbase-settings (>= 0.1.0) GIT - remote: git://github.com/bterkuile/orm_adapter.git - revision: e0b5f652c8d1eda8c0f6636f3b3d17d598603450 + remote: git://github.com/bterkuile/devise_simply_stored.git + revision: 86f93782c607958e7f99a6fdbae5566e17047273 specs: - orm_adapter (0.4.0) + devise_simply_stored (0.3.0) + devise PATH remote: ./../cmtool specs: - cmtool (0.5.0) + cmtool (1.0.0) bourbon email_validator haml-rails jquery-rails - rails (>= 4.1.0) slim-rails tinymce-rails @@ -84,7 +84,7 @@ GEM barber (>= 0.4.1) emblem-source bcrypt (3.1.7) - bourbon (3.2.1) + bourbon (3.2.3) sass (~> 3.2) thor builder (3.2.2) @@ -124,7 +124,7 @@ GEM multi_json (~> 1.0) rest-client (~> 1.6.1) daemons (1.1.9) - database_cleaner (1.2.0) + database_cleaner (1.3.0) devise (3.2.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -143,15 +143,15 @@ GEM eventmachine (>= 1.0.0.beta.4) email_validator (1.4.0) activemodel - ember-data-source (0.14) + ember-data-source (1.0.0.beta.7) ember-source - ember-rails (0.14.1) + ember-rails (0.15.0) active_model_serializers barber (>= 0.4.1) - ember-data-source - ember-source + ember-data-source (>= 1.0.0.beta.5) + ember-source (>= 1.1.0) execjs (>= 1.2) - handlebars-source + handlebars-source (> 1.0.0) jquery-rails (>= 1.0.17) railties (>= 3.1) ember-source (1.5.1.1) @@ -181,14 +181,14 @@ GEM faye-websocket (0.7.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.3.1) - font-awesome-rails (4.0.3.2) + font-awesome-rails (4.1.0.0) railties (>= 3.2, < 5.0) foundation-rails (5.2.2.0) railties (>= 3.1.0) sass (>= 3.2.0) - fuubar (1.3.2) + fuubar (1.3.3) rspec (>= 2.14.0, < 3.1.0) - ruby-progressbar (~> 1.3) + ruby-progressbar (~> 1.4) gherkin (2.12.2) multi_json (~> 1.3) haml (4.0.5) @@ -208,12 +208,11 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) railties (>= 3.2.16) - js-routes (0.9.7) + js-routes (0.9.8) railties (>= 3.2) sprockets-rails json (1.8.1) - jwt (0.1.11) - multi_json (>= 1.5) + jwt (1.0.0) kaminari (0.15.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -229,16 +228,16 @@ GEM mime-types (1.25.1) mini_magick (3.7.0) subexec (~> 0.2.1) - mini_portile (0.5.3) - minitest (5.3.3) - multi_json (1.9.3) + mini_portile (0.6.0) + minitest (5.3.4) + multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) - oauth2 (0.9.3) + nokogiri (1.6.2.1) + mini_portile (= 0.6.0) + oauth2 (0.9.4) faraday (>= 0.8, < 0.10) - jwt (~> 0.1.8) + jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (~> 1.2) @@ -252,6 +251,7 @@ GEM multi_json (~> 1.3) oauth2 (~> 0.9.3) omniauth (~> 1.2) + orm_adapter (0.5.0) paperclip (3.5.2) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -285,7 +285,7 @@ GEM activesupport (= 4.1.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.3.1) + rake (10.3.2) rest-client (1.6.7) mime-types (>= 1.16) rqrcode (0.4.2) @@ -305,7 +305,7 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - ruby-progressbar (1.4.2) + ruby-progressbar (1.5.1) sass (3.2.19) sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) @@ -347,7 +347,7 @@ GEM thor (0.19.1) thread_safe (0.3.3) tilt (1.4.1) - tinymce-rails (4.0.19) + tinymce-rails (4.0.26) railties (>= 3.1.1) treetop (1.4.15) polyglot @@ -355,7 +355,7 @@ GEM turnip (1.2.1) gherkin (>= 2.5) rspec (>= 2.0, < 4.0) - tzinfo (1.1.0) + tzinfo (1.2.0) thread_safe (~> 0.1) uglifier (2.5.0) execjs (>= 0.3.0) @@ -382,6 +382,7 @@ DEPENDENCIES couchbase-structures! database_cleaner devise + devise_simply_stored! ember-rails ember-source emblem-rails @@ -399,7 +400,6 @@ DEPENDENCIES map mini_magick omniauth-facebook - orm_adapter! paperclip (= 3.5.2) pry-rails quiet_assets diff --git a/wip.md b/wip.md index 44464802..a9990921 100644 --- a/wip.md +++ b/wip.md @@ -1,10 +1,41 @@ -- suppliers +Release +------- + +- Supplier - user names in orders - better product listing with time of day in products overview - english emails - remove kassasysteem from emails - https://github.com/buytruckload/geonames_api - website call to actions + - Side menu + - Open shop button nice + - Close shop button nice + - Product category looks for foundation + - form action button looks (Roos) + - Dashboard + - buttons nice! + - Empty state + - Lists + - Add list link + - List + - Translate and prettify got to lists link helpers.links.index + - Settings + - html structure + - styling + - Event stream to ember? (After release!!!) + - remove invalid orders + +- User + - Add product info + - translate join table strings + - Add order plus button + - test met veel producten + - Old list adding per 20, not 2 + - lists#show goto list button better + - side menu cleaner -- users +Post release +------------ +noting so far