diff --git a/Gemfile b/Gemfile index 593b31db..e26b3096 100644 --- a/Gemfile +++ b/Gemfile @@ -37,17 +37,18 @@ group :assets do gem 'uglifier', '>= 1.0.3' - #gem 'ember-rails' + gem 'ember-rails' #gem 'ember-rails', path: '/home/benjamin/development/rails/components/ember-rails' - gem 'ember-rails', github: 'bterkuile/ember-rails' + #gem 'ember-rails', github: 'bterkuile/ember-rails' #gem 'ember-source', '~> 1.13.9' #gem 'emblem-rails' gem 'ember-validations-rails' - gem 'ember-emblem-template', github: 'bterkuile/ember-emblem-template' + gem 'ember-handlebars-template' + gem 'ember-emblem-template' #, github: 'bterkuile/ember-emblem-template' #gem 'ember-emblem-template', path: '/home/benjamin/development/rails/components/ember-emblem-template' - gem 'foundation-rails' #, github: 'bterkuile/foundation-rails' + gem 'foundation-rails', '~> 5.5' #, github: 'bterkuile/foundation-rails' gem 'ace-rails-ap' gem 'pickadate-rails' #gem 'mustache' #, require: 'mustache/railtie' @@ -61,8 +62,8 @@ end # gem 'couchbase-structures', github: 'bterkuile/couchbase-structures' gem 'couch_potato', '~> 1.4.0' #, github: 'bterkuile/couch_potato' -#gem 'simply_stored', path: './../components/simply_stored' #, github: 'bterkuile/simply_stored' -gem 'simply_stored', github: 'bterkuile/simply_stored' +gem 'simply_stored', path: '~/development/rails/components/simply_stored' #, github: 'bterkuile/simply_stored' +#gem 'simply_stored', github: 'bterkuile/simply_stored' #gem 'orm_adapter', github: 'bterkuile/orm_adapter' gem 'devise' #, github: 'plataformatec/devise', branch: 'lm-rails-4-2' #, '3.1.0' #, '2.0.4' gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored' @@ -112,7 +113,7 @@ group :development do gem 'faye' gem 'spring' gem 'spring-commands-rspec' - gem 'web-console', '~> 2.0.0' + #gem 'web-console', '~> 2.0.0' gem 'foreman' gem 'capistrano', require: false gem 'capistrano-bundler', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 56fa6d16..4cebebb3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,36 +21,15 @@ GIT devise_simply_stored (0.3.0) devise -GIT - remote: git://github.com/bterkuile/ember-emblem-template.git - revision: 22f657eaba09fa8992005a2e86d24c85306244e2 - specs: - ember-emblem-template (0.3.0) - barber (>= 0.9.0) - sprockets (>= 3.3, < 3.4) - -GIT - remote: git://github.com/bterkuile/ember-rails.git - revision: fd2008b3aed644892e5529267410a5875460405a - specs: - ember-rails (0.19.2) - active-model-adapter-source (>= 1.13.0) - ember-data-source (>= 1.13.0) - ember-handlebars-template (>= 0.1.1, < 1.0) - ember-source (>= 1.8.0) - jquery-rails (>= 1.0.17) - railties (>= 3.1) - GIT remote: git://github.com/bterkuile/jsonapi-serializers.git - revision: 55516761bec40a4f492003dffd3e18d575075b07 + revision: 3013ef89c7608f28f4ffc2581c4da69cffe4f84e specs: jsonapi-serializers (0.2.6) activesupport -GIT - remote: git://github.com/bterkuile/simply_stored.git - revision: 323c11efe7f86b3e156acfa7e53d8f06d8fb73c4 +PATH + remote: ~/development/rails/components/simply_stored specs: simply_stored (1.0.0) activesupport @@ -61,71 +40,80 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - ace-rails-ap (4.0.0) - actionmailer (4.2.4) - actionpack (= 4.2.4) - actionview (= 4.2.4) - activejob (= 4.2.4) + ace-rails-ap (4.0.2) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.4) - actionview (= 4.2.4) - activesupport (= 4.2.4) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.4) - activesupport (= 4.2.4) + actionview (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - active-model-adapter-source (2.0.1) + active-model-adapter-source (2.1.1) ember-data-source (>= 1.13, < 3.0) - active_attr (0.8.5) - activemodel (>= 3.0.2, < 5.0) - activesupport (>= 3.0.2, < 5.0) - active_decorator (0.5.3) - activejob (4.2.4) - activesupport (= 4.2.4) + active_attr (0.9.0) + activemodel (>= 3.0.2, < 5.1) + activesupport (>= 3.0.2, < 5.1) + active_decorator (0.7.1) + active_model_serializers (0.10.0) + actionpack (>= 4.0) + activemodel (>= 4.0) + railties (>= 4.0) + activejob (4.2.6) + activesupport (= 4.2.6) globalid (>= 0.3.0) - activemodel (4.2.4) - activesupport (= 4.2.4) + activemodel (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) - activerecord (4.2.4) - activemodel (= 4.2.4) - activesupport (= 4.2.4) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) arel (~> 6.0) - activesupport (4.2.4) + activesupport (4.2.6) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) - airbrussh (0.7.0) + addressable (2.4.0) + airbrussh (1.0.2) sshkit (>= 1.6.1, != 1.7.0) arel (6.0.3) - barber (0.9.2) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + barber (0.11.1) ember-source (>= 1.0, < 3) execjs (>= 1.2, < 3) - bcrypt (3.1.10) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) - bourbon (4.2.5) + bcrypt (3.1.11) + bourbon (4.2.7) sass (~> 3.4) thor (~> 0.19) builder (3.2.2) - cancancan (1.12.0) - capistrano (3.4.0) + cancancan (1.14.0) + capistrano (3.5.0) + airbrussh (>= 1.0.0) + capistrano-harrow i18n rake (>= 10.0.0) - sshkit (~> 1.3) + sshkit (>= 1.9.0) capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-rails (1.1.3) + capistrano-harrow (0.5.1) + capistrano-rails (1.1.6) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rvm (0.1.2) @@ -134,34 +122,33 @@ GEM capistrano3-puma (1.2.1) capistrano (~> 3.0) puma (>= 2.6) - capybara (2.5.0) + capybara (2.7.1) + addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.11) + capybara-screenshot (1.0.13) capybara (>= 1.0, < 3) launchy - celluloid (0.16.0) - timers (~> 4.0.0) - childprocess (0.5.6) + childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) - chunky_png (1.3.4) + chunky_png (1.3.5) climate_control (0.0.3) activesupport (>= 3.0) - cocaine (0.5.7) + cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) - coderay (1.1.0) - coffee-rails (4.1.0) + coderay (1.1.1) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0, < 5.1.x) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) - colorize (0.7.7) - cookiejar (0.3.2) + coffee-script-source (1.10.0) + concurrent-ruby (1.0.2) + cookiejar (0.3.0) couch_potato (1.4.0) activemodel couchrest (~> 1.2.0) @@ -170,51 +157,66 @@ GEM mime-types (>= 1.15) multi_json (~> 1.7, ~> 1.0) rest-client (~> 1.8.0) - crack (0.4.2) + crack (0.4.3) safe_yaml (~> 1.0.0) - debug_inspector (0.0.2) - devise (3.5.2) + devise (4.1.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 5.1) responders - thread_safe (~> 0.1) warden (~> 1.2.3) - devise-i18n (0.12.1) + devise-i18n (1.0.1) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.24) + domain_name (0.5.20160310) unf (>= 0.0.5, < 1.0.0) - em-http-request (1.1.2) + em-http-request (1.1.3) addressable (>= 2.3.4) - cookiejar + cookiejar (<= 0.3.0) em-socksify (>= 0.3) eventmachine (>= 1.0.3) http_parser.rb (>= 0.6.0) - em-socksify (0.3.0) + em-socksify (0.3.1) eventmachine (>= 1.0.0.beta.4) email_validator (1.6.0) activemodel - ember-data-source (2.0.1) - ember-source (>= 1.8, < 3.0) - ember-handlebars-template (0.4.1) - barber (>= 0.9.0) - sprockets (>= 3.3, < 3.4) - ember-source (2.0.2) + ember-cli-assets (0.0.32) + ember-data-source (2.5.3) + ember-source (>= 2, < 3.0) + ember-emblem-template (0.4.0) + ember-handlebars-template (~> 0.7.0) + sprockets-rails (~> 2.0) + ember-es6_template (0.4.4) + babel-transpiler (>= 0.6.0, < 0.8) + sprockets (>= 2.1, < 4) + ember-handlebars-template (0.7.4) + barber (>= 0.11.0) + sprockets (>= 3.3, < 4) + ember-rails (0.20.5) + active-model-adapter-source (>= 1.13.0) + active_model_serializers + ember-cli-assets (~> 0.0.1) + ember-data-source (>= 1.13.0) + ember-es6_template (~> 0.4.0) + ember-handlebars-template (>= 0.1.1, < 1.0) + ember-source (>= 1.8.0) + jquery-rails (>= 1.0.17) + railties (>= 3.1) + ember-source (2.5.1) ember-validations-rails (1.0.0) railties erubis (2.7.0) - eventmachine (1.0.8) - exception_notification (4.1.1) - actionmailer (>= 3.0.4) - activesupport (>= 3.0.4) - execjs (2.6.0) - factory_girl (4.5.0) + eventmachine (1.2.0.1) + exception_notification (4.1.4) + actionmailer (~> 4.0) + activesupport (~> 4.0) + execjs (2.7.0) + factory_girl (4.7.0) activesupport (>= 3.0.0) - factory_girl_rails (4.5.0) - factory_girl (~> 4.5.0) + factory_girl_rails (4.7.0) + factory_girl (~> 4.7.0) railties (>= 3.0.0) - faraday (0.9.1) + faraday (0.9.2) multipart-post (>= 1.2, < 3) faye (1.1.2) cookiejar (>= 0.3.0) @@ -224,15 +226,15 @@ GEM multi_json (>= 1.0.0) rack (>= 1.0.0) websocket-driver (>= 0.5.1) - faye-websocket (0.10.0) + faye-websocket (0.10.4) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) ffi (1.9.10) - font-awesome-rails (4.4.0.0) - railties (>= 3.2, < 5.0) - foreman (0.78.0) + font-awesome-rails (4.6.3.0) + railties (>= 3.2, < 5.1) + foreman (0.82.0) thor (~> 0.19.1) - foundation-rails (5.5.2.1) + foundation-rails (5.5.3.2) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) fuubar (2.0.0) @@ -242,71 +244,71 @@ GEM multi_json (~> 1.3) globalid (0.3.6) activesupport (>= 4.1.0) - hashie (3.4.2) - hitimes (1.2.3) + hashdiff (0.3.0) + hashie (3.4.4) http-cookie (1.0.2) domain_name (~> 0.5) http_parser.rb (0.6.0) i18n (0.7.0) - iso_country_codes (0.7.1) - jquery-rails (4.0.5) - rails-dom-testing (~> 1.0) + iso_country_codes (0.7.5) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - js-routes (1.1.2) + js-routes (1.2.5) railties (>= 3.2) sprockets-rails json (1.8.3) jwt (1.5.1) - kaminari (0.16.3) + kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) launchy (2.4.3) addressable (~> 2.3) letter_opener (1.4.1) launchy (~> 2.2) - libv8 (3.16.14.11) + libv8 (3.16.14.15) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.4) + mime-types (>= 1.16, < 4) method_source (0.8.2) - mime-types (2.6.2) + mime-types (2.99.2) mimemagic (0.3.0) - mini_magick (4.3.3) - mini_portile (0.6.2) - minitest (5.8.1) - multi_json (1.11.2) + mini_magick (4.5.1) + mini_portile2 (2.0.0) + minitest (5.9.0) + multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) naught (1.1.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) - netrc (0.10.3) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - oauth2 (1.0.0) + net-ssh (3.1.1) + netrc (0.11.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + oauth2 (1.1.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0) + jwt (~> 1.0, < 1.5.2) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) - omniauth (1.2.2) + rack (>= 1.2, < 3) + omniauth (1.3.1) hashie (>= 1.2, < 4) - rack (~> 1.0) - omniauth-facebook (2.0.1) + rack (>= 1.0, < 3) + omniauth-facebook (3.0.0) omniauth-oauth2 (~> 1.2) - omniauth-instagram (1.0.1) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) - omniauth-oauth2 (1.3.1) + omniauth-instagram (1.0.2) + omniauth (~> 1) + omniauth-oauth2 (~> 1) + omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) orm_adapter (0.5.0) - paperclip (4.3.1) + paperclip (4.3.6) activemodel (>= 3.2.0) activesupport (>= 3.2.0) cocaine (~> 0.5.5) @@ -314,7 +316,7 @@ GEM mimemagic (= 0.3.0) pickadate-rails (3.5.6.0) railties (>= 3.1.0) - pry (0.10.1) + pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) @@ -323,95 +325,94 @@ GEM yard (~> 0.8) pry-rails (0.3.4) pry (>= 0.9.10) - puma (2.13.4) + puma (3.4.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.4) rack-cors (0.4.0) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.4) - actionmailer (= 4.2.4) - actionpack (= 4.2.4) - actionview (= 4.2.4) - activejob (= 4.2.4) - activemodel (= 4.2.4) - activerecord (= 4.2.4) - activesupport (= 4.2.4) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.4) + railties (= 4.2.6) sprockets-rails - rails-assets-ember-qunit (0.4.11) - rails-assets-qunit (1.19.0) + rails-assets-ember-qunit (0.4.20) + rails-assets-qunit (1.23.1) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.7) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.4) - actionpack (= 4.2.4) - activesupport (= 4.2.4) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) + rake (11.1.2) ref (2.0.0) - responders (2.1.0) - railties (>= 4.2.0, < 5) + responders (2.2.0) + railties (>= 4.2.0, < 5.1) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rqrcode (0.7.0) - chunky_png - rspec (3.3.0) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-core (3.3.2) - rspec-support (~> 3.3.0) - rspec-expectations (3.3.1) + rqrcode (0.10.1) + chunky_png (~> 1.0) + rspec (3.4.0) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-core (3.4.4) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) + rspec-support (~> 3.4.0) rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.3.2) + rspec-mocks (3.4.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-rails (3.3.3) + rspec-support (~> 3.4.0) + rspec-rails (3.4.2) actionpack (>= 3.0, < 4.3) activesupport (>= 3.0, < 4.3) railties (>= 3.0, < 4.3) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-support (~> 3.3.0) - rspec-support (3.3.0) - ruby-progressbar (1.7.5) - rubyzip (1.1.7) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) + ruby-progressbar (1.8.1) + rubyzip (1.2.0) safe_yaml (1.0.4) - sass (3.4.18) + sass (3.4.22) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - selenium-webdriver (2.47.1) + selenium-webdriver (2.53.0) childprocess (~> 0.5) - multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0) - simplecov (0.10.0) + simplecov (0.11.2) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - slim (3.0.6) - temple (~> 0.7.3) + slim (3.0.7) + temple (~> 0.7.6) tilt (>= 1.3.3, < 2.1) slim-rails (3.0.1) actionmailer (>= 3.1, < 5.0) @@ -420,58 +421,51 @@ GEM railties (>= 3.1, < 5.0) slim (~> 3.0) slop (3.6.0) - spring (1.4.0) + spring (1.7.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.3.4) - rack (~> 1.0) + sprockets (3.6.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sshkit (1.7.1) - colorize (>= 0.7.0) + sshkit (1.10.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - sucker_punch (1.5.1) - celluloid (= 0.16.0) - temple (0.7.6) - test_squad (0.0.1) + sucker_punch (2.0.2) + concurrent-ruby (~> 1.0.0) + temple (0.7.7) + test_squad (0.1.2) rails therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref thor (0.19.1) thread_safe (0.3.5) - tilt (2.0.1) - timecop (0.8.0) - timers (4.0.4) - hitimes - tinymce-rails (4.2.5) + tilt (2.0.4) + timecop (0.8.1) + tinymce-rails (4.3.12) railties (>= 3.1.1) - turnip (1.3.1) - gherkin (>= 2.5) - rspec (>= 2.14.0, < 4.0) + turnip (2.1.0) + gherkin (~> 2.5) + rspec (>= 3.0, < 4.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) - warden (1.2.3) + unf_ext (0.0.7.2) + warden (1.2.6) rack (>= 1.0) - web-console (2.0.0) - activemodel (~> 4.0) - binding_of_caller (>= 0.7.2) - railties (~> 4.0) - sprockets-rails (>= 2.0, < 4.0) - webmock (1.21.0) + webmock (2.0.3) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket (1.2.2) - websocket-driver (0.6.2) + hashdiff + websocket (1.2.3) + websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) xpath (2.0.0) @@ -500,15 +494,16 @@ DEPENDENCIES devise devise-i18n devise_simply_stored! - ember-emblem-template! - ember-rails! + ember-emblem-template + ember-handlebars-template + ember-rails ember-validations-rails exception_notification factory_girl_rails faye font-awesome-rails foreman - foundation-rails + foundation-rails (~> 5.5) fuubar iso_country_codes jquery-rails @@ -548,5 +543,7 @@ DEPENDENCIES timecop turnip uglifier (>= 1.0.3) - web-console (~> 2.0.0) webmock + +BUNDLED WITH + 1.12.3 diff --git a/app/assets/javascripts/shared-ember-helpers/currency.js.coffee b/app/assets/javascripts/shared-ember-helpers/currency.js.coffee index cb9ba2a2..d17241e5 100644 --- a/app/assets/javascripts/shared-ember-helpers/currency.js.coffee +++ b/app/assets/javascripts/shared-ember-helpers/currency.js.coffee @@ -1,4 +1,4 @@ App.CurrencyHelper = Ember.Helper.helper (params, options)-> amount = params[0] amount = 0.0 if isNaN(amount) || amount== '' || amount == null - new Handlebars.SafeString('€ ' + parseFloat(amount).toFixed(2)) + "€ #{parseFloat(amount).toFixed(2)}".htmlSafe() diff --git a/app/assets/javascripts/shared-ember-helpers/image_tag.js.coffee b/app/assets/javascripts/shared-ember-helpers/image_tag.js.coffee index 210ee729..150b18a8 100644 --- a/app/assets/javascripts/shared-ember-helpers/image_tag.js.coffee +++ b/app/assets/javascripts/shared-ember-helpers/image_tag.js.coffee @@ -5,4 +5,4 @@ App.ImageTagHelper = Ember.Helper.helper (params, options)-> extra_attributes = '' extra_attributes += " width=\"#{options.width}\"" if options.width extra_attributes += " height=\"#{options.height}\"" if options.height - new Handlebars.SafeString "\"#{alt}\"" + "\"#{alt}\"".htmlSafe() diff --git a/app/assets/javascripts/shared-ember-helpers/state.js.coffee b/app/assets/javascripts/shared-ember-helpers/state.js.coffee index ed47d83a..6682337d 100644 --- a/app/assets/javascripts/shared-ember-helpers/state.js.coffee +++ b/app/assets/javascripts/shared-ember-helpers/state.js.coffee @@ -1,4 +1,4 @@ App.StateHelper = Ember.Helper.helper (params, options)-> [subject, state] = params path = "state.#{subject}.#{state}" - new Handlebars.SafeString("#{t(path)}") + "#{t(path)}".htmlSafe() diff --git a/app/assets/javascripts/shared-ember-helpers/time.js.coffee b/app/assets/javascripts/shared-ember-helpers/time.js.coffee index 48bef8c6..0d37e0a0 100644 --- a/app/assets/javascripts/shared-ember-helpers/time.js.coffee +++ b/app/assets/javascripts/shared-ember-helpers/time.js.coffee @@ -7,4 +7,4 @@ App.TimeHelper = Ember.Helper.helper (params, options)-> else format_string = '' tag = if options.bare then iso else $("").text(moment(iso).format(options.format || 'dd D MMM hh:mm')).get(0).outerHTML - new Handlebars.SafeString tag + tag.htmlSafe() diff --git a/app/assets/javascripts/shared-ember-helpers/version.coffee b/app/assets/javascripts/shared-ember-helpers/version.coffee index 6a966f4f..b2a5ead8 100644 --- a/app/assets/javascripts/shared-ember-helpers/version.coffee +++ b/app/assets/javascripts/shared-ember-helpers/version.coffee @@ -1,2 +1,2 @@ App.VersionHelper = Ember.Helper.helper (params, options)-> - new Handlebars.SafeString $app_version + String($app_version).htmlSafe() diff --git a/app/assets/javascripts/supplier/app/components/form/boolean-button.js.coffee b/app/assets/javascripts/supplier/app/components/form/boolean-button.js.coffee index 0220615f..0d350b97 100644 --- a/app/assets/javascripts/supplier/app/components/form/boolean-button.js.coffee +++ b/app/assets/javascripts/supplier/app/components/form/boolean-button.js.coffee @@ -8,7 +8,7 @@ App.BooleanButtonComponent = Ember.Component.extend text: Ember.computed 'text_path', -> return unless text_path = @get('text_path') - new Ember.Handlebars.SafeString(tspan(text_path)) + tspan(text_path).htmlSafe() active: Ember.computed 'value', -> if @reverse then !@get('value') else !!@get('value') diff --git a/app/assets/javascripts/supplier/app/components/menu-time-preview.js.coffee b/app/assets/javascripts/supplier/app/components/menu-time-preview.js.coffee index fdb09fc5..3454971e 100644 --- a/app/assets/javascripts/supplier/app/components/menu-time-preview.js.coffee +++ b/app/assets/javascripts/supplier/app/components/menu-time-preview.js.coffee @@ -21,14 +21,13 @@ App.MenuTimePreviewComponent = Ember.Component.extend @set 'preview_full_day', true @set 'active', false @set 'collapsed', true - daysContent: (-> + daysContent: (-> $days.map( (d) -> Ember.Object.create( name: d, text: t("date.day_name.#{d}")) ) ).property() preview_day_text: (-> return "" unless day = @get('preview_day.text') #day_text = tspan("date.day_name.#{day.get('name')}") - tag = "

