Changeset [888c05657a134406298b66ff3a7122a6d6c2f615] by Kalin Harvey
Revision 888c05657a134406298b66ff3a7122a6d6c2f615,
committed by Kalin Harvey
· January 5th, 2010 @ 04:04 AM
Merge branch 'master' of git://github.com/graemeworthy/greenbuildingbrain into audio
- 'master' of git://github.com/graemeworthy/greenbuildingbrain: (21 commits) widget tools updated specs map zoomlevel to 14 and set the zoomlevel, for alex use jquery load tactics to run map initialiser changed respond order on map controller index page html then js ie thought the map was a text blob, perhaps a doctype will set it straight? js was being a bastard in ie, go figgure audiofile controlelr updates mod on audiotour listen view renamed audio files added another audio file demo modified audio controller to handle tour 5555 small cleanup of code a few more minor changes to legal updated small fixes to legal docs minor fixes to legal docs formatting for legal docs updated legal text code cleanup ... http://github.com/graemeworthy/greenbuildingbrain/commit/888c05657a...
16 changed files
-
A
app/views/items/show.widget.erb -
A
config/initializers/widget_mime_type.rb -
A
public/images/arrow.png -
A
public/javascripts/soundmanager2-nodebug-jsmin.js -
A
public/javascripts/soundmanager2.js -
A
public/javascripts/widget-player.js -
A
public/stylesheets/widget-player.css -
A
public/stylesheets/widget.css -
M
app/controllers/items_controller.rb -
M
app/views/dashboard/index.html.erb -
M
config/environment.rb -
M
vendor/gems/Caged-lighthouse-api-1.0.0/.specification -
M
vendor/gems/haml-2.0.9/.specification -
M
vendor/gems/haml-2.1.0/.specification -
M
vendor/gems/josevalim-rails-footnotes-3.4.1/.specification -
M
vendor/gems/statistics-2001.2.28/.specification