Changeset [f1d1752fa226f3fb5cf32fd8211e3f4c015b7e57] by Pascal Rettig
August 31st, 2010 @ 05:42 PM
Merge remote branch 'core/charts' into pimp
Conflicts:
app/views/layouts/manage.rhtml
http://github.com/cykod/Webiva/commit/f1d1752fa226f3fb5cf32fd8211e3...
Committed by Pascal Rettig
- A config/initializers/time_setup.rb
- A public/javascripts/pilesofmoney/pom.css
- A public/javascripts/pilesofmoney/pom.js
- M app/controllers/dashboard_controller.rb
- M app/controllers/emarketing_controller.rb
- M app/models/dashboard/core_widget.rb
- M app/views/emarketing/_charts_widget.html.erb
- M app/views/emarketing/stats.html.erb
- M app/views/layouts/manage.rhtml
- M public/javascripts/emarketing.js
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป