aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Fix typo.Louise Crow2013-04-02-1/+0
|
* Remove HTML a tag from all msgids and msgstrs.Matthew Landauer2013-04-02-63/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/aln/app.po locale/ar/app.po locale/bs/app.po locale/ca/app.po locale/cs/app.po locale/cy/app.po locale/de/app.po locale/en_IE/app.po locale/es/app.po locale/eu/app.po locale/fr/app.po locale/gl/app.po locale/hu_HU/app.po locale/id/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sq/app.po locale/sq/app__.po locale/sq/app_old3.po locale/sr@latin/app.po locale/tr/app.po locale/uk/app.po
* Fix closing bracket position - we only want to translate the text, not pass ↵Louise Crow2013-04-02-1/+1
| | | | the url as well.
* Remove link html from translation messageMatthew Landauer2013-04-02-35/+35
| | | | | | | | | | | | | Conflicts: locale/id/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sq/app.po_ locale/sq/app__.po locale/sq/app_old3.po locale/sq/app_old4.po locale/sq/app_old5.po
* Add comment about vendor/rails-locales and Rails 3Matthew Landauer2013-04-02-0/+2
|
* As much as possible use I18n.locale for getting the localeMatthew Landauer2013-04-02-2/+2
|
* Small refactorMatthew Landauer2013-04-02-6/+1
|
* Refactor using I18.with_localeMatthew Landauer2013-04-02-4/+3
|
* Set locale with I18n rather than through globalizeMatthew Landauer2013-04-02-26/+26
| | | | | | Conflicts: app/controllers/general_controller.rb
* Small refactoring in PublicBody.self.find_by_url_name_with_historic just use ↵Matthew Landauer2013-04-02-22/+19
| | | | the current locale
* Use full url in test for redirect to ensure in correct localeMatthew Landauer2013-04-02-1/+1
|
* Set locale in controller test by passing parameter in getMatthew Landauer2013-04-02-11/+7
| | | | Also using I18n.locale to pass the current locale around.
* bundle update fast_gettext gettext_i18n_rails gettext locale routing-filterMatthew Landauer2013-04-02-1/+1
| | | | | | Conflicts: Gemfile.lock
* Remove version restrictions on gems related to i18nMatthew Landauer2013-04-02-10/+10
| | | | | | Conflicts: Gemfile.lock
* Moved all gems related to i18n into one place in GemfileMatthew Landauer2013-04-02-5/+8
| | | | | | Conflicts: Gemfile
* Include the rails-3-develop branch in CI testing.Louise Crow2013-04-02-0/+1
|
* Merge branch 'hotfix/0.8.0.1' into developLouise Crow2013-04-02-9/+32
|\
| * Merge remote-tracking branch 'openaustralia_github/https_in_emails' into ↵hotfix/0.8.0.1Louise Crow2013-04-02-7/+30
| |\ | | | | | | | | | hotfix/0.8.0.1
| | * When force_ssl is true make links in emails httpsMatthew Landauer2013-04-02-7/+30
| |/ |/|
| * Merge remote-tracking branch 'openaustralia_github/email_alert_path_fixes' ↵Louise Crow2013-04-02-3/+3
| |\ | | | | | | | | | into hotfix/0.8.0.1
| | * Use full urls in outgoing_message_url as the name impliesMatthew Landauer2013-04-02-2/+2
| |/ |/|
* | Follow alphabetical ordering.Louise Crow2013-03-19-1/+1
| |
* | Merge branch 'release/0.8' into developLouise Crow2013-03-19-103/+140
|\ \ | | | | | | | | | | | | | | | Conflicts: locale/he_IL/app.po locale/id/app.po
* \ \ Merge branch 'hotfix/0.7.0.5' into developLouise Crow2013-03-18-19/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock locale/cy/app.po locale/fr/app.po locale/he_IL/app.po locale/id/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sr@latin/app.po locale/uk/app.po
| | | * Merge branch 'release/0.8'0.8Louise Crow2013-03-19-6/+8
| | | |\ | | | |/ | | |/|
| | * | Supply info request id in an HTML 5 data attributerelease/0.8Louise Crow2013-03-19-6/+8
| | | |
| | | * Merge branch 'release/0.8'Louise Crow2013-03-19-2235/+10709
| | | |\ | | | |/ | | |/|
| | * | Bump version number to 0.8Louise Crow2013-03-19-1/+1
| | | |
| | * | Allow the emergency user account to be disabled.Louise Crow2013-03-19-4/+22
| | | |
| | * | Latest translations from Transifex.Louise Crow2013-03-19-93/+92
| | | |
| | * | Merge branch 'hotfix/0.7.0.5' into release/0.8Louise Crow2013-03-18-19/+20
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock locale/cy/app.po locale/fr/app.po locale/he_IL/app.po locale/id/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sr@latin/app.po locale/uk/app.po
| | * | Merge branch 'develop' into release/0.8Louise Crow2013-03-14-8/+14
| | |\ \ | |_|/ / |/| | |
* | | | Move Gemfile to httpsLouise Crow2013-03-14-2/+2
| | | |
* | | | Update to specific commit in webrat for launchy fix without other breaking ↵Louise Crow2013-03-14-3/+4
| | | | | | | | | | | | | | | | changes.
* | | | And now latest version of launchy.Louise Crow2013-03-14-4/+3
| | | |
* | | | Pull more up-to-date version of webrat from git - trying to resolve travis ↵Louise Crow2013-03-14-8/+13
| | | | | | | | | | | | | | | | issues with launchy dependency.
* | | | Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117eLouise Crow2013-03-14-3/+3
| | | |
* | | | Downgrade launchy to avoid deprecation warning.Louise Crow2013-03-14-5/+6
| | | |
| | * | Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117eLouise Crow2013-03-14-3/+3
| | | |
| | * | Add some release notes.Louise Crow2013-03-14-0/+17
| |/ / |/| |
* | | New strings for translation.Louise Crow2013-03-14-333/+3983
| | |
* | | Cleanup whitespace.Louise Crow2013-03-14-57/+57
| | |
* | | Latest translations from Transifex.Louise Crow2013-03-14-1951/+1977
| | |
* | | Try adding launchy as a gem - webrat seems to have a dependency on it.Louise Crow2013-03-13-0/+5
| | |
* | | Consistent syntax for X-Forwarded-ProtoLouise Crow2013-03-13-23/+23
| | |
* | | Lock mail gem to 2.4 series for now - there are changes in the 2.5 series ↵Louise Crow2013-03-13-3/+3
| | | | | | | | | | | | that cause test failures.
* | | Update bundle.Louise Crow2013-03-13-29/+34
| | |
* | | Update URLs in spec now that custom url methods have been removed.Louise Crow2013-03-13-3/+3
| | |
* | | Merge remote-tracking branch ↵Louise Crow2013-03-13-229/+419
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/one_support_email_on_admin_attention_state' into develop Conflicts: Gemfile.lock app/controllers/request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml spec/models/request_mailer_spec.rb
| * | | Remove deleted action from list of actionsMatthew Landauer2013-03-06-2/+2
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-08 23:09:34 +0000