Changeset [f3989422182cf2534d275e53c1831cb128d29454] by Yomi Colledge
Revision f3989422182cf2534d275e53c1831cb128d29454,
committed by Yomi Colledge
· July 5th, 2010 @ 08:25 AM
Merge branch 'ux_improvements' of github.com:baphled/salad into ux_improvements
Conflicts:
app/views/layouts/application.html.erb
http://github.com/baphled/salad/commit/f3989422182cf2534d275e53c183...
9 changed files
-
M
app/views/layouts/application.html.erb -
M
app/views/layouts/no_sidebar.html.erb -
M
features/enhanced/import_feature_ajax_functionality.feature -
M
features/enhanced/panel_tooltip_functionality.feature -
M
features/step_definitions/selenium_steps.rb -
M
public/javascripts/application.js -
M
public/javascripts/form.js -
M
public/javascripts/jquery.hover.dialog.js -
M
public/javascripts/pagination.js