aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Add bootstrap-sass and compass to the :develop group in the Gemfile - now ↵Louise Crow2012-11-01-0/+12
| | | | that adminbootstrap is the default admin theme, you need them in order to regenerate the css.
* Latest translation files from Transifex.Louise Crow2012-11-01-313/+8003
|
* Handle the case where there is no encoded element, but a description element ↵Louise Crow2012-10-31-1/+7
| | | | instead.
* Uncomment TWITTER_WIDGET_ID in general.yml-example file to stop our ↵Louise Crow2012-10-31-1/+1
| | | | deployment system complaining. Shouldn't have any material effect.
* Merge remote-tracking branch 'openaustralia_github/blog_margin' into developLouise Crow2012-10-31-38/+9
|\
| * Update twitter widget to latest versionMatthew Landauer2012-10-31-31/+8
| |
| * Make twitter widget fit inside sidebarMatthew Landauer2012-10-31-7/+1
| |
* | Merge branch 'feature/flexible-admin-username' into developLouise Crow2012-10-31-49/+86
|\ \ | |/ |/|
| * Move methods used only in admin controllers to admin_controller.rbLouise Crow2012-10-30-24/+24
| |
| * If we're doing admin authentication internally, don't bother with the ↵Louise Crow2012-10-30-7/+15
| | | | | | | | request environment, set the admin_name on the session instead.
| * Add some specs for admin_current_userLouise Crow2012-10-30-0/+27
| |
| * Pull out a bit of shared setup code.Louise Crow2012-10-30-13/+11
| |
| * Redirect calls to admin_http_auth_user to more generic wrapper ↵Louise Crow2012-10-30-17/+21
|/ | | | admin_current_user
* Only get the holidays once per request.Louise Crow2012-10-29-4/+5
|
* Don't load raw emails before the frontpage specs - they don't rely on the ↵Louise Crow2012-10-29-1/+0
| | | | raw email table being populated, and it's slow.
* Make spec a bit more generic in terms of what we're expecting. Really what ↵Louise Crow2012-10-29-12/+28
| | | | we want is reverse date order on the events, and only successful responses or initial sending.
* Mock xapian call for specs that are really for orthogonal things like ↵Louise Crow2012-10-29-0/+16
| | | | localization.
* Move search spec to search group.Louise Crow2012-10-29-10/+7
|
* Split up specs for frontpage and search.Louise Crow2012-10-29-25/+27
|
* Restore config var used in tests.Louise Crow2012-10-29-0/+2
|
* Merge remote-tracking branch ↵Louise Crow2012-10-29-0/+2
|\ | | | | | | 'openaustralia_github/sorting_requests_front_page' into develop
| * Always have the newest events at the top of the listMatthew Landauer2012-10-26-0/+2
| |
* | Merge branch 'feature/nils_in_config' into developLouise Crow2012-10-29-63/+63
|\ \ | |/ |/|
| * Remove files checked in by mistake.Louise Crow2012-10-29-242/+0
| |
| * Restore removed testing config param, remove spec for unset param - I think ↵Louise Crow2012-10-25-9/+242
| | | | | | | | not really worth it.
| * Handle the default blank string passed by Configuration moduleLouise Crow2012-10-25-2/+2
| |
| * Default for ghostscript compression is documented as being false, so make it so.Louise Crow2012-10-25-1/+1
| |
| * Only set up exception notification params if they are not blank.Louise Crow2012-10-25-2/+4
| |
| * Given that MAX_REQUESTS_PER_USER_PER_DAY is documented as an optional ↵Louise Crow2012-10-25-52/+59
| | | | | | | | variable, but that commonlib/rblib/config.rb does not allow nil defaults, replace nil value clause (which can never be reached) with blank value condition(blank now returned by default by lib/configuation.rb)
| * Handle a blank convert command more explicitly.Louise Crow2012-10-25-1/+1
| |
| * Merge commit '3474b961f86ad743b958e9fce2c39e8e54ac6a95' into ↵Louise Crow2012-10-25-6/+6
|/| | | | | | | feature/nils_in_config
| * Merge remote-tracking branch 'henare_github/nil-config-defaults' into ↵Louise Crow2012-10-22-6/+6
| |\ | | | | | | | | | feature/nil-config-defaults
| | * Fix empty configuration defaultsHenare Degan2012-10-19-6/+6
| | | | | | | | | | | | | | | | | | Because of the way that rblib/config.rb works, nil for these values would always raise an exeption (see line 209) so changing it to an empty string seems better. It fixes my problem where I purposely didn't define HTML_TO_PDF_COMMAND anyway.
* | | Merge remote-tracking branch ↵Louise Crow2012-10-25-6/+12
|\ \ \ | | | | | | | | | | | | 'openaustralia_github/follow-all-requests-description' into develop
| * | | Add a full stop to the end of this sentenceHenare Degan2012-10-18-1/+1
| | | |
| * | | Fix description of a searchHenare Degan2012-10-18-2/+8
| | | | | | | | | | | | | | | | Used to say "comments or requests which are " when you did: View requests > All requests > Follow
| * | | Make test a bit more RubyesqueHenare Degan2012-10-18-4/+4
| | | | | | | | | | | | | | | | The purist would probably say separate these into 3 tests
* | | | Upgrade to gettext 2.3.3 in order to get fix for bug that was causing ↵Louise Crow2012-10-25-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | strings with a # in them not to be stored in the .pot file for translation. Upgrade to the current standard version of gettext_i18n_rails in order to support gettext 2.3.3 and as it now has our patches. \o/
* | | | Fix failing timezone specs. As we are now setting a value for timezone in ↵Louise Crow2012-10-25-8/+43
| | | | | | | | | | | | | | | | | | | | | | | | config.timezone, this switches on ActiveRecord::time_zone_aware_attributes, so values are returned in the time zone specified (although still saved in whatever is specified in ActiveRecord.default_timezone in the db - in our case UTC). Previously with no timezone set, values would have been returned in UTC. So add some lines to look at the zone the data is saved in before the time_zone_aware_attributes kick in, and some lines to look at the values afterwards. Note that expected raw_saved time values are the same as the previous expected values for saved time (when there was no attribute time zone awareness), but that the time zone of values coming back on the model is set by config.time_zone and then overridden by Time.use_zone.
* | | | Fix spec - based on the spec description, what's being tested and the other ↵Louise Crow2012-10-25-12/+12
| | | | | | | | | | | | | | | | specs, I assume that the activerecord default timezone is supposed to be set to :local as a precondition. Doing so makes the spec pass and make sense.
* | | | Remove redundant line.Louise Crow2012-10-24-2/+1
| | | |
* | | | Merge branch 'feature/ruby-19-compat-immediate' into developLouise Crow2012-10-24-4/+410
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock
| * | | | Convert example in comment to failing spec, update regex to make spec pass - ↵Louise Crow2012-10-18-2/+328
| | | | | | | | | | | | | | | | | | | | again the use of converted HTML parts in emails means extra leading spaces.
| * | | | Gemfile.lock is reordered.Louise Crow2012-10-18-1/+1
| | | | |
| * | | | Convert request cited in comment to failing spec, update regex to make it ↵Louise Crow2012-10-18-2/+82
| | | | | | | | | | | | | | | | | | | | pass (we now use the HTML parts of emails by preference, so there are some leading spaces.)
* | | | | Merge remote-tracking branch 'openaustralia_github/add_timezone_support' ↵Louise Crow2012-10-24-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into develop
| * | | | | Add support for showing all dates and times in the correct timezoneMatthew Landauer2012-10-19-0/+8
| | |_|_|/ | |/| | |
* | | | | Restore disclosure log fields.Louise Crow2012-10-24-0/+2
| | | | |
* | | | | Merge remote-tracking branch ↵Louise Crow2012-10-24-34/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/csv_export_internal_admin_authority_bug' into develop Conflicts: app/controllers/public_body_controller.rb
| * | | | | added notes to csv exportMatthew Landauer2012-10-24-0/+2
| | | | | |