aboutsummaryrefslogtreecommitdiffstats
path: root/app/views
Commit message (Collapse)AuthorAgeLines
* Merge branch 'feature/restore-unobtrusive-js' into rails-3-developLouise Crow2013-08-22-3/+2
|\
| * Add confirmation to outgoing messsage destroy.Louise Crow2013-08-22-2/+1
| | | | | | | | Closes #1053.
| * Include unobtrusive js in the admin layoutLouise Crow2013-08-22-1/+1
| | | | | | | | We use the :confirm option of the submit_tag helper. Fixes #1042.
* | Handle case of nil user_idLouise Crow2013-08-20-1/+1
|/ | | | When status was updated by a script.
* Use raw on select_tag option string so it doesn't get escaped. Fixes #1027.Louise Crow2013-07-31-2/+2
|
* Preserve string "Tags (separated by a space):", removed in ↵Louise Crow2013-07-31-1/+1
| | | | f89e2c3d5cee5e3bf2bd2227254fa0edb09aeb53, as there are lots of translations for this already, and we'll probably be re-introducing it with more features around tagging.
* Merge branch 'feature/localisation-fixes' into rails-3-developLouise Crow2013-07-29-2/+2
|\
| * Use FastGettext.locale, not I18n.locale as the latter will return hyphens, ↵Louise Crow2013-07-23-1/+1
| | | | | | | | not underscores as we use in our URLs.
| * gettext_i18n_rails patches I18n.locale= so that it changes underscores in ↵Louise Crow2013-07-18-1/+1
| | | | | | | | locale names (as used in the gettext world) to the dashes that I18n prefers. So for locales that include an underscore the equality test was returning false. Use FastGettext.locale instead to be consistent. Fixes #998.
* | Merge branch 'feature/similar-fixes' into rails-3-developLouise Crow2013-07-23-3/+14
|\ \
| * | Change concatenated header and title strings to full, properly escaped ↵Louise Crow2013-07-22-2/+13
| | | | | | | | | | | | strings that are available for translation. Fixes #1003.
| * | Supply correct parameter for similar requests page. Fixes #1002.Louise Crow2013-07-22-1/+1
| |/
* | Merge remote-tracking branch 'origin/721-defunct-tag' into rails-3-developLouise Crow2013-07-23-21/+32
|\ \ | |/ |/|
| * Say Defunct instead of Make your own request in listings.Matthew Somerville2013-07-17-2/+8
| | | | | | | | Also don't show 'Make your own request' unless it's requestable.
| * Always show defunct message, whether body has notes or not (for #721).Matthew Somerville2013-07-17-19/+24
| |
* | Syntax fix - we don't want to output the final value of the iterator.Louise Crow2013-07-18-1/+1
|/
* Merge branch 'hotfix/0.11.0.16' into rails-3-developLouise Crow2013-06-25-16/+11
|\ | | | | | | | | | | | | | | Conflicts: locale/he_IL/app.po locale/hr_HR/app.po locale/nb_NO/app.po locale/uk/app.po
| * Use two forms, one for changing the search term, and one for applying ↵hotfix/0.11.0.16Louise Crow2013-06-25-4/+11
| | | | | | | | filters to the current search term. Fixes #511.
| * Remove unused code. Let's re-add it when we need it.Louise Crow2013-06-25-12/+0
| |
* | Use request.params to generate a json format url when @has_json is true, not ↵Louise Crow2013-06-20-1/+1
| | | | | | | | request.query_parameters. The latter has unexpected results when a querystring parameter of 'action' or 'controller' is supplied. Fixes #981.
* | Add pagination to the list of requests on the admin page for a public bodyLouise Crow2013-06-20-1/+2
| |
* | Merge branch 'hotfix/0.11.0.11' into rails-3-developLouise Crow2013-06-12-1/+1
|\|
| * Allow an item to have an author, not a creatorhotfix/0.11.0.11Louise Crow2013-06-12-1/+1
| |
* | Merge commit '0.11.0.8' into rails-3-developLouise Crow2013-06-11-3/+3
|\|
| * Only render the popup banner in the layout where it's actually used.Louise Crow2013-06-11-3/+3
| |
* | Remove support for theme stylesheet inclusion via template deprecated in ↵Louise Crow2013-06-05-16/+7
| | | | | | | | version 0.5. Closes #972.
* | Merge branch 'release/0.11' into rails-3-developLouise Crow2013-06-04-1/+1
|\|
| * Restore public body edit form.hotfix/0.11.0.1Louise Crow2013-06-03-1/+1
| |
* | Merge remote-tracking branch ↵Louise Crow2013-06-04-1/+27
|\ \ | | | | | | | | | 'openaustralia_github/more_info_on_report_request' into rails-3-develop
| * | User needs to choose a reasonMatthew Landauer2013-03-22-2/+2
| | |
| * | Reasons that request can be reported now stored in modelMatthew Landauer2013-03-22-1/+1
| | |
| * | Rename parameter used in routes and controllerMatthew Landauer2013-03-22-2/+2
| | |
| * | Rename controller actionsMatthew Landauer2013-03-22-0/+0
| | |
| * | Move reporting actions to their own controllerMatthew Landauer2013-03-22-0/+0
| | |
| * | Rename routesMatthew Landauer2013-03-22-2/+2
| | |
| * | For reporting a request link to the new formMatthew Landauer2013-03-22-1/+1
| | |
| * | Let the user know when the request has already been reportedMatthew Landauer2013-03-22-15/+19
| | |
| * | Add first pass at page for reporting a requestMatthew Landauer2013-03-22-0/+22
| | |
* | | Merge remote-tracking branch 'openaustralia_github/start_button' into ↵Louise Crow2013-06-04-6/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | rails-3-develop Conflicts: app/views/public_body/show.html.erb
| * | | Change wording on button to start request for a particular authorityMatthew Landauer2013-04-11-6/+1
| | | |
* | | | Merge branch 'feature/new-string-for-translation' into rails-3-developLouise Crow2013-05-30-1/+1
|\ \ \ \
| * | | | Markup new string for translation.Louise Crow2013-05-07-1/+1
| | | | |
* | | | | Merge branch 'fix-missing-pagination-on-pb-search' into rails-3-developLouise Crow2013-05-30-22/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Render the public body results when selecting an authority with the same ↵Louise Crow2013-05-29-22/+4
| | | | | | | | | | | | | | | | | | | | template, whether they are loaded via ajax or not. Fixes #962.
* | | | | Restore tabs to keep string for translation the same as previouslyLouise Crow2013-05-30-1/+1
|/ / / /
* | | | Move angle brackets to within translation string to avoid double escaping ↵Louise Crow2013-05-08-1/+1
| | | | | | | | | | | | | | | | and to allow them to be replaced with suitable localised alternatives.
* | | | Restore load of config (AlaveteliConfiguration is required in forward_on) - ↵Louise Crow2013-05-08-1/+1
| | | | | | | | | | | | | | | | update config to avoid redefinition of constant warnings.
* | | | Encode parameters of Twitter linkMatthew Landauer2013-05-07-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (reapplication of 3e2b161944cc4419002831d54c6bdfcd6aa30a01 as it seems to have been lost in a merge). No casting to string as there don't appear to be problems with the ':' character. Conflicts: app/views/request/_sidebar.html.erb
* | | | Add markup of string lost in merging develop to rails-3-develop.Louise Crow2013-05-07-1/+1
|/ / /
* | | Merge branch 'release/0.9' into rails-3-developLouise Crow2013-04-24-95/+115
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/controllers/public_body_controller.rb app/mailers/track_mailer.rb app/views/request/_hidden_correspondence.html.erb app/views/request/_sidebar.html.erb app/views/request/hidden.html.erb app/views/request/new_please_describe.html.erb app/views/request/preview.html.erb app/views/user/show.html.erb config/environment.rb config/routes.rb spec/controllers/public_body_controller_spec.rb
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 14:21:12 +0000