Skip to content

Commit

Permalink
Merge pull request #91 from agmps17/master
Browse files Browse the repository at this point in the history 
updating gems, changing code as per update jquery
  • Loading branch information
@cpg
cpg committed Jul 16, 2014
2 parents ce97d8a + bab98c3 commit 9f37aad
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 43 deletions.
76 changes: 38 additions & 38 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.1)
actionpack (= 4.1.1)
actionview (= 4.1.1)
actionmailer (4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
mail (~> 2.5.4)
actionpack (4.1.1)
actionview (= 4.1.1)
activesupport (= 4.1.1)
actionpack (4.1.4)
actionview (= 4.1.4)
activesupport (= 4.1.4)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionpack-action_caching (1.1.1)
actionpack (>= 4.0.0, < 5.0)
actionview (4.1.1)
activesupport (= 4.1.1)
actionview (4.1.4)
activesupport (= 4.1.4)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.1)
activesupport (= 4.1.1)
activemodel (4.1.4)
activesupport (= 4.1.4)
builder (~> 3.1)
activerecord (4.1.1)
activemodel (= 4.1.1)
activesupport (= 4.1.1)
activerecord (4.1.4)
activemodel (= 4.1.4)
activesupport (= 4.1.4)
arel (~> 5.0.0)
activeresource (4.0.0)
activemodel (~> 4.0)
activesupport (~> 4.0)
rails-observers (~> 0.1.1)
activesupport (4.1.1)
activesupport (4.1.4)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -48,29 +48,29 @@ GEM
request_store (~> 1.0)
bcrypt (3.1.7)
builder (3.2.2)
capybara (2.3.0)
capybara (2.4.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-screenshot (0.3.19)
capybara-screenshot (0.3.20)
capybara (>= 1.0, < 3)
launchy
cliver (0.3.2)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
coffee-script-source (1.7.1)
daemons (1.1.9)
diff-lcs (1.2.5)
docile (1.1.5)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.2.0)
execjs (2.2.1)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.1)
Expand All @@ -81,14 +81,14 @@ GEM
ffi (>= 1.0.0)
rake
hike (1.2.3)
i18n (0.6.9)
jbuilder (2.1.1)
i18n (0.6.11)
jbuilder (2.1.3)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (3.1.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.2.1)
jquery-ui-rails (5.0.0)
railties (>= 3.2.16)
json (1.8.1)
kgio (2.9.2)
Expand All @@ -100,7 +100,7 @@ GEM
treetop (~> 1.4.8)
mime-types (1.25.1)
mini_portile (0.6.0)
minitest (5.3.5)
minitest (5.4.0)
multi_json (1.10.1)
mysql2 (0.3.16)
nokogiri (1.6.2.1)
Expand All @@ -119,28 +119,28 @@ GEM
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.1)
actionmailer (= 4.1.1)
actionpack (= 4.1.1)
actionview (= 4.1.1)
activemodel (= 4.1.1)
activerecord (= 4.1.1)
activesupport (= 4.1.1)
rails (4.1.4)
actionmailer (= 4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
activemodel (= 4.1.4)
activerecord (= 4.1.4)
activesupport (= 4.1.4)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.1)
railties (= 4.1.4)
sprockets-rails (~> 2.0)
rails-observers (0.1.2)
activemodel (~> 4.0)
railties (4.1.1)
actionpack (= 4.1.1)
activesupport (= 4.1.1)
railties (4.1.4)
actionpack (= 4.1.4)
activesupport (= 4.1.4)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.3.2)
rb-readline (0.5.1)
ref (1.0.5)
request_store (1.0.6)
request_store (1.0.7)
rspec-core (3.0.2)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.2)
Expand Down Expand Up @@ -171,7 +171,7 @@ GEM
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slim (2.0.2)
slim (2.0.3)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
sprockets (2.11.0)
Expand All @@ -184,7 +184,7 @@ GEM
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.9)
temple (0.6.7)
temple (0.6.8)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
Expand All @@ -207,7 +207,7 @@ GEM
kgio (~> 2.6)
rack
raindrops (~> 0.7)
websocket-driver (0.3.3)
websocket-driver (0.3.4)
xpath (2.0.0)
nokogiri (~> 1.3)
ya2yaml (0.31)
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/application.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//= require jquery
//= require jquery.ui.all
//= require jquery-ui
//= require lib/jquery.ui.templates
//= require jquery_ujs

Expand Down
7 changes: 4 additions & 3 deletions plugins/010-users/app/assets/javascripts/users.js.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ $(document).on "ajax:success", ".edit_name_form", (event, results) ->
if results.status is "ok"
col_element = $("#whole_user_" + results["id"])
$(this).hide('slow')
$(".name_click_change").html results["name"]
$(".name_click_change").show()
elem = $(this).closest('td').find(".name_click_change")
elem.html results["name"]
elem.show()
$(col_element).find(".users-col2").html results["name"]


Expand Down Expand Up @@ -128,4 +129,4 @@ Users =
_this.toggle_delete_area checkbox

$(document).ready ->
Users.initialize()
Users.initialize()
2 changes: 1 addition & 1 deletion plugins/020-shares/app/views/shares/_share.html.slim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ div.share[id="whole_share_#{share.id}"]
- if advanced?
tr
td.top
label#{t('tags')}
label #{t('tags')}
td.top[colspan='8']= render :partial => 'shares/tags', :object => share

tr
Expand Down

0 comments on commit 9f37aad

Please sign in to comment.