Changeset [e65fc594b85810daa089679af9d8eb372fb9f9f4] by Josh Adams
Revision e65fc594b85810daa089679af9d8eb372fb9f9f4,
committed by Josh Adams
· January 16th, 2009 @ 05:40 PM
Merge branch 'jamescook/master' into work http://github.com/knewter/ansuz/...
27 changed files
-
M
.gitignore -
M
app/models/ansuz_mailer.rb -
M
app/models/page.rb -
M
app/models/site_setting.rb -
M
app/views/admin/pages/_form.html.erb -
M
app/views/ansuz_mailer/page_expiring_soon_notification.erb -
M
config/database.mysql.yml -
M
config/database.postgresql.yml -
M
config/database.sqlite.yml -
M
config/database.sqlserver.yml -
M
config/environment.rb -
M
db/migrate/20090114005523_add_expires_at_column_on_pages.rb -
M
db/schema.rb -
M
lib/ansuz/plugin_manager.rb -
M
lib/ansuz/plugin_settings.rb -
M
lib/pages_expiring_soon.rb -
M
lib/tasks/ansuz.rake -
M
spec/fixtures/pages.yml -
M
spec/fixtures/site_settings.yml -
M
spec/models/page_spec.rb -
M
spec/models/user_spec.rb -
M
spec/spec_helper.rb -
M
vendor/plugins/ansuz_content_section/app/models/ansuz/j_adams/content_section.rb -
M
vendor/plugins/ansuz_content_section/app/views/admin/content_sections/_edit.html.erb -
M
vendor/plugins/ansuz_content_section/init.rb -
M
vendor/plugins/fckeditor/lib/fckeditor.rb -
M
vendor/plugins/haml/init.rb