Changeset [a0f4ae90fe04ce5c4ed0b056a7a564b567ed86a8] by Pascal Rettig

August 31st, 2010 @ 05:44 PM

Merge remote branch 'core/pimp-stats' into pimp

Conflicts:

app/models/domain_log_session.rb

http://github.com/cykod/Webiva/commit/a0f4ae90fe04ce5c4ed0b056a7a56...

Committed by Pascal Rettig

  • A app/models/domain_log_group.rb
  • A app/models/domain_log_group_entry.rb
  • A app/models/domain_log_stat.rb
  • A app/views/emarketing/charts.html.erb
  • A db/migrate/20100826220811_stats_tables.rb
  • M app/controllers/content_controller.rb
  • M app/controllers/emarketing_controller.rb
  • M app/controllers/module_app_controller.rb
  • M app/models/content_node.rb
  • M app/models/domain_log_entry.rb
  • M app/models/domain_log_referrer.rb
  • M app/models/domain_log_session.rb
  • M app/models/site_node.rb
  • M app/views/emarketing/stats.html.erb
  • M db/migrate/20100819155437_pimp_initial.rb
  • M public/javascripts/emarketing.js
  • M vendor/modules/blog/app/controllers/blog/page_renderer.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

Shared Ticket Bins