Make simple_date respect the time zone
Fix regression by allowing Date objects too
Merge remote-tracking branch 'henare_github/simple-date-time-zone' into develop
Make scales of axes on admin stats graphs to be set by the data rather than hardcoded
Merge remote-tracking branch 'openaustralia_github/admin_stats_graph_axis_scales' into develop
Try standardizing on a single version of rake that should already be installed to prevent bundler needing to install it, triggering the associated bug (https://github.com/carlhuda/bundler/pull/2187) on a fresh install.
Update Rakefile to reflect rollback to rake 0.8.7
Symlink aliases file if created according to doc/INSTALL-exim4.md
Add a configuration option to specify that you don't want the default locale to appear in URLs generated by the application.
Merge branch 'feature/no-default-locale-in-routes' into develop
Use generated URLs in help pages - then they're accessible to routing filters etc.
Correct help unhappy path.
Give the implicit default locale in a URL without locale precedence over the session in the case where the default locale is not being included in URLs. This allows the user to return to the default locale.
Merge branch 'feature/no-default-locale-in-routes' into develop
Move styling of popup close buttons to stylesheet so they can be more easily overriden by themes.
Use generated urls so that they go through locale filters.
Use Rails.env as a more reliable way of determining environment - it may not have come from ENV.
Standardize slug generation for external users so that it uses the same underlying method as other slug generation. Fixes #567.
Set YAML engine to syck in Ruby 1.9 for backward compatibility with 1.8
Make regex for space normalization more unambiguous - it's the spaces at the beginning and end of the whole string that we want to strip entirely, not at the beginning and end of each line (interpretation of ^ and $ is subject to default multiline behaviour of the regexp interpreter)