#{day}

" - new Ember.Handlebars.SafeString(tag) + "

#{day}

".htmlSafe() ).property('preview_day') preview_time_text: (-> @@ -38,7 +37,7 @@ App.MenuTimePreviewComponent = Ember.Component.extend minute = Math.floor(day_minute%60) hour = "0#{hour}".substr(-2,2) minute = "0#{minute}".substr(-2,2) - new Ember.Handlebars.SafeString("#{hour}:#{minute}") + "#{hour}:#{minute}".htmlSafe() ).property('preview_full_day', 'preview_minute_of_day') hasSelection: (-> return true if @get('preview_day') diff --git a/app/assets/javascripts/supplier/app/models/product_category.js.coffee b/app/assets/javascripts/supplier/app/models/product_category.js.coffee index fbf61157..22878f26 100644 --- a/app/assets/javascripts/supplier/app/models/product_category.js.coffee +++ b/app/assets/javascripts/supplier/app/models/product_category.js.coffee @@ -25,7 +25,7 @@ App.ProductCategory = DS.Model.extend Ember.Validations.Mixin, result += "#{active_days.map((day) -> tspan("date.day_name.#{day}")).join(", ")} " unless @get('full_day') result += "#{day_minutes_to_time @get('start_from')} - #{day_minutes_to_time @get('end_on')}" - new Ember.Handlebars.SafeString result + result.htmlSafe() validations: name: {presence: true} diff --git a/app/assets/javascripts/user/app/controllers/modals/base_controller.js.coffee b/app/assets/javascripts/user/app/controllers/modals/base_controller.js.coffee index 3a44d1da..9c4a3a55 100644 --- a/app/assets/javascripts/user/app/controllers/modals/base_controller.js.coffee +++ b/app/assets/javascripts/user/app/controllers/modals/base_controller.js.coffee @@ -8,14 +8,14 @@ translation_params = {} if model = @get('model') translation_params = model.serialize() if model.serialize - return new Ember.Handlebars.SafeString(tspan(@title_path, translation_params)) if @title_path + return tspan(@title_path, translation_params).htmlSafe() if @title_path # return translated title_path if directly set by options - return new Ember.Handlebars.SafeString(tspan(@get('modal_options.title_path'), translation_params)) if @get('modal_options.title_path') + return tspan(@get('modal_options.title_path'), translation_params).htmlSafe() if @get('modal_options.title_path') # infer title path based on controller name App.modals.AddSectionController => add_section underscored = `this.constructor.toString().substr(11).replace(/Controller$/, '').underscore()` # find translated title or humanize the controller name if convention_translation = ttry("modal.#{underscored}.title", translation_params) - new Ember.Handlebars.SafeString(tspan(@get("modal.#{underscored}.title"), translation_params)) + tspan(@get("modal.#{underscored}.title"), translation_params).htmlSafe() else underscored.capitalize().replace(/_/, ' ') ).property('model.id') diff --git a/app/models/product.rb b/app/models/product.rb index 473c740d..63417582 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -13,6 +13,7 @@ class Product belongs_to :product_category #has_and_belongs_to_many :product_categories, storing_keys: false + has_and_belongs_to_many :product_labels, storing_keys: false belongs_to :supplier # direct! category is an aid has_many :product_orders has_many :product_variants, dependent: :destroy diff --git a/app/models/product_label.rb b/app/models/product_label.rb new file mode 100644 index 00000000..55a45166 --- /dev/null +++ b/app/models/product_label.rb @@ -0,0 +1,9 @@ +class ProductLabel + include SimplyStored::Couch + include ActiveModel::SerializerSupport + + property :name + + belongs_to :supplier + has_and_belongs_to_many :products, storing_keys: false +end diff --git a/app/views/pages/404.gif b/app/views/pages/404.gif new file mode 100644 index 00000000..4625429d Binary files /dev/null and b/app/views/pages/404.gif differ diff --git a/app/views/pages/contact.html.slim b/app/views/pages/contact.html.slim index 6a141ca1..50ce34e7 100644 --- a/app/views/pages/contact.html.slim +++ b/app/views/pages/contact.html.slim @@ -16,5 +16,5 @@ .large-8.columns.end= f.email_field :email .row .large-12.columns - = f.submit t('website.contact_form.send_button'), class: 'button' + = f.submit t('contact_form.send_button'), class: 'button' .large-3.columns== @page.sidebar diff --git a/config/locales/website.nl.yml b/config/locales/website.nl.yml index f27831b8..c782612c 100644 --- a/config/locales/website.nl.yml +++ b/config/locales/website.nl.yml @@ -1,5 +1,4 @@ nl: - website: - contact_form: - submitted: You successfully submitted the contact form - send_button: Verstuur + contact_form: + submitted: You successfully submitted the contact form + send_button: Verstuur diff --git a/drb_counter/Dockerfile b/drb_counter/Dockerfile index ee43ddf2..a13c0178 100644 --- a/drb_counter/Dockerfile +++ b/drb_counter/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.2.0 +FROM ruby:2.3.0-slim # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 @@ -20,7 +20,7 @@ COPY Gemfile.lock /usr/src/app/ #COPY vendor/cache /usr/src/app/vendor/cache #RUN bundle install --local RUN rm -rf /usr/src/app/.bundle -RUN bundle install +#RUN bundle install COPY . /usr/src/app diff --git a/drb_counter/Gemfile b/drb_counter/Gemfile index 0ef2abef..ea5b79cb 100644 --- a/drb_counter/Gemfile +++ b/drb_counter/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' -gem "couchrest" -gem "pry" +#gem "couchrest" +#gem "pry" diff --git a/drb_counter/drb_counter.rb b/drb_counter/drb_counter.rb index 84edb967..6b63f9f1 100755 --- a/drb_counter/drb_counter.rb +++ b/drb_counter/drb_counter.rb @@ -2,7 +2,7 @@ # Make drb server require 'rubygems' require 'drb' -require 'pry' +#require 'pry' #require File.expand_path('../lib/in_memory_q_counter', File.dirname(__FILE__)) # This is a non thread safe replacement for the # couchbase counter mechanism since every test needs @@ -106,5 +106,5 @@ class InMemoryQCounter end drb_port = 9022 environment = (%w[production staging development test] & ARGV).first || 'development' -DRb.start_service "druby://:#{drb_port}", InMemoryQCounter.new(reload_stats: true, environment: environment) +DRb.start_service "druby://:#{drb_port}", InMemoryQCounter.new(reload_stats: false, environment: environment) DRb.thread.join diff --git a/wip.md b/wip.md index 51a3008f..c2f8f0fb 100644 --- a/wip.md +++ b/wip.md @@ -1,6 +1,12 @@ Release ======= +Fast notes after upgrade 2016-06-01 +------------------------------------ +* Sorting products does not work +* my-schedule is broken + + Release todos: -------------- - Printer paperclip 5 minute setup story @@ -11,9 +17,12 @@ Release todos: - User move table alert flash_message for suppliers - User app authorizations - identity +- Add app-store link to android on android phones, and to ios store for + ios devices Supplier -------- +- Implement product labels - Test new product_category creation - Better message when signing up and already logged in, give link to go to current supplier!!!