Changeset [15c9c7a7ed92547d3357f2e2c10f727905b1681e] by Doug Youch
April 29th, 2011 @ 03:43 PM
Merge branch 'development' of git@github.com:cykod/Webiva into rails3
Conflicts:
app/controllers/editor/auth_renderer.rb
app/helpers/cms_helper.rb
app/models/mail_template.rb
app/models/site_node.rb
app/views/templates/edit.rhtml
lib/tasks/install_module.rake
spec/controllers/editor/publication_renderer_spec.rb
spec/models/content_model_segment_field_spec.rb
spec/models/content_publication_spec.rb
spec/webiva_spec_helper.rb
vendor/modules/blog/app/models/blog/blog_post.rb
vendor/modules/blog/app/views/blog/manage/post.rhtml
vendor/modules/user_profile/spec/controllers/user_profile/manage_controller_spec.rb
vendor/plugins/validates_as_email/lib/validates_as_email.rb
https://github.com/cykod/Webiva/commit/15c9c7a7ed92547d3357f2e2c10f...
Committed by Doug Youch
- A app/models/model_extension/handler_extension.rb
- M app/controllers/application_controller.rb
- M app/controllers/editor/auth_renderer.rb
- M app/controllers/editor/menu_renderer.rb
- M app/controllers/editor/search_controller.rb
- M app/controllers/editor/search_renderer.rb
- M app/controllers/emarketing_controller.rb
- M app/controllers/file_controller.rb
- M app/controllers/public_controller.rb
- M app/helpers/cms_helper.rb
- M app/models/content/core_field.rb
- M app/models/content/field.rb
- M app/models/content_model_field.rb
- M app/models/content_node_search.rb
- M app/models/content_node_value.rb
- M app/models/domain_log_group.rb
- M app/models/domain_log_session.rb
- M app/models/end_user.rb
- M app/models/mail_template.rb
- M app/models/site_module.rb
- M app/models/site_node.rb
- M app/models/site_template.rb
- M app/views/edit/_page_connections.rhtml
- M app/views/emarketing/_referrer_sources.html.erb
- M app/views/file/_file_javascript.rhtml
- M app/views/file/_file_search_bar.rhtml
- M app/views/file/_folder_details.rhtml
- M app/views/file/details/_file_details.rhtml
- M app/views/file/details/_file_name.rhtml
- M app/views/file/index.rhtml
- M app/views/members/view.rhtml
- M app/views/structure/view.rhtml
- M app/views/templates/edit.rhtml
- M config/defaults.yml.example
- M lib/tasks/install_module.rake
- M lib/webiva_monkey_patches.rb
- M script/branches
- M spec/controllers/editor/auth_renderer_spec.rb
- M spec/models/content_publication_spec.rb
- M spec/webiva_spec_helper.rb
- M vendor/modules/blog/app/controllers/blog/manage_controller.rb
- M vendor/modules/blog/app/models/blog/blog_blog.rb
- M vendor/modules/blog/app/models/blog/blog_post.rb
- M vendor/modules/blog/app/models/blog/rss_handler.rb
- M vendor/modules/blog/app/views/blog/manage/post.rhtml
- M vendor/modules/feed/app/controllers/feed/rss_renderer.rb
- M vendor/modules/media/app/controllers/media/gallery_renderer.rb
- M vendor/modules/user_profile/app/controllers/user_profile/page_feature.rb
- M vendor/modules/user_profile/app/controllers/user_profile/page_renderer.rb
- M vendor/plugins/validates_as_email/lib/validates_as_email.rb
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป