Changeset [9a52d7f23a69cc5b73895a3d03e55509ac3c8b90] by Zach Rowe
Revision 9a52d7f23a69cc5b73895a3d03e55509ac3c8b90,
committed by Zach Rowe
· July 11th, 2012 @ 04:27 PM
Merge branch 'master' of github.com:concerto/concerto
https://github.com/concerto/concerto/commit/9a52d7f23a69cc5b73895a3...
76 changed files
-
A
app/assets/images/layout/top-menu/button_top-menu_states.png -
A
app/assets/images/layout/top-menu/top-menu_bg.png -
A
app/assets/images/layout/top-menu/top-menu_logobutton.png -
A
app/assets/images/layout/top-menu/top-menu_secline.png -
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 -
A
test/functional/feeds_controller_test.rb -
R
app/assets/images/layout/TM/button_TM_states.png -
R
app/assets/images/layout/TM/TM_bg.png -
R
app/assets/images/layout/TM/TM_logobutton.png -
R
app/assets/images/layout/TM/TM_secline.png -
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/common/mixins.scss.erb -
M
app/assets/stylesheets/application/controls/button-groups.scss.erb -
M
app/assets/stylesheets/application/controls/buttons.scss.erb -
M
app/assets/stylesheets/application/controls/jquery.qtip.scss.erb -
M
app/assets/stylesheets/application/index-manifest.scss -
M
app/assets/stylesheets/application/layout/forms.scss.erb -
M
app/assets/stylesheets/application/layout/lists-grid-stacked.scss.erb -
M
app/assets/stylesheets/application/layout/topmenu.scss.erb -
M
app/controllers/application_controller.rb -
M
app/controllers/feeds_controller.rb -
M
app/controllers/subscriptions_controller.rb -
M
app/models/user.rb -
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/elements/_topmenu_contents.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/layouts/application.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/subscriptions/_form.html.erb -
M
app/views/subscriptions/edit.html.erb -
M
app/views/subscriptions/index.html.erb -
M
app/views/subscriptions/new.html.erb -
M
app/views/subscriptions/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