Changeset [035e0844f47d24827e85968326f04049d16baf62] by Doug Youch
September 13th, 2010 @ 04:44 PM
Merge branch 'pimp' of git@charlie-dev.cykod.com:webiva-core into pimp
Conflicts:
script/fake_log_entries.rb
https://github.com/cykod/Webiva/commit/035e0844f47d24827e85968326f0...
Committed by Doug Youch
- A app/views/application/_header_mce.rhtml
- A public/javascripts/jquery/jquery-ui.min.js
- A public/javascripts/jquery/jquery.js
- A public/themes/standard/images/actions/config_domain.png
- A public/themes/standard/images/actions/config_files.png
- A public/themes/standard/images/actions/config_image_sizes.png
- A public/themes/standard/images/actions/config_languages.png
- A public/themes/standard/images/actions/mail_campaigns.png
- A public/themes/standard/images/actions/mail_message_templates.png
- A public/themes/standard/images/actions/mail_subscriptions.png
- A public/themes/standard/images/actions/mail_tell_a_friend.png
- A public/themes/standard/images/actions/mail_templates.png
- A public/themes/standard/images/actions/system_client_users.png
- A public/themes/standard/images/actions/system_clients.png
- A public/themes/standard/images/actions/system_domains.png
- A public/themes/standard/images/actions/system_issue_tracker.png
- A public/themes/standard/images/actions/system_translation.png
- A public/themes/standard/images/actions/traffic_content.png
- A public/themes/standard/images/actions/traffic_page.png
- A public/themes/standard/images/actions/traffic_realtime.png
- A public/themes/standard/images/actions/traffic_referrer.png
- A public/themes/standard/images/actions/traffic_visitors.png
- M app/controllers/emarketing_controller.rb
- M app/controllers/mail_manager_controller.rb
- M app/controllers/manage/system_controller.rb
- M app/controllers/options_controller.rb
- M app/controllers/structure_controller.rb
- M app/models/content_node.rb
- M app/models/domain_log_referrer.rb
- M app/models/site_node.rb
- M app/views/layouts/manage_mce.rhtml
- M app/views/manage/access/login.rhtml
- M app/views/members/_note.html.erb
- M app/views/structure/_edit_page_revision.html.erb
- M app/views/structure/_experiment_info.html.erb
- M app/views/structure/_group_element_info.rhtml
- M app/views/structure/_path.rhtml
- M app/views/structure/_site_nodes_table.html.erb
- M public/themes/standard/stylesheets/admin_framework.css
- M script/fake_log_entries.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 ยป