Changeset [3521cfa66ca891c7642fe8a17b02de8478c4473a] by James Cook
Revision 3521cfa66ca891c7642fe8a17b02de8478c4473a,
committed by James Cook
· December 25th, 2008 @ 08:53 PM
Merge branch 'knewter/master' into work http://github.com/knewter/ansuz/...
15 changed files
-
M
app/controllers/admin/proto_page_plugins_controller.rb -
M
app/views/admin/pages/edit.html.erb -
M
config/routes.rb -
M
public/javascripts/jquery.cycle.all.pack.js -
M
public/themes/default/stylesheets/base.css -
M
themes/default/stylesheets/base.css -
M
themes/default/views/layouts/application.html.erb -
M
vendor/plugins/ansuz_flickr_js/app/models/ansuz/j_adams/flickr_js.rb -
M
vendor/plugins/ansuz_flickr_js/app/views/admin/flickr_js/_edit.html.erb -
M
vendor/plugins/ansuz_flickr_js/app/views/admin/flickr_js/_flickr_js.html.erb -
M
vendor/plugins/ansuz_flickr_js/init.rb -
M
vendor/plugins/ansuz_github_badge/app/models/ansuz/j_adams/github_badge.rb -
M
vendor/plugins/ansuz_github_badge/app/views/admin/github_badges/_edit.html.erb -
M
vendor/plugins/ansuz_github_badge/app/views/admin/github_badges/_github_badge.html.erb -
M
vendor/plugins/ansuz_github_badge/init.rb