Changeset [9f12e32b97fbb46133f9e8411a708e54a33b3a55] by Doug Youch
September 1st, 2010 @ 12:58 PM
Merge branch 'pimp' of git@charlie-dev.cykod.com:webiva-core
into pimp-stats
https://github.com/cykod/Webiva/commit/9f12e32b97fbb46133f9e8411a70...
Committed by Doug Youch
- A app/models/end_user_note.rb
- A app/models/util/html_replacer.rb
- A app/models/webiva_menu.rb
- A app/views/mail_manager/index.rhtml
- A app/views/members/_note.html.erb
- A app/views/members/_user_note.html.erb
- A app/views/structure/_create_revision_info.rhtml
- A app/views/structure/_edit_page_revision.html.erb
- A app/views/structure/_page_element_content_info.rhtml
- A app/views/structure/_page_element_images.rhtml
- A app/views/structure/_site_nodes_table.html.erb
- A app/views/structure/pages.html.erb
- A public/javascripts/webalytics.js
- A public/themes/standard/images/icons/actions/add.png
- A public/themes/standard/images/icons/actions/pen.png
- A public/themes/standard/images/icons/actions/remove.gif
- A public/themes/standard/images/icons/actions/remove.png
- A public/themes/standard/images/icons/header_actions/collapse.png
- A public/themes/standard/images/icons/header_actions/delete_page.png
- A public/themes/standard/images/icons/header_actions/duplicate_page.png
- A public/themes/standard/images/icons/header_actions/expand.png
- A public/themes/standard/images/icons/header_actions/pen.png
- A public/themes/standard/images/icons/header_actions/site_trees.png
- A public/themes/standard/images/icons/site_tree.gif
- A public/themes/standard/stylesheets/admin_design.css
- A vendor/modules/blog/app/models/blog/multiple_rss_handler.rb
- R public/themes/standard/images/framework/columned_bg.gif
- R public/themes/standard/images/framework/filemanager_icons.gif
- R public/themes/standard/images/framework/filemanager_list.gif
- R public/themes/standard/images/framework/filemanager_new_folder.gif
- R public/themes/standard/images/framework/filemanager_search_files.gif
- R public/themes/standard/images/framework/filemanager_search_separator.gif
- R public/themes/standard/images/framework/filemanager_slider.gif
- R public/themes/standard/images/framework/filemanager_slider_slider.gif
- R public/themes/standard/images/framework/filemanager_upload_file.gif
- R public/themes/standard/images/framework/header_bg.gif
- R public/themes/standard/images/framework/left_sidebar.gif
- R public/themes/standard/images/framework/logo.gif
- R public/themes/standard/images/framework/menu_icon/content.gif
- R public/themes/standard/images/framework/menu_icon/content_selected.gif
- R public/themes/standard/images/framework/menu_icon/e_marketing.gif
- R public/themes/standard/images/framework/menu_icon/e_marketing_selected.gif
- R public/themes/standard/images/framework/menu_icon/files_and_images.gif
- R public/themes/standard/images/framework/menu_icon/files_and_images_selected.gif
- R public/themes/standard/images/framework/menu_icon/options.gif
- R public/themes/standard/images/framework/menu_icon/options_selected.gif
- R public/themes/standard/images/framework/menu_icon/people.gif
- R public/themes/standard/images/framework/menu_icon/people_selected.gif
- R public/themes/standard/images/framework/menu_icon/system.gif
- R public/themes/standard/images/framework/menu_icon/system_selected.gif
- R public/themes/standard/images/framework/menu_icon/website.gif
- R public/themes/standard/images/framework/menu_icon/website_selected.gif
- R public/themes/standard/images/framework/page_title_edit_icon.gif
- R public/themes/standard/images/framework/page_title_help_icon.gif
- R public/themes/standard/images/framework/page_title_menu_icon.gif
- R public/themes/standard/images/framework/page_title_translate.gif
- R public/themes/standard/images/icons/add_paragraph.gif
- R public/themes/standard/images/icons/boolean/all.gif
- R public/themes/standard/images/icons/boolean/any.gif
- R public/themes/standard/images/icons/boolean/not_all.gif
- R public/themes/standard/images/icons/boolean/not_any.gif
- R public/themes/standard/images/icons/calendar.gif
- R public/themes/standard/images/icons/campaigns/campaign_wizard.gif
- R public/themes/standard/images/icons/check_arrow.gif
- R public/themes/standard/images/icons/client.gif
- R public/themes/standard/images/icons/content/blog.gif
- R public/themes/standard/images/icons/content/calendar.gif
- R public/themes/standard/images/icons/content/contribution.gif
- R public/themes/standard/images/icons/content/feedback.gif
- R public/themes/standard/images/icons/content/fitness.gif
- R public/themes/standard/images/icons/content/map.gif
- R public/themes/standard/images/icons/content/model.gif
- R public/themes/standard/images/icons/content/photogallery.gif
- R public/themes/standard/images/icons/content/poll.gif
- R public/themes/standard/images/icons/content/shop.gif
- R public/themes/standard/images/icons/content/videos.gif
- R public/themes/standard/images/icons/document.gif
- R public/themes/standard/images/icons/domain.gif
- R public/themes/standard/images/icons/domain_control.gif
- R public/themes/standard/images/icons/dropdown.gif
- R public/themes/standard/images/icons/edit_control.gif
- R public/themes/standard/images/icons/find.gif
- R public/themes/standard/images/icons/folder.gif
- R public/themes/standard/images/icons/framework.gif
- R public/themes/standard/images/icons/group.gif
- R public/themes/standard/images/icons/lock.gif
- R public/themes/standard/images/icons/menu/user_class.gif
- R public/themes/standard/images/icons/menu_entry.gif
- R public/themes/standard/images/icons/module.gif
- R public/themes/standard/images/icons/ok.gif
- R public/themes/standard/images/icons/page.gif
- R public/themes/standard/images/icons/page_revision_active.gif
- R public/themes/standard/images/icons/page_revision_existing.gif
- R public/themes/standard/images/icons/page_revision_none.gif
- R public/themes/standard/images/icons/pageeditor/Thumbs.db
- R public/themes/standard/images/icons/pageeditor/active.gif
- R public/themes/standard/images/icons/pageeditor/add_framework.gif
- R public/themes/standard/images/icons/pageeditor/add_paragraph.gif
- R public/themes/standard/images/icons/pageeditor/cancel_add_framework.gif
- R public/themes/standard/images/icons/pageeditor/cancel_add_paragraph.gif
- R public/themes/standard/images/icons/pageeditor/connections.gif
- R public/themes/standard/images/icons/pageeditor/files_and_images.gif
- R public/themes/standard/images/icons/pageeditor/inactive.gif
- R public/themes/standard/images/icons/pageeditor/preview.gif
- R public/themes/standard/images/icons/pageeditor/preview_return.gif
- R public/themes/standard/images/icons/pageeditor/refresh.gif
- R public/themes/standard/images/icons/pageeditor/structure.gif
- R public/themes/standard/images/icons/pageeditor/variables.gif
- R public/themes/standard/images/icons/paragraph.gif
- R public/themes/standard/images/icons/paragraph_lock.gif
- R public/themes/standard/images/icons/paragraph_move.gif
- R public/themes/standard/images/icons/redirect.gif
- R public/themes/standard/images/icons/ssl.gif
- R public/themes/standard/images/icons/star_selected.gif
- R public/themes/standard/images/icons/star_unselected.gif
- R public/themes/standard/images/icons/table_actions/alert.gif
- R public/themes/standard/images/icons/table_actions/check.gif
- R public/themes/standard/images/icons/table_actions/comment.gif
- R public/themes/standard/images/icons/table_actions/document.gif
- R public/themes/standard/images/icons/table_actions/edit.gif
- R public/themes/standard/images/icons/table_actions/mail.gif
- R public/themes/standard/images/icons/table_actions/preview.gif
- R public/themes/standard/images/icons/table_actions/publications.gif
- R public/themes/standard/images/icons/table_actions/rating_negative.gif
- R public/themes/standard/images/icons/table_actions/rating_none.gif
- R public/themes/standard/images/icons/table_actions/rating_positive.gif
- R public/themes/standard/images/icons/table_actions/star_selected.gif
- R public/themes/standard/images/icons/table_actions/star_unselected.gif
- R public/themes/standard/images/icons/template.gif
- R public/themes/standard/images/icons/user.gif
- R public/themes/standard/images/icons/wheel.gif
- R public/themes/standard/images/icons/zone.gif
- R public/themes/standard/stylesheets/admin_framework_full.css
- M app/controllers/cms_controller.rb
- M app/controllers/content_controller.rb
- M app/controllers/emarketing_controller.rb
- M app/controllers/file_controller.rb
- M app/controllers/mail_manager_controller.rb
- M app/controllers/members_controller.rb
- M app/controllers/module_app_controller.rb
- M app/controllers/page_controller.rb
- M app/controllers/paragraph_feature.rb
- M app/controllers/paragraph_renderer.rb
- M app/controllers/structure_controller.rb
- M app/controllers/subscription_controller.rb
- M app/helpers/cms_helper.rb
- M app/helpers/page_helper.rb
- M app/helpers/structure_helper.rb
- M app/models/client_user.rb
- M app/models/content/core_publication/edit_publication.rb
- M app/models/content_node.rb
- M app/models/domain_log_session.rb
- M app/models/domain_log_visitor.rb
- M app/models/end_user.rb
- M app/models/end_user_segment_field.rb
- M app/models/page_paragraph.rb
- M app/models/page_revision.rb
- M app/models/role.rb
- M app/models/site_node.rb
- M app/models/site_template.rb
- M app/models/user_segment/field_type.rb
- M app/views/emarketing/_visitor_detail.rhtml
- M app/views/emarketing/_visitor_table.rhtml
- M app/views/layouts/manage.rhtml
- M app/views/layouts/page.rhtml
- M app/views/layouts/themes/standard/_manage.rhtml
- M app/views/members/_targets_table.rhtml
- M app/views/members/index.rhtml
- M app/views/members/view.rhtml
- M app/views/structure/_domain_modifier_info.rhtml
- M app/views/structure/_framework_modifier_info.rhtml
- M app/views/structure/_lock_modifier_info.rhtml
- M app/views/structure/_page_element_info.rhtml
- M app/views/structure/_path.rhtml
- M app/views/structure/_revision_info.rhtml
- M app/views/structure/_site_node_modifier.rhtml
- M app/views/structure/_ssl_modifier_info.rhtml
- M app/views/structure/_structure_editor.rhtml
- M app/views/structure/_template_modifier_info.rhtml
- M app/views/structure/view.rhtml
- M app/views/subscription/edit.rhtml
- M config/routes.rb
- M public/javascripts/active_table.js
- M public/javascripts/application.js
- M public/themes/standard/images/icons/actions/add.gif
- M public/themes/standard/images/icons/actions/upload.gif
- M public/themes/standard/stylesheets/admin_framework.css
- M spec/controllers/editor/menu_renderer_spec.rb
- M spec/controllers/members_controller_spec.rb
- M spec/controllers/structure_controller_spec.rb
- M spec/models/domain_log_visitor_spec.rb
- M spec/spec_helper.rb
- M spec/webiva_spec_helper.rb
- M vendor/modules/blog/app/controllers/blog/admin_controller.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_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/feedback/app/controllers/feedback/comments_controller.rb
- M vendor/modules/feedback/app/controllers/feedback/comments_feature.rb
- M vendor/modules/feedback/app/controllers/feedback/comments_renderer.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 ยป