aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Latest Czech translations from Transifex.Louise Crow2012-11-07-4/+4
|
* Another translation tweak.Louise Crow2012-11-06-1/+1
|
* A couple of quick czech locale file fixes.Louise Crow2012-11-06-5/+5
|
* Translations re-pulled from Transifex to remove fuzzy strings.Louise Crow2012-11-06-8798/+18429
|
* Make newlines in translated strings match newlines in msgidLouise Crow2012-11-06-72/+26
|
* Fix fuzzy markers added due to linebreak changes.Louise Crow2012-11-06-39/+34
|
* New .po files after running bundle exec rake gettext:store_model_attributes ↵Louise Crow2012-11-06-8001/+7496
| | | | and bundle exec rake gettext:find
* Prepare for escaped linebreaks with new version of fast-gettext.Louise Crow2012-11-06-15691/+5764
|
* Add the ability to support a staging environment.Louise Crow2012-11-05-0/+19
|
* Restore correct element id.Louise Crow2012-11-05-1/+1
|
* Merge branch 'feature/fix-search-page' into developLouise Crow2012-11-05-10/+10
|\
| * Use a simple form and submit button for the search box - we don't want the ↵Louise Crow2012-11-05-6/+6
| | | | | | | | extra params from generated form tags and don't need csrf protection here. The unique csrf token presumably is preventing the serving of search results from the cache.
| * Use simple form for frontpage search - we don't need parameter insertion as ↵Louise Crow2012-11-05-4/+4
|/ | | | the form is not submitted to this page, we don't need csrf protection and we don't want the extra parameters as we convert this to a get request.
* if the response code doesn't match, the failure message is unhelpfulJames McKinney2012-11-01-2/+7
|
* use safe_mock_modelJames McKinney2012-11-01-6/+6
|
* Fix bug where errors were rendered like: <ul>["<li>Please enter a ↵James McKinney2012-11-01-1/+1
| | | | subject</li>"]</ul>
* use String#replace to set a string in-placeJames McKinney2012-11-01-1/+1
|
* fix path to patch for Ruby 1.9James McKinney2012-11-01-1/+1
|
* Remove extra dependency added in ↵Louise Crow2012-11-01-2/+0
| | | | https://github.com/mysociety/alaveteli/commit/b63a205faf27559d1d1710c7a3c68468e3d4c017 - think this was a merge error.
* remove s switch on regular expressions, which turns on SJIS encodingJames McKinney2012-11-01-11/+12
| | | | | | Conflicts: app/models/incoming_message.rb
* Merge remote-tracking branch ↵Louise Crow2012-11-01-2/+48
|\ | | | | | | | | | | | | 'openaustralia_github/use_mailcatcher_in_development' into develop Conflicts: Gemfile.lock
| * By default in development send mails to mailcatcherMatthew Landauer2012-10-18-5/+50
| |
* | Merge remote-tracking branch ↵Louise Crow2012-11-01-77/+77
|\ \ | | | | | | | | | 'openaustralia_github/split_frontpage_into_partials' into develop
| * | Formatting tidy up (whitespace)Matthew Landauer2012-11-01-11/+8
| | |
| * | Split front page into partials for more modular overriding in themesMatthew Landauer2012-11-01-72/+75
| | |
* | | Merge remote-tracking branch 'openaustralia_github/favicon_deploy' into developLouise Crow2012-11-01-0/+1
|\ \ \
| * | | Link favicon to shared area on deploy so it can be changedMatthew Landauer2012-11-01-0/+1
| |/ /
* | | Merge remote-tracking branch ↵Louise Crow2012-11-01-14/+25
|\ \ \ | | | | | | | | | | | | 'openaustralia_github/request_search_form_tidy_up' into develop
| * | | Tidy up request type options line on requests search formMatthew Landauer2012-11-01-14/+25
| |/ /
* | | Uncomment config param THEME_BRANCH and set it to false - our deployment ↵Louise Crow2012-11-01-4/+5
| | | | | | | | | | | | system complains if we don't have all params we're using in the example file.
* | | Merge remote-tracking branch 'openaustralia_github/theme_branches' into developLouise Crow2012-11-01-2/+16
|\ \ \
| * | | Add optional branch to install themes from. Falls back if it doesn't exist.Matthew Landauer2012-11-01-2/+16
| |/ /
* | | Merge branch 'feature/admin-css-namespace' into developLouise Crow2012-11-01-7/+15
|\ \ \
| * | | Only reference the admin stylesheet if we're actually going to show the ↵Louise Crow2012-11-01-6/+2
| | | | | | | | | | | | | | | | admin navbar.
| * | | Don't set the body class to admin when an admin user is using the front end. ↵Louise Crow2012-11-01-1/+1
| | | | | | | | | | | | | | | | We don't want to apply admin styles to the front end in general.
| * | | 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.