Changeset [f5bb4eaec7d76ef035bf2889c312f6806c7b6816] by Brian Michalski
Revision f5bb4eaec7d76ef035bf2889c312f6806c7b6816,
committed by Brian Michalski
· July 10th, 2012 @ 01:24 AM
Merge branch 'master' of github.com:concerto/concerto
https://github.com/concerto/concerto/commit/f5bb4eaec7d76ef035bf288...
50 changed files
-
A
app/assets/images/layout/viewblock/bg_lg.png -
A
app/assets/images/layout/viewblock/bg_sm.png -
A
app/assets/images/layout/viewblock/header_bg.png -
A
app/assets/images/layout/viewblock/sidebar_light.png -
A
app/assets/images/layout/viewblock/submit_bar_bg.png -
A
app/assets/stylesheets/application/layout/viewblock.scss.erb -
R
app/assets/images/layout/C/bg_lg.png -
R
app/assets/images/layout/C/bg_sm.png -
R
app/assets/images/layout/C/header_bg.png -
R
app/assets/images/layout/C/sidebar_light.png -
R
app/assets/images/layout/C/submit_bar_bg.png -
R
app/assets/stylesheets/application/layout/contentcell.scss.erb -
M
app/assets/javascripts/screens_views.js -
M
app/assets/stylesheets/application/index-manifest.scss -
M
app/assets/stylesheets/application/layout/lists-grid-stacked.scss.erb -
M
app/views/contents/new.html.erb -
M
app/views/contents/show.html.erb -
M
app/views/dashboard/index.html.erb -
M
app/views/devise/passwords/edit.html.erb -
M
app/views/devise/passwords/new.html.erb -
M
app/views/devise/registrations/edit.html.erb -
M
app/views/devise/registrations/new.html.erb -
M
app/views/devise/sessions/new.html.erb -
M
app/views/feeds/_browse_body.html.erb -
M
app/views/feeds/edit.html.erb -
M
app/views/feeds/index.html.erb -
M
app/views/feeds/moderate.html.erb -
M
app/views/feeds/new.html.erb -
M
app/views/groups/edit.html.erb -
M
app/views/groups/index.html.erb -
M
app/views/groups/new.html.erb -
M
app/views/groups/show.html.erb -
M
app/views/screens/_form.html.erb -
M
app/views/screens/_index_body.html.erb -
M
app/views/screens/edit.html.erb -
M
app/views/screens/index.html.erb -
M
app/views/screens/new.html.erb -
M
app/views/screens/show.html.erb -
M
app/views/submissions/_index_body.html.erb -
M
app/views/submissions/index.html.erb -
M
app/views/submissions/show.html.erb -
M
app/views/templates/_index_body.html.erb -
M
app/views/templates/edit.html.erb -
M
app/views/templates/index.html.erb -
M
app/views/templates/new.html.erb -
M
app/views/templates/show.html.erb -
M
app/views/users/edit.html.erb -
M
app/views/users/index.html.erb -
M
app/views/users/new.html.erb -
M
app/views/users/show.html.erb