Skip to content

Commit

Permalink
Last version linux
Browse files Browse the repository at this point in the history
  • Loading branch information
Juleffel committed Aug 24, 2016
1 parent f562161 commit 3074655
Show file tree
Hide file tree
Showing 14 changed files with 36,859 additions and 11,229 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gem 'sass-rails', '~> 5.0.1'
gem 'bootstrap-sass', '~> 3.3.3'
gem "node"
gem "twitter-bootstrap-rails"
#gem 'jquery-ui-bootstrap-rails-asset'
gem 'jquery-ui-bootstrap-rails-asset'
gem 'bootbox-rails'
gem 'image-picker-rails'
# Use Uglifier as compressor for JavaScript assets
Expand All @@ -24,7 +24,7 @@ gem 'coffee-rails', '~> 4.1.0'
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
#gem 'jquery-rails'
gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
Expand Down
11 changes: 11 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ GEM
bootstrap-sass (3.3.3)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
bootstrap-sass-rails (3.0.3.0)
railties (>= 3.1.0)
sass-rails (>= 3.1.0)
builder (3.2.2)
byebug (8.2.2)
cancancan (1.10.1)
Expand Down Expand Up @@ -78,6 +81,12 @@ GEM
jbuilder (2.2.11)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-bootstrap-rails-asset (0.0.3)
bootstrap-sass-rails
railties (>= 3.1.0)
json (1.8.2)
mail (2.6.3)
mime-types (>= 1.16, < 3)
Expand Down Expand Up @@ -185,6 +194,8 @@ DEPENDENCIES
fastimage
image-picker-rails
jbuilder
jquery-rails
jquery-ui-bootstrap-rails-asset
node
pg (~> 0.18.1)
puma
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
// Underscore.js, jed.js, Underscore 1.3.0, sprintf(), jQuery Browser Plugin 0.0.8,
// CryptoJS v3.1.2, EventEmitter, otr.js, moment.js, SHA-1, RSA, Strophejs, Backbone,
// typeahead.js
//= require lib/converse.min

// require jquery
//= require jquery
//= require jquery_ujs
//= require bootstrap-sprockets
// JqueryUI: For autocomplete... TODO: Load only necessary
Expand Down Expand Up @@ -61,6 +60,7 @@

//= require scripts

//= require lib/converse.nojquery

//= require xmpp

Expand Down
Loading

0 comments on commit 3074655

Please sign in to comment.