intermediate commit
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
source 'https://rails-assets.org'
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '4.2.0'
|
||||
gem 'rails', '~> 4.2.3'
|
||||
gem 'rack-cors', require: 'rack/cors'
|
||||
|
||||
# Bundle edge Rails instead:
|
||||
@@ -18,10 +18,7 @@ gem 'active_model_serializers', '0.9.0' # explicitly outside assets
|
||||
group :assets do
|
||||
gem 'jquery-rails'
|
||||
gem 'jquery-ui-rails'
|
||||
gem 'ember-source', '1.8.1'#, github: 'emberjs/ember.js', require: 'ember/source'
|
||||
gem 'ember-rails'
|
||||
gem 'ember_script-rails', github: 'ghempton/ember-script-rails'
|
||||
gem 'sass-rails', '~> 5.0.0'
|
||||
gem 'sass-rails' #, '~> 5.0.0'
|
||||
gem 'coffee-rails' #, '~> 3.2.1'
|
||||
#gem 'twitter-bootstrap-rails'
|
||||
# Only for mobile assets precompile, not used in this project
|
||||
@@ -36,13 +33,16 @@ group :assets do
|
||||
#gem 'therubyracer', platforms: :ruby
|
||||
|
||||
gem 'uglifier', '>= 1.0.3'
|
||||
#gem "emblem-source", github: "machty/emblem.js"
|
||||
gem 'emblem-source', '0.3.18'
|
||||
|
||||
gem 'ember-rails'
|
||||
gem 'ember-source', '~> 1.13.0'
|
||||
gem 'emblem-rails'
|
||||
gem 'ember-validations-rails'
|
||||
gem 'ember-emblem-template'
|
||||
|
||||
gem 'foundation-rails' #, github: 'bterkuile/foundation-rails'
|
||||
gem 'ace-rails-ap'
|
||||
gem 'pickadate-rails'
|
||||
#gem 'mustache' #, require: 'mustache/railtie'
|
||||
end
|
||||
|
||||
@@ -65,7 +65,7 @@ gem "omniauth-instagram"
|
||||
#gem 'simple_form'
|
||||
gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
|
||||
#gem 'cmtool', github: 'bterkuile/cmtool'
|
||||
gem 'paperclip' #, '3.5.2' # cmtool
|
||||
gem 'paperclip', ['>= 4.2.4', '!= 4.3.0'] #, '3.5.2' # cmtool
|
||||
#gem 'cmtool', path: './../cmtool'
|
||||
gem 'cmtool', github: 'bterkuile/cmtool'
|
||||
gem 'kaminari'
|
||||
|
||||
+140
-147
@@ -1,12 +1,16 @@
|
||||
GIT
|
||||
remote: git://github.com/bterkuile/cmtool.git
|
||||
revision: 1b82ab178409684e504e70b6403bc4eb8425c432
|
||||
revision: 49b61a502624b00aaf3a96c0bd43085ef9f85d75
|
||||
specs:
|
||||
cmtool (1.0.0)
|
||||
ace-rails-ap
|
||||
bourbon
|
||||
email_validator
|
||||
font-awesome-rails
|
||||
foundation-rails
|
||||
jquery-rails
|
||||
paperclip
|
||||
pickadate-rails
|
||||
slim-rails
|
||||
tinymce-rails
|
||||
|
||||
@@ -26,79 +30,72 @@ GIT
|
||||
couch_potato (>= 0.2.15)
|
||||
rest-client (>= 1.4.2)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/ghempton/ember-script-rails.git
|
||||
revision: 9a1f09b0c53bf51c37c35490cc76cd7dfe461234
|
||||
specs:
|
||||
ember_script-rails (0.0.3)
|
||||
ember_script (>= 0.0.4)
|
||||
rails
|
||||
|
||||
GEM
|
||||
remote: https://rails-assets.org/
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
ace-rails-ap (3.0.2)
|
||||
actionmailer (4.2.0)
|
||||
actionpack (= 4.2.0)
|
||||
actionview (= 4.2.0)
|
||||
activejob (= 4.2.0)
|
||||
ace-rails-ap (3.0.3)
|
||||
actionmailer (4.2.3)
|
||||
actionpack (= 4.2.3)
|
||||
actionview (= 4.2.3)
|
||||
activejob (= 4.2.3)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.0)
|
||||
actionview (= 4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
rack (~> 1.6.0)
|
||||
actionpack (4.2.3)
|
||||
actionview (= 4.2.3)
|
||||
activesupport (= 4.2.3)
|
||||
rack (~> 1.6)
|
||||
rack-test (~> 0.6.2)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||
actionview (4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionview (4.2.3)
|
||||
activesupport (= 4.2.3)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
active-model-adapter-source (1.13.4)
|
||||
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.1)
|
||||
active_decorator (0.5.3)
|
||||
active_model_serializers (0.9.0)
|
||||
activemodel (>= 3.2)
|
||||
activejob (4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
activejob (4.2.3)
|
||||
activesupport (= 4.2.3)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
activemodel (4.2.3)
|
||||
activesupport (= 4.2.3)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.0)
|
||||
activemodel (= 4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
activerecord (4.2.3)
|
||||
activemodel (= 4.2.3)
|
||||
activesupport (= 4.2.3)
|
||||
arel (~> 6.0)
|
||||
activesupport (4.2.0)
|
||||
activesupport (4.2.3)
|
||||
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.7)
|
||||
airbrussh (0.4.1)
|
||||
addressable (2.3.8)
|
||||
airbrussh (0.6.0)
|
||||
sshkit (>= 1.6.1, != 1.7.0)
|
||||
arel (6.0.0)
|
||||
barber (0.6.0)
|
||||
ember-source
|
||||
execjs
|
||||
handlebars-source (>= 1.0.0.rc.4)
|
||||
arel (6.0.2)
|
||||
barber (0.9.1)
|
||||
ember-source (>= 1.0, < 2)
|
||||
execjs (>= 1.2, < 3)
|
||||
barber-emblem (0.1.2)
|
||||
barber (>= 0.4.1)
|
||||
emblem-source
|
||||
bcrypt (3.1.10)
|
||||
binding_of_caller (0.7.2)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bourbon (4.2.2)
|
||||
bourbon (4.2.3)
|
||||
sass (~> 3.4)
|
||||
thor
|
||||
builder (3.2.2)
|
||||
cancancan (1.10.1)
|
||||
cancancan (1.12.0)
|
||||
capistrano (3.4.0)
|
||||
i18n
|
||||
rake (>= 10.0.0)
|
||||
@@ -106,13 +103,13 @@ GEM
|
||||
capistrano-bundler (1.1.4)
|
||||
capistrano (~> 3.1)
|
||||
sshkit (~> 1.2)
|
||||
capistrano-rails (1.1.2)
|
||||
capistrano-rails (1.1.3)
|
||||
capistrano (~> 3.1)
|
||||
capistrano-bundler (~> 1.1)
|
||||
capistrano-rvm (0.1.2)
|
||||
capistrano (~> 3.0)
|
||||
sshkit (~> 1.2)
|
||||
capistrano3-puma (1.0.0)
|
||||
capistrano3-puma (1.1.0)
|
||||
capistrano (~> 3.0)
|
||||
puma (>= 2.6)
|
||||
capybara (2.4.4)
|
||||
@@ -121,14 +118,14 @@ GEM
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
capybara-screenshot (1.0.5)
|
||||
capybara-screenshot (1.0.10)
|
||||
capybara (>= 1.0, < 3)
|
||||
colored
|
||||
launchy
|
||||
celluloid (0.16.0)
|
||||
timers (~> 4.0.0)
|
||||
childprocess (0.5.6)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
chunky_png (1.3.4)
|
||||
climate_control (0.0.3)
|
||||
activesupport (>= 3.0)
|
||||
cocaine (0.5.7)
|
||||
@@ -137,11 +134,10 @@ GEM
|
||||
coffee-rails (4.1.0)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
coffee-script (2.3.0)
|
||||
coffee-script (2.4.1)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.9.1)
|
||||
colored (1.2)
|
||||
coffee-script-source (1.9.1.1)
|
||||
colorize (0.7.7)
|
||||
cookiejar (0.3.2)
|
||||
couch_potato (1.4.0)
|
||||
@@ -155,19 +151,18 @@ GEM
|
||||
crack (0.4.2)
|
||||
safe_yaml (~> 1.0.0)
|
||||
debug_inspector (0.0.2)
|
||||
devise (3.4.1)
|
||||
devise (3.5.1)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
responders
|
||||
thread_safe (~> 0.1)
|
||||
warden (~> 1.2.3)
|
||||
devise-i18n (0.11.4)
|
||||
devise-i18n (0.12.1)
|
||||
diff-lcs (1.2.5)
|
||||
docile (1.1.5)
|
||||
domain_name (0.5.24)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
dotenv (1.0.2)
|
||||
em-http-request (1.1.2)
|
||||
addressable (>= 2.3.4)
|
||||
cookiejar
|
||||
@@ -176,35 +171,35 @@ GEM
|
||||
http_parser.rb (>= 0.6.0)
|
||||
em-socksify (0.3.0)
|
||||
eventmachine (>= 1.0.0.beta.4)
|
||||
email_validator (1.5.0)
|
||||
email_validator (1.6.0)
|
||||
activemodel
|
||||
ember-data-source (1.0.0.beta.15)
|
||||
ember-source (~> 1.8)
|
||||
ember-rails (0.16.4)
|
||||
ember-data-source (1.13.5)
|
||||
ember-source (>= 1.8, < 3.0)
|
||||
ember-emblem-template (0.2.2)
|
||||
barber (>= 0.9.0)
|
||||
sprockets (>= 2.1, < 3.0)
|
||||
ember-handlebars-template (0.3.0)
|
||||
barber (>= 0.9.0)
|
||||
sprockets (>= 2.1, < 3.3)
|
||||
tilt
|
||||
ember-rails (0.19.0)
|
||||
active-model-adapter-source (>= 1.13.0)
|
||||
active_model_serializers
|
||||
barber (>= 0.6.0)
|
||||
ember-data-source (>= 1.0.0.beta.5)
|
||||
ember-source (>= 1.1.0)
|
||||
execjs (>= 1.2)
|
||||
handlebars-source (> 1.0.0, < 3)
|
||||
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)
|
||||
ember-source (1.8.1)
|
||||
handlebars-source (~> 1.0)
|
||||
ember-source (1.13.4.1)
|
||||
ember-validations-rails (1.0.0)
|
||||
railties
|
||||
ember_script (0.0.5)
|
||||
ember_script-source (>= 0.0.2)
|
||||
execjs
|
||||
tilt
|
||||
ember_script-source (0.0.14)
|
||||
emblem-rails (0.2.2)
|
||||
barber-emblem (~> 0.1.1)
|
||||
ember-rails (>= 0.14.0)
|
||||
emblem-source (0.3.18)
|
||||
emblem-source (0.4.0)
|
||||
erubis (2.7.0)
|
||||
eventmachine (1.0.7)
|
||||
execjs (2.4.0)
|
||||
execjs (2.5.2)
|
||||
factory_girl (4.5.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.5.0)
|
||||
@@ -220,16 +215,15 @@ GEM
|
||||
multi_json (>= 1.0.0)
|
||||
rack (>= 1.0.0)
|
||||
websocket-driver (>= 0.5.1)
|
||||
faye-websocket (0.9.2)
|
||||
faye-websocket (0.10.0)
|
||||
eventmachine (>= 0.12.0)
|
||||
websocket-driver (>= 0.5.1)
|
||||
ffi (1.9.10)
|
||||
font-awesome-rails (4.3.0.0)
|
||||
railties (>= 3.2, < 5.0)
|
||||
foreman (0.77.0)
|
||||
dotenv (~> 1.0.2)
|
||||
foreman (0.78.0)
|
||||
thor (~> 0.19.1)
|
||||
foundation-rails (5.5.1.0)
|
||||
foundation-rails (5.5.2.1)
|
||||
railties (>= 3.1.0)
|
||||
sass (>= 3.3.0, < 3.5)
|
||||
fuubar (2.0.0)
|
||||
@@ -237,42 +231,41 @@ GEM
|
||||
ruby-progressbar (~> 1.4)
|
||||
gherkin (2.12.2)
|
||||
multi_json (~> 1.3)
|
||||
globalid (0.3.4)
|
||||
globalid (0.3.5)
|
||||
activesupport (>= 4.1.0)
|
||||
handlebars-source (1.3.0)
|
||||
hashie (3.4.0)
|
||||
hashie (3.4.2)
|
||||
hike (1.2.3)
|
||||
hitimes (1.2.2)
|
||||
http-cookie (1.0.2)
|
||||
domain_name (~> 0.5)
|
||||
http_parser.rb (0.6.0)
|
||||
i18n (0.7.0)
|
||||
iso_country_codes (0.6.1)
|
||||
jquery-rails (4.0.3)
|
||||
iso_country_codes (0.7.1)
|
||||
jquery-rails (4.0.4)
|
||||
rails-dom-testing (~> 1.0)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (5.0.3)
|
||||
jquery-ui-rails (5.0.5)
|
||||
railties (>= 3.2.16)
|
||||
js-routes (1.0.0)
|
||||
js-routes (1.0.1)
|
||||
railties (>= 3.2)
|
||||
sprockets-rails
|
||||
json (1.8.3)
|
||||
jwt (1.3.0)
|
||||
jwt (1.5.1)
|
||||
kaminari (0.16.3)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
launchy (2.4.3)
|
||||
addressable (~> 2.3)
|
||||
letter_opener (1.3.0)
|
||||
letter_opener (1.4.1)
|
||||
launchy (~> 2.2)
|
||||
loofah (2.0.1)
|
||||
loofah (2.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
method_source (0.8.2)
|
||||
mime-types (2.6.1)
|
||||
mini_magick (4.1.0)
|
||||
mini_magick (4.2.7)
|
||||
mini_portile (0.6.2)
|
||||
minitest (5.7.0)
|
||||
multi_json (1.11.2)
|
||||
@@ -299,44 +292,43 @@ GEM
|
||||
omniauth-instagram (1.0.1)
|
||||
omniauth (~> 1.0)
|
||||
omniauth-oauth2 (~> 1.0)
|
||||
omniauth-oauth2 (1.2.0)
|
||||
faraday (>= 0.8, < 0.10)
|
||||
multi_json (~> 1.3)
|
||||
omniauth-oauth2 (1.3.1)
|
||||
oauth2 (~> 1.0)
|
||||
omniauth (~> 1.2)
|
||||
orm_adapter (0.5.0)
|
||||
paperclip (4.2.1)
|
||||
activemodel (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
cocaine (~> 0.5.3)
|
||||
paperclip (4.2.4)
|
||||
activemodel (>= 3.2.0)
|
||||
activesupport (>= 3.2.0)
|
||||
cocaine (~> 0.5.5)
|
||||
mime-types
|
||||
pickadate-rails (3.5.6.0)
|
||||
railties (>= 3.1.0)
|
||||
pry (0.10.1)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.8.1)
|
||||
slop (~> 3.4)
|
||||
pry-rails (0.3.3)
|
||||
pry-rails (0.3.4)
|
||||
pry (>= 0.9.10)
|
||||
puma (2.11.3)
|
||||
rack (>= 1.1, < 2.0)
|
||||
puma (2.12.1)
|
||||
quiet_assets (1.1.0)
|
||||
railties (>= 3.1, < 5.0)
|
||||
rack (1.6.0)
|
||||
rack-cors (0.3.1)
|
||||
rack (1.6.4)
|
||||
rack-cors (0.4.0)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.0)
|
||||
actionmailer (= 4.2.0)
|
||||
actionpack (= 4.2.0)
|
||||
actionview (= 4.2.0)
|
||||
activejob (= 4.2.0)
|
||||
activemodel (= 4.2.0)
|
||||
activerecord (= 4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
rails (4.2.3)
|
||||
actionmailer (= 4.2.3)
|
||||
actionpack (= 4.2.3)
|
||||
actionview (= 4.2.3)
|
||||
activejob (= 4.2.3)
|
||||
activemodel (= 4.2.3)
|
||||
activerecord (= 4.2.3)
|
||||
activesupport (= 4.2.3)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.0)
|
||||
railties (= 4.2.3)
|
||||
sprockets-rails
|
||||
rails-assets-ember-qunit (0.2.10)
|
||||
rails-assets-qunit (1.17.1)
|
||||
rails-assets-ember-qunit (0.4.1)
|
||||
rails-assets-qunit (1.18.0)
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
rails-dom-testing (1.0.6)
|
||||
@@ -345,9 +337,9 @@ GEM
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.0.2)
|
||||
loofah (~> 2.0)
|
||||
railties (4.2.0)
|
||||
actionpack (= 4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
railties (4.2.3)
|
||||
actionpack (= 4.2.3)
|
||||
activesupport (= 4.2.3)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.4.2)
|
||||
@@ -357,36 +349,37 @@ GEM
|
||||
http-cookie (>= 1.0.2, < 2.0)
|
||||
mime-types (>= 1.16, < 3.0)
|
||||
netrc (~> 0.7)
|
||||
rqrcode (0.4.2)
|
||||
rspec (3.2.0)
|
||||
rspec-core (~> 3.2.0)
|
||||
rspec-expectations (~> 3.2.0)
|
||||
rspec-mocks (~> 3.2.0)
|
||||
rspec-core (3.2.1)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-expectations (3.2.0)
|
||||
rqrcode (0.6.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)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-support (~> 3.3.0)
|
||||
rspec-its (1.2.0)
|
||||
rspec-core (>= 3.0.0)
|
||||
rspec-expectations (>= 3.0.0)
|
||||
rspec-mocks (3.2.1)
|
||||
rspec-mocks (3.3.2)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-rails (3.2.1)
|
||||
rspec-support (~> 3.3.0)
|
||||
rspec-rails (3.3.3)
|
||||
actionpack (>= 3.0, < 4.3)
|
||||
activesupport (>= 3.0, < 4.3)
|
||||
railties (>= 3.0, < 4.3)
|
||||
rspec-core (~> 3.2.0)
|
||||
rspec-expectations (~> 3.2.0)
|
||||
rspec-mocks (~> 3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-support (3.2.2)
|
||||
ruby-progressbar (1.7.1)
|
||||
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)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.4.13)
|
||||
sass-rails (5.0.1)
|
||||
sass (3.4.16)
|
||||
sass-rails (5.0.3)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.1)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
@@ -397,12 +390,12 @@ GEM
|
||||
multi_json (~> 1.0)
|
||||
rubyzip (~> 1.0)
|
||||
websocket (~> 1.0)
|
||||
simplecov (0.9.2)
|
||||
simplecov (0.10.0)
|
||||
docile (~> 1.1.0)
|
||||
multi_json (~> 1.0)
|
||||
simplecov-html (~> 0.9.0)
|
||||
simplecov-html (0.9.0)
|
||||
slim (3.0.3)
|
||||
json (~> 1.8)
|
||||
simplecov-html (~> 0.10.0)
|
||||
simplecov-html (0.10.0)
|
||||
slim (3.0.6)
|
||||
temple (~> 0.7.3)
|
||||
tilt (>= 1.3.3, < 2.1)
|
||||
slim-rails (3.0.1)
|
||||
@@ -415,12 +408,12 @@ GEM
|
||||
spring (1.3.6)
|
||||
spring-commands-rspec (1.0.4)
|
||||
spring (>= 0.9.1)
|
||||
sprockets (2.12.3)
|
||||
sprockets (2.12.4)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.2.4)
|
||||
sprockets-rails (2.3.2)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
@@ -428,9 +421,9 @@ GEM
|
||||
colorize (>= 0.7.0)
|
||||
net-scp (>= 1.1.2)
|
||||
net-ssh (>= 2.8.0)
|
||||
sucker_punch (1.4.0)
|
||||
sucker_punch (1.5.0)
|
||||
celluloid (~> 0.16.0)
|
||||
temple (0.7.5)
|
||||
temple (0.7.6)
|
||||
test_squad (0.0.1)
|
||||
rails
|
||||
thor (0.19.1)
|
||||
@@ -440,7 +433,7 @@ GEM
|
||||
hitimes
|
||||
tinymce-rails (4.1.6)
|
||||
railties (>= 3.1.1)
|
||||
turnip (1.2.4)
|
||||
turnip (1.3.1)
|
||||
gherkin (>= 2.5)
|
||||
rspec (>= 2.14.0, < 4.0)
|
||||
tzinfo (1.2.2)
|
||||
@@ -458,11 +451,11 @@ GEM
|
||||
binding_of_caller (>= 0.7.2)
|
||||
railties (~> 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
webmock (1.20.4)
|
||||
webmock (1.21.0)
|
||||
addressable (>= 2.3.6)
|
||||
crack (>= 0.3.2)
|
||||
websocket (1.2.2)
|
||||
websocket-driver (0.5.3)
|
||||
websocket-driver (0.6.1)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.2)
|
||||
xpath (2.0.0)
|
||||
@@ -491,12 +484,11 @@ DEPENDENCIES
|
||||
devise
|
||||
devise-i18n
|
||||
devise_simply_stored!
|
||||
ember-emblem-template
|
||||
ember-rails
|
||||
ember-source (= 1.8.1)
|
||||
ember-source (~> 1.13.0)
|
||||
ember-validations-rails
|
||||
ember_script-rails!
|
||||
emblem-rails
|
||||
emblem-source (= 0.3.18)
|
||||
factory_girl_rails
|
||||
faye
|
||||
font-awesome-rails
|
||||
@@ -514,18 +506,19 @@ DEPENDENCIES
|
||||
naught
|
||||
omniauth-facebook
|
||||
omniauth-instagram
|
||||
paperclip
|
||||
paperclip (>= 4.2.4, != 4.3.0)
|
||||
pickadate-rails
|
||||
pry-rails
|
||||
puma
|
||||
quiet_assets
|
||||
rack-cors
|
||||
rails (= 4.2.0)
|
||||
rails (~> 4.2.3)
|
||||
rails-assets-ember-qunit
|
||||
rails-assets-qunit
|
||||
rqrcode
|
||||
rspec-its
|
||||
rspec-rails
|
||||
sass-rails (~> 5.0.0)
|
||||
sass-rails
|
||||
selenium-webdriver
|
||||
simplecov
|
||||
simply_stored!
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
Ember.Handlebars.registerHelper 'can', (operation, resource, options)->
|
||||
if operation is 'manage' and @get('current_employee.manager')
|
||||
#if operation is 'manage' and @get('current_employee.manager')
|
||||
#App.__container__.lookup('globals:current').get('employee.manager')
|
||||
if operation is 'manage' and options.data.view and options.data.view.get('controller.current_employee.manager')
|
||||
options.fn @
|
||||
else
|
||||
options.inverse @
|
||||
options.inverse @ if options.inverse
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
App.initializer
|
||||
name: 'injectCurrent'
|
||||
initialize: (container, app)->
|
||||
container.optionsForType 'globals', instantiate: false, singleton: true
|
||||
container.register 'globals:current', Em.Object.create()
|
||||
|
||||
container.typeInjection 'controller', 'current', 'globals:current'
|
||||
container.typeInjection 'route', 'current', 'globals:current'
|
||||
@@ -14,6 +14,7 @@ App.ApplicationRoute = Ember.Route.extend
|
||||
setupController: (controller)->
|
||||
controller.set 'supplier', @supplier
|
||||
controller.set 'employee', @employee
|
||||
controller.set 'current.employee', @employee
|
||||
# @set 'supplier', @store.find('supplier', supplier_id)
|
||||
#controller.set 'sections', @sections
|
||||
#controller.set 'product_categories', @product_categories
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
App.ApplicationSerializer = DS.ActiveModelSerializer
|
||||
|
||||
App.ApplicationStore = DS.Store.extend
|
||||
adapter: DS.ActiveModelAdapter.extend
|
||||
namespace: 'supplier'
|
||||
## user underscored paths
|
||||
#pathForType: (type)->
|
||||
#Ember.String.pluralize(Ember.String.decamelize(type))
|
||||
App.ApplicationStore = DS.Store
|
||||
#adapter: DS.ActiveModelAdapter.extend
|
||||
#namespace: 'supplier'
|
||||
## user underscored paths
|
||||
#pathForType: (type)->
|
||||
#Ember.String.pluralize(Ember.String.decamelize(type))
|
||||
App.ApplicationAdapter = DS.ActiveModelAdapter.extend
|
||||
namespace: 'supplier'
|
||||
#headers:
|
||||
#"Accept": "application/json, text/javascript; q=0.01"
|
||||
|
||||
@@ -103,7 +103,7 @@ module Qwaiter
|
||||
end
|
||||
|
||||
|
||||
config.handlebars.templates_root = %w[supplier/app/templates waiter/app/templates user/app/templates] if defined?(Ember::Rails) && defined?(Handlebars)
|
||||
#config.handlebars.templates_root = %w[supplier/app/templates waiter/app/templates user/app/templates] if defined?(Ember::Rails) && defined?(Handlebars)
|
||||
|
||||
config.generators do |g|
|
||||
g.orm :simply_stored
|
||||
|
||||
-12749
File diff suppressed because it is too large
Load Diff
-49742
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
-14
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user