Changeset [7f00ac0e41af6f3a45fd6e4202e9c2f769d3a951] by Doug Youch
September 1st, 2010 @ 09:53 AM
Merge branch 'user-level' of git@charlie-dev.cykod.com:webiva-core
into pimp-stats
https://github.com/cykod/Webiva/commit/7f00ac0e41af6f3a45fd6e4202e9...
Committed by Doug Youch
- A script/branches
- M app/controllers/editor/auth_controller.rb
- M app/controllers/editor/auth_renderer.rb
- M app/controllers/paragraph_feature.rb
- M app/models/content/core_feature/email_target_connect.rb
- M app/models/end_user.rb
- M app/models/end_user_segment_field.rb
- M app/models/end_user_segment_type.rb
- M app/models/user_subscription.rb
- M app/views/content/core_feature/_email_target_connect.rhtml
- M app/views/editor/auth/user_edit_account.rhtml
- M app/views/editor/auth/user_register.rhtml
- M spec/controllers/editor/auth_renderer_spec.rb
- M spec/controllers/members_controller_spec.rb
- M spec/models/end_user_segment_type_spec.rb
- M spec/models/end_user_spec.rb
- M spec/models/user_segment/field_spec.rb
- M spec/models/user_segment/filter_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 ยป