Changeset [4245d632bfb2132c25cee06950496dd03e480de8] by Brian R Zaik
Revision 4245d632bfb2132c25cee06950496dd03e480de8,
committed by Brian R Zaik
· January 15th, 2012 @ 01:43 AM
Merge branch 'master' of github.com:concerto/concerto
https://github.com/concerto/concerto/commit/4245d632bfb2132c25cee06...
16 changed files
-
A
app/assets/javascripts/frontend/fields.js.coffee -
A
app/assets/javascripts/frontend/screens.js.coffee -
A
app/assets/stylesheets/frontend/fields.css.scss -
A
app/assets/stylesheets/frontend/screens.css.scss -
A
app/controllers/frontend/fields_controller.rb -
A
app/controllers/frontend/screens_controller.rb -
A
app/helpers/frontend/fields_helper.rb -
A
app/helpers/frontend/screens_helper.rb -
A
app/views/frontend/screens/show.html.erb -
A
test/functional/frontend/fields_controller_test.rb -
A
test/functional/frontend/screens_controller_test.rb -
A
test/unit/helpers/frontend/fields_helper_test.rb -
A
test/unit/helpers/frontend/screens_helper_test.rb -
M
config/routes.rb -
M
public/robots.txt -
M
test/integration/routes_test.rb