Changeset [fb76187f84a0b83138d461c0fb7b8e69b73eb272] by Doug Youch
July 31st, 2011 @ 11:26 PM
Merge branch 'master' of git://github.com/cykod/Webiva into rails3-master
Conflicts:
app/models/content_node_value.rb
app/views/application/_options_partial.html.erb
app/views/file/details/_folder_details.rhtml
app/views/members/_note.html.erb
app/views/members/_user_note.html.erb
app/views/options/domain_options.rhtml
config/environment.rb
spec/controllers/mail_manager_controller_spec.rb
spec/controllers/paragraph_feature_spec.rb
vendor/modules/blog/app/controllers/blog/page_renderer.rb
vendor/modules/media/app/controllers/media/gallery_renderer.rb
vendor/modules/media/app/views/media/gallery/_gallery_paragraph.rhtml
vendor/rails/activerecord/lib/active_record/attribute_methods.rb
https://github.com/cykod/Webiva/commit/fb76187f84a0b83138d461c0fb7b...
Committed by Doug Youch
- A spec/models/domain_log_source_spec.rb
- A vendor/modules/blog/db/20110601000611_add_blog_options.rb
- A vendor/modules/blog/db/20110603004438_blog_rating.rb
- A vendor/modules/media/app/controllers/media/gallery_feature.rb
- R spec/models/domain_log_souce_spec.rb
- M app/controllers/edit_controller.rb
- M app/controllers/editor/auth_controller.rb
- M app/controllers/editor/auth_feature.rb
- M app/controllers/editor/auth_renderer.rb
- M app/controllers/editor/content_feature.rb
- M app/controllers/editor/publication_controller.rb
- M app/controllers/editor/publication_feature.rb
- M app/controllers/editor/publication_renderer.rb
- M app/controllers/emarketing_controller.rb
- M app/controllers/module_controller.rb
- M app/controllers/paragraph_feature.rb
- M app/controllers/paragraph_renderer.rb
- M app/helpers/file_helper.rb
- M app/models/configuration.rb
- M app/models/content/core_field.rb
- M app/models/content/field.rb
- M app/models/content_model_type.rb
- M app/models/content_node_value.rb
- M app/models/content_publication.rb
- M app/models/content_type.rb
- M app/models/domain_model.rb
- M app/models/end_user.rb
- M app/models/end_user_cookie.rb
- M app/models/model_extension/editor_change_extension.rb
- M app/models/model_extension/end_user_import_extension.rb
- M app/models/user_segment/field_type.rb
- M app/views/content_types/_content_types_table.rhtml
- M app/views/emarketing/_visitor_table.rhtml
- M app/views/experiment/_experiments_table.html.erb
- M app/views/file/_search_item.rhtml
- M app/views/file/details/_file_details.rhtml
- M app/views/file/details/_folder_details.rhtml
- M app/views/file/details/_revisions.rhtml
- M app/views/mail_manager/_mail_templates_table.rhtml
- M app/views/manage/translate/_view_translation_table.rhtml
- M app/views/member_import/status.rjs
- M app/views/members/_site_visits.rhtml
- M app/views/members/_user_actions_table.rhtml
- M app/views/members/_user_note.html.erb
- M app/views/members/_user_segments_table.html.erb
- M app/views/members/index.rhtml
- M app/views/members/refresh_segment_status.rjs
- M app/views/members/view.rhtml
- M app/views/public/calendar.rhtml
- M app/views/subscription/_entry_table.rhtml
- M app/views/templates/_features_table.rhtml
- M lib/module_dispatcher.rb
- M lib/styled_form_builder_generator.rb
- M lib/webiva_form_elements.rb
- M lib/webiva_monkey_patches.rb
- M spec/controllers/mail_manager_controller_spec.rb
- M spec/controllers/paragraph_feature_spec.rb
- M vendor/modules/blog/app/controllers/blog/edit_feature.rb
- M vendor/modules/blog/app/controllers/blog/page_controller.rb
- M vendor/modules/blog/app/controllers/blog/page_feature.rb
- M vendor/modules/blog/app/controllers/blog/page_renderer.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/views/blog/manage/_blog_list_table.rhtml
- M vendor/modules/blog/app/views/blog/manage/_generate_post_table.rhtml
- M vendor/modules/blog/app/views/blog/manage/_post_table.rhtml
- M vendor/modules/blog/app/views/blog/manage/configure.rhtml
- M vendor/modules/feed/app/controllers/feed/page_controller.rb
- M vendor/modules/feed/app/controllers/feed/page_renderer.rb
- M vendor/modules/media/app/controllers/media/gallery_controller.rb
- M vendor/modules/media/app/controllers/media/gallery_renderer.rb
- M vendor/modules/media/app/views/media/gallery/_gallery_paragraph.rhtml
- M vendor/modules/media/app/views/media/gallery/galleries.rhtml
- M vendor/modules/user_profile/app/models/user_profile_entry.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 ยป