bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update dependencies and wip for green spec day tomorrow

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-05-27 17:48:52 +02:00
parent 055a1071db
commit 6953e1ba68
3 changed files with 66 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+2 -2
View File
@@ -46,9 +46,9 @@ gem 'couchbase-structures', github: 'bterkuile/couchbase-structures'
gem 'couch_potato' , github: 'bterkuile/couch_potato' gem 'couch_potato' , github: 'bterkuile/couch_potato'
gem 'simply_stored', path: './../components/simply_stored' #, github: 'bterkuile/simply_stored' 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' #, '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 "omniauth-facebook"
gem 'simple_form' gem 'simple_form'
gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator' gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
Gemfile.lock
+31 -31
View File
@@ -1,6 +1,6 @@
GIT GIT
remote: git://github.com/bterkuile/couch_potato.git remote: git://github.com/bterkuile/couch_potato.git
revision: 7712a8d12c319f2e165733800795acbb599638d2 revision: c84d3d8931505cfb3a6c25599e08a5d4b6975168
specs: specs:
couch_potato (0.7.1) couch_potato (0.7.1)
activemodel activemodel
@@ -17,20 +17,20 @@ GIT
couchbase-settings (>= 0.1.0) couchbase-settings (>= 0.1.0)
GIT GIT
remote: git://github.com/bterkuile/orm_adapter.git remote: git://github.com/bterkuile/devise_simply_stored.git
revision: e0b5f652c8d1eda8c0f6636f3b3d17d598603450 revision: 86f93782c607958e7f99a6fdbae5566e17047273
specs: specs:
orm_adapter (0.4.0) devise_simply_stored (0.3.0)
devise
PATH PATH
remote: ./../cmtool remote: ./../cmtool
specs: specs:
cmtool (0.5.0) cmtool (1.0.0)
bourbon bourbon
email_validator email_validator
haml-rails haml-rails
jquery-rails jquery-rails
rails (>= 4.1.0)
slim-rails slim-rails
tinymce-rails tinymce-rails
@@ -84,7 +84,7 @@ GEM
barber (>= 0.4.1) barber (>= 0.4.1)
emblem-source emblem-source
bcrypt (3.1.7) bcrypt (3.1.7)
bourbon (3.2.1) bourbon (3.2.3)
sass (~> 3.2) sass (~> 3.2)
thor thor
builder (3.2.2) builder (3.2.2)
@@ -124,7 +124,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rest-client (~> 1.6.1) rest-client (~> 1.6.1)
daemons (1.1.9) daemons (1.1.9)
database_cleaner (1.2.0) database_cleaner (1.3.0)
devise (3.2.4) devise (3.2.4)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
@@ -143,15 +143,15 @@ GEM
eventmachine (>= 1.0.0.beta.4) eventmachine (>= 1.0.0.beta.4)
email_validator (1.4.0) email_validator (1.4.0)
activemodel activemodel
ember-data-source (0.14) ember-data-source (1.0.0.beta.7)
ember-source ember-source
ember-rails (0.14.1) ember-rails (0.15.0)
active_model_serializers active_model_serializers
barber (>= 0.4.1) barber (>= 0.4.1)
ember-data-source ember-data-source (>= 1.0.0.beta.5)
ember-source ember-source (>= 1.1.0)
execjs (>= 1.2) execjs (>= 1.2)
handlebars-source handlebars-source (> 1.0.0)
jquery-rails (>= 1.0.17) jquery-rails (>= 1.0.17)
railties (>= 3.1) railties (>= 3.1)
ember-source (1.5.1.1) ember-source (1.5.1.1)
@@ -181,14 +181,14 @@ GEM
faye-websocket (0.7.3) faye-websocket (0.7.3)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
websocket-driver (>= 0.3.1) websocket-driver (>= 0.3.1)
font-awesome-rails (4.0.3.2) font-awesome-rails (4.1.0.0)
railties (>= 3.2, < 5.0) railties (>= 3.2, < 5.0)
foundation-rails (5.2.2.0) foundation-rails (5.2.2.0)
railties (>= 3.1.0) railties (>= 3.1.0)
sass (>= 3.2.0) sass (>= 3.2.0)
fuubar (1.3.2) fuubar (1.3.3)
rspec (>= 2.14.0, < 3.1.0) rspec (>= 2.14.0, < 3.1.0)
ruby-progressbar (~> 1.3) ruby-progressbar (~> 1.4)
gherkin (2.12.2) gherkin (2.12.2)
multi_json (~> 1.3) multi_json (~> 1.3)
haml (4.0.5) haml (4.0.5)
@@ -208,12 +208,11 @@ GEM
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (4.2.1) jquery-ui-rails (4.2.1)
railties (>= 3.2.16) railties (>= 3.2.16)
js-routes (0.9.7) js-routes (0.9.8)
railties (>= 3.2) railties (>= 3.2)
sprockets-rails sprockets-rails
json (1.8.1) json (1.8.1)
jwt (0.1.11) jwt (1.0.0)
multi_json (>= 1.5)
kaminari (0.15.1) kaminari (0.15.1)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@@ -229,16 +228,16 @@ GEM
mime-types (1.25.1) mime-types (1.25.1)
mini_magick (3.7.0) mini_magick (3.7.0)
subexec (~> 0.2.1) subexec (~> 0.2.1)
mini_portile (0.5.3) mini_portile (0.6.0)
minitest (5.3.3) minitest (5.3.4)
multi_json (1.9.3) multi_json (1.10.1)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
nokogiri (1.6.1) nokogiri (1.6.2.1)
mini_portile (~> 0.5.0) mini_portile (= 0.6.0)
oauth2 (0.9.3) oauth2 (0.9.4)
faraday (>= 0.8, < 0.10) faraday (>= 0.8, < 0.10)
jwt (~> 0.1.8) jwt (~> 1.0)
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (~> 1.2) rack (~> 1.2)
@@ -252,6 +251,7 @@ GEM
multi_json (~> 1.3) multi_json (~> 1.3)
oauth2 (~> 0.9.3) oauth2 (~> 0.9.3)
omniauth (~> 1.2) omniauth (~> 1.2)
orm_adapter (0.5.0)
paperclip (3.5.2) paperclip (3.5.2)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@@ -285,7 +285,7 @@ GEM
activesupport (= 4.1.0) activesupport (= 4.1.0)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.1) rake (10.3.2)
rest-client (1.6.7) rest-client (1.6.7)
mime-types (>= 1.16) mime-types (>= 1.16)
rqrcode (0.4.2) rqrcode (0.4.2)
@@ -305,7 +305,7 @@ GEM
rspec-core (~> 2.14.0) rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0) rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0) rspec-mocks (~> 2.14.0)
ruby-progressbar (1.4.2) ruby-progressbar (1.5.1)
sass (3.2.19) sass (3.2.19)
sass-rails (4.0.3) sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
@@ -347,7 +347,7 @@ GEM
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.3) thread_safe (0.3.3)
tilt (1.4.1) tilt (1.4.1)
tinymce-rails (4.0.19) tinymce-rails (4.0.26)
railties (>= 3.1.1) railties (>= 3.1.1)
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
@@ -355,7 +355,7 @@ GEM
turnip (1.2.1) turnip (1.2.1)
gherkin (>= 2.5) gherkin (>= 2.5)
rspec (>= 2.0, < 4.0) rspec (>= 2.0, < 4.0)
tzinfo (1.1.0) tzinfo (1.2.0)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.5.0) uglifier (2.5.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
@@ -382,6 +382,7 @@ DEPENDENCIES
couchbase-structures! couchbase-structures!
database_cleaner database_cleaner
devise devise
devise_simply_stored!
ember-rails ember-rails
ember-source ember-source
emblem-rails emblem-rails
@@ -399,7 +400,6 @@ DEPENDENCIES
map map
mini_magick mini_magick
omniauth-facebook omniauth-facebook
orm_adapter!
paperclip (= 3.5.2) paperclip (= 3.5.2)
pry-rails pry-rails
quiet_assets quiet_assets
wip.md
+33 -2
View File
@@ -1,10 +1,41 @@
- suppliers Release
-------
- Supplier
- user names in orders - user names in orders
- better product listing with time of day in products overview - better product listing with time of day in products overview
- english emails - english emails
- remove kassasysteem from emails - remove kassasysteem from emails
- https://github.com/buytruckload/geonames_api - https://github.com/buytruckload/geonames_api
- website call to actions - 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