Changeset [f72336c3d90c4dddd91bcfd66e381a54cae49c7c] by Pascal Rettig
June 28th, 2010 @ 10:40 AM
Merge commit 'core/user-segment' into development
Conflicts:
vendor/modules/blog/app/controllers/blog/manage_controller.rb
http://github.com/cykod/Webiva/commit/f72336c3d90c4dddd91bcfd66e381...
Committed by Pascal Rettig
- A app/models/end_user_action_segment_field.rb
- A app/models/end_user_action_segment_type.rb
- A app/models/end_user_cache.rb
- A app/models/end_user_cache_segment_field.rb
- A app/models/end_user_search.rb
- A app/models/end_user_segment_field.rb
- A app/models/end_user_segment_type.rb
- A app/models/end_user_tag_segment_field.rb
- A app/models/user_segment.rb
- A app/models/user_segment/core_type.rb
- A app/models/user_segment/field.rb
- A app/models/user_segment/field_handler.rb
- A app/models/user_segment/field_type.rb
- A app/models/user_segment/filter.rb
- A app/models/user_segment/operation.rb
- A app/models/user_segment/operation_builder.rb
- A app/models/user_segment_cache.rb
- A app/models/user_segment_option_parser.rb
- A app/models/user_segment_option_parser.treetop
- A app/models/user_subscription_entry_segment_field.rb
- A app/views/members/_add_users_form.html.erb
- A app/views/members/_edit_segment_filter.html.erb
- A app/views/members/_operation_form.html.erb
- A app/views/members/_operation_form_arguments.html.erb
- A app/views/members/_operation_form_child.html.erb
- A app/views/members/_operation_form_expression.html.erb
- A app/views/members/_operation_form_operation.html.erb
- A app/views/members/_refresh_segment.html.erb
- A app/views/members/_segment_form.html.erb
- A app/views/members/_user_segments_table.html.erb
- A app/views/members/builder.html.erb
- A app/views/members/builder_help.html.erb
- A app/views/members/copy_segment.html.erb
- A app/views/members/create_segment.html.erb
- A app/views/members/edit_segment.html.erb
- A app/views/members/options.html.erb
- A app/views/members/refresh_segment_status.rjs
- A app/views/members/segments.html.erb
- A app/views/members/update_builder.rjs
- A db/migrate/20100511165552_user_segments.rb
- A spec/models/end_user_action_segment_field_spec.rb
- A spec/models/end_user_action_segment_type_spec.rb
- A spec/models/end_user_cache_segment_field_spec.rb
- A spec/models/end_user_segment_field_spec.rb
- A spec/models/end_user_segment_type_spec.rb
- A spec/models/end_user_tag_segment_field_spec.rb
- A spec/models/user_segment/core_type_spec.rb
- A spec/models/user_segment/field_handler_spec.rb
- A spec/models/user_segment/field_spec.rb
- A spec/models/user_segment/field_type_spec.rb
- A spec/models/user_segment/filter_spec.rb
- A spec/models/user_segment/operation_builder_spec.rb
- A spec/models/user_segment/operation_spec.rb
- A spec/models/user_segment_cache_spec.rb
- A spec/models/user_segment_option_parser_spec.rb
- A spec/models/user_segment_spec.rb
- A spec/models/user_subscription_entry_segment_field_spec.rb
- M app/controllers/content_controller.rb
- M app/controllers/member_export_controller.rb
- M app/controllers/members_controller.rb
- M app/controllers/module_controller.rb
- M app/controllers/paragraph_renderer.rb
- M app/helpers/cms_helper.rb
- M app/models/configuration.rb
- M app/models/content_tag.rb
- M app/models/end_user.rb
- M app/models/end_user_tag.rb
- M app/models/handler_actions.rb
- M app/models/market_segment.rb
- M app/models/model_extension/end_user_import_extension.rb
- M app/models/site_module.rb
- M app/models/tag.rb
- M app/views/member_export/index.rhtml
- M app/views/members/_add_tags_form.rhtml
- M app/views/members/_targets_table.rhtml
- M app/views/members/_user_cloud.rhtml
- M app/views/members/edit.rhtml
- M app/views/members/index.rhtml
- M app/views/members/view.rhtml
- M app/views/subscription/_subscription_table.rhtml
- M app/workers/member_export_worker.rb
- M lib/active_table.rb
- M public/themes/standard/stylesheets/admin_framework.css
- M spec/controllers/editor/auth_renderer_spec.rb
- M spec/controllers/members_controller_spec.rb
- M spec/models/end_user_spec.rb
- M spec/models/triggered_action_spec.rb
- M vendor/modules/user_profile/spec/models/user_profile_entry_spec.rb
- M vendor/modules/user_profile/spec/models/user_profile_type_spec.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 ยป