aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/general_controller.rb
Commit message (Collapse)AuthorAgeLines
* Fix /blog breaking if the blog has no postsGareth Rees2014-09-12-1/+1
|
* Handle unhelpful stemmingGareth Rees2014-06-25-1/+1
| | | | | | | Stemming returns 'bore' as the word to highlight which can't be matched in the original phrase. Also removes duplicates from the results
* Use regex based highlightingGareth Rees2014-06-25-1/+1
|
* Rename XXX comments with TODO:Gareth Rees2014-06-10-3/+3
| | | | Picks these up in `rake notes` and adds semantic meaning
* Add confirmed_user_count to /version.jsonGareth Rees2014-05-23-1/+2
|
* Add visible_request_count to /version.jsonGareth Rees2014-05-23-1/+2
|
* Move make_query_from_params to XapianQueriesLouise Crow2013-12-19-1/+1
| | | | | | | | | | This is involved with the construction of meaningful xapian queries with respect to InfoRequestEvents. This commit also removes the get_tags_from_params method, which presumably was targeted at PublicBodies, but doesn't seem to actually be used anywhere. XapianQueries is used to extend InfoRequestEvent in order to prevent InfoRequestEvent becoming too unwieldy and to preserve the association between these methods.
* Only show the blog if a BLOG_FEED is configured.Louise Crow2013-12-09-0/+4
|
* Move getting recent requests into a helper method.Louise Crow2013-11-25-24/+0
|
* Move getting popular bodies into a model method.Louise Crow2013-11-25-21/+0
|
* Show highlights and correction regardless of search type.Louise Crow2013-11-07-5/+6
| | | | Contributes to #1118.
* Remove unused line of codeLouise Crow2013-07-30-1/+0
|
* Merge remote-tracking branch 'openaustralia_github/app_version_api_feature' ↵Louise Crow2013-06-18-0/+9
|\ | | | | | | | | | | | | | | | | into rails-3-develop Conflicts: app/controllers/application_controller.rb app/controllers/general_controller.rb config/routes.rb
| * Add publicly accesible json api to query alaveteli and ruby version. ↵Matthew Landauer2013-02-24-1/+9
| | | | | | | | Implements #834
* | Remove support for theme stylesheet inclusion via template deprecated in ↵Louise Crow2013-06-05-6/+0
| | | | | | | | version 0.5. Closes #972.
* | Merge remote-tracking branch ↵Louise Crow2013-06-04-5/+3
|\ \ | | | | | | | | | 'openaustralia_github/inline_search_method_refactor' into rails-3-develop
| * | ActsAsXapian doesn't need to be referenced from the global namespaceMatthew Landauer2013-03-25-1/+1
| | |
| * | Tiny refactorMatthew Landauer2013-03-25-4/+2
| | |
* | | Merge remote-tracking branch ↵Louise Crow2013-05-30-6/+0
|\ \ \ | | | | | | | | | | | | 'openaustralia_github/remove_random_request_action' into rails-3-develop
| * | | Remove apparently unused action for showing random requestMatthew Landauer2013-03-22-6/+0
| |/ /
* | | Handle routing errors with our custom template too.Louise Crow2013-05-02-0/+6
| | |
* | | Remove debian-specific require clause and use Gemfile to specify ↵Louise Crow2013-04-30-7/+0
| | | | | | | | | | | | non-standard require - bundler should be supplying the gem now.
* | | Change email address in header of source code to hello@mysociety.orgMatthew Landauer2013-03-26-1/+1
|/ /
* | Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-03-14-4/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/controllers/admin_request_controller.rb app/controllers/admin_track_controller.rb app/controllers/request_controller.rb app/controllers/services_controller.rb app/helpers/link_to_helper.rb app/mailers/request_mailer.rb app/models/application_mailer.rb app/models/info_request.rb app/views/admin_censor_rule/edit.html.erb app/views/admin_censor_rule/new.html.erb app/views/admin_public_body/_form.html.erb app/views/admin_public_body/_locale_selector.html.erb app/views/admin_public_body/_one_list.html.erb app/views/admin_public_body/edit.html.erb app/views/admin_public_body/list.html.erb app/views/admin_public_body/new.html.erb app/views/admin_request/_incoming_message_actions.html.erb app/views/admin_request/edit.html.erb app/views/admin_request/edit_comment.html.erb app/views/admin_request/edit_outgoing.html.erb app/views/admin_request/list.html.erb app/views/admin_request/list_old_unclassified.html.erb app/views/admin_request/show.html.erb app/views/admin_track/_some_tracks.html.erb app/views/admin_track/list.html.erb app/views/admin_user/edit.html.erb app/views/admin_user/list.html.erb app/views/admin_user/show.html.erb app/views/general/_footer.html.erb app/views/general/exception_caught.html.erb app/views/help/contact.html.erb app/views/layouts/default.html.erb app/views/public_body/_alphabet.html.erb app/views/request/_request_listing_single.html.erb app/views/request/_sidebar.html.erb app/views/request/new.html.erb app/views/request/show.html.erb app/views/request_mailer/external_response.rhtml app/views/request_mailer/fake_response.rhtml config/environment.rb config/environments/production.rb config/routes.rb spec/controllers/admin_censor_rule_controller_spec.rb spec/controllers/request_controller_spec.rb spec/controllers/track_controller_spec.rb spec/helpers/link_to_helper_spec.rb spec/mailers/request_mailer_spec.rb spec/models/info_request_spec.rb spec/spec_helper.rb spec/views/public_body/show.html.erb_spec.rb spec/views/request/show.html.erb_spec.rb vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
| * | Move serving of js for admin interface from general to admin_general controllerMatthew Landauer2013-02-19-6/+0
| | |
| * | Merge in adminbootstraptheme 323d704ab4f1ffe31f20fcabeaf030c462dfbadf into ↵Matthew Landauer2013-02-19-1/+5
| |/ | | | | | | main project
| * Pass parameters to method rather explicitlyMatthew Landauer2013-02-12-2/+2
| |
* | Rename Configuration class to avoid conflict with ActiveSupport::ConfigurableHenare Degan2013-03-03-3/+3
| |
* | Merge branch 'develop' into rails-3-spikeHenare Degan2013-02-15-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/controllers/general_controller.rb app/controllers/track_controller.rb app/models/outgoing_message.rb app/models/public_body.rb app/models/user.rb app/views/general/frontpage.rhtml config/environment.rb config/initializers/inflections.rb config/initializers/mime_types.rb db/migrate/094_remove_old_tags_foreign_key.rb lib/timezone_fixes.rb spec/models/request_mailer_spec.rb spec/views/request/list.rhtml_spec.rb
| * Fix typo.Louise Crow2013-01-17-1/+1
| |
| * Remove interlock as it's not compatible with Rails 3 and is unmaintainedHenare Degan2013-01-18-45/+43
| |
* | Handling of globbed parameters in routes has changedMatthew Landauer2013-02-01-0/+1
| |
* | Globbing in routes is slightly different in Rails 3Matthew Landauer2013-01-31-1/+1
| |
* | Change that should have been merged in from develop when one form of caching ↵Matthew Landauer2013-01-31-22/+20
| | | | | | | | was removed
* | Merge branch 'i18n_rails3_preparation' into rails-3-spikeMatthew Landauer2013-01-31-20/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/controllers/general_controller.rb app/controllers/public_body_controller.rb spec/controllers/public_body_controller_spec.rb
| * | Set locale with I18n rather than through globalizeMatthew Landauer2013-01-17-1/+1
| |/
* | The with_locale has been removed in Globalize3Henare Degan2012-12-11-1/+1
| | | | | | | | | | | | I think Globalize is supposed to pick up the locale from I18n anyway so I don't know if these are needed. I think I still haven't done the right thing but it's time to move on.
* | Remove interlock as it's not compatible with Rails 3 and is unmaintainedHenare Degan2012-12-11-45/+43
| |
* | Switch to new method nameHenare Degan2012-12-11-1/+1
|/
* Remove debugging action that could easily DOS a serverHenare Degan2012-11-18-6/+0
|
* Always have the newest events at the top of the listMatthew Landauer2012-10-26-0/+2
|
* Don't show internal admin authority on auto generated list on home pageMatthew Landauer2012-10-17-1/+1
|
* Handle the case where the blog feed already has querystring parameters.Louise Crow2012-10-11-1/+3
|
* Remove svn tags that are out of date as we are now using gitMatthew Landauer2012-10-09-2/+0
|
* Merge remote-tracking branch 'openaustralia_github/configuration_refactor' ↵Louise Crow2012-10-01-3/+3
|\ | | | | | | | | | | | | into develop Conflicts: config/general.yml-example
| * Extract configuration with defaults into one moduleMatthew Landauer2012-09-25-3/+3
| |
* | When the list of requests on the frontpage is being filled out with not just ↵Matthew Landauer2012-09-29-0/+3
| | | | | | | | | | | | successful requests make the text and the link reflect that
* | Use new info_requests_count counter cache column on public body when ↵Louise Crow2012-09-26-2/+1
|/ | | | generating front page.
* Show the admin navigation bar when browsing the main site. Fixes #512Seb Bacon2012-06-27-1/+1
|
* Remove trailing whitespace (to make a cleaner forthcoming merge with ↵Seb Bacon2012-05-15-8/+8
| | | | wombleton:feature/440_sparkly_admin_css)