Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Respond to a (currently unsupported) json request for a public body list ↵ | Louise Crow | 2013-06-20 | -1/+3 |
| | | | | with a 406, not a 500 caused by a missing template. | |||
* | Change email address in header of source code to hello@mysociety.org | Matthew Landauer | 2013-03-26 | -1/+1 |
| | ||||
* | Merge remote-tracking branch 'mysociety/develop' into rails-3-develop | Henare Degan | 2013-03-14 | -5/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| * | Merge remote-tracking branch 'openaustralia_github/make-links-relative' into ↵ | Louise Crow | 2013-03-06 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop Conflicts: app/controllers/admin_request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml app/views/admin_general/stats.rhtml app/views/admin_public_body/_one_list.rhtml app/views/admin_public_body/_tags.rhtml app/views/admin_public_body/show.rhtml app/views/admin_request/show.rhtml app/views/admin_user/show.rhtml app/views/layouts/admin.rhtml app/views/public_body/show.rhtml app/views/request/new.rhtml | |||
| | * | Stop using main_url to generate absolute urls for the main site | Matthew Landauer | 2013-02-15 | -1/+1 |
| | | | ||||
| * | | Don't pass latest_status param to locale switching links. Fixes #789 | Matthew Landauer | 2013-02-12 | -3/+1 |
| | | | ||||
| * | | Retain filter settings when redirecting a public body to its canonical url | Matthew Landauer | 2013-02-12 | -1/+1 |
| | | | ||||
| * | | Pass parameters to method rather explicitly | Matthew Landauer | 2013-02-12 | -1/+1 |
| |/ | ||||
* | | Convert query to more activerecord 3 form | Matthew Landauer | 2013-01-31 | -2/+2 |
| | | ||||
* | | Convert query to more activerecord 3 form | Matthew Landauer | 2013-01-31 | -4/+2 |
| | | ||||
* | | The with_locale has been removed in Globalize3 | Henare Degan | 2012-12-11 | -3/+3 |
| | | | | | | | | | | | | 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. | |||
* | | Switch to new method name | Henare Degan | 2012-12-11 | -3/+3 |
|/ | ||||
* | Extract method | Matthew Landauer | 2012-10-24 | -32/+1 |
| | ||||
* | Remove svn tags that are out of date as we are now using git | Matthew Landauer | 2012-10-09 | -2/+0 |
| | ||||
* | Use faster csv for public body cvs generation, eagerly load tags and ↵ | Louise Crow | 2012-09-12 | -8/+7 |
| | | | | translations. | |||
* | Remove trailing whitespace (to make a cleaner forthcoming merge with ↵ | Seb Bacon | 2012-05-15 | -17/+17 |
| | | | | wombleton:feature/440_sparkly_admin_css) | |||
* | Make better wording at the top of the page listing subsets of public bodies. ↵ | Seb Bacon | 2012-01-30 | -4/+8 |
| | | | | At the same time, cause the tests not to rely on WDTK data. Fixes #396 | |||
* | Fix problem with typeahead searches containing " - " characters and similar. ↵ | Seb Bacon | 2012-01-11 | -7/+1 |
| | | | | Closes #328 | |||
* | Make sure paging authority list works even when using typeahead search | Seb Bacon | 2012-01-09 | -1/+1 |
| | ||||
* | now we have so many public bodies, there's not much point listing so many on ↵ | Seb Bacon | 2012-01-06 | -1/+1 |
| | | | | one page and having massive page download sizes | |||
* | Don't do wildcard searches for partial matches in type ahead searches. ↵ | Seb Bacon | 2011-12-21 | -5/+8 |
| | | | | Fixes #310. | |||
* | When listing public bodies, instead of showing only those with translations ↵ | Seb Bacon | 2011-12-02 | -6/+6 |
| | | | | in the current locale, show all those that have entries in the default locale. When there is no translation present for a locale, it will fall back to the default translation. Fixes #280. | |||
* | Throw exception if body not found, 404 are handled on the ApplicationController | David Cabo | 2011-09-26 | -9/+3 |
| | ||||
* | Show 404 instead of error page when body can't be found. Fixes #196 | David Cabo | 2011-09-25 | -1/+4 |
| | ||||
* | Handle localized urls when showing public body email. Fixes #195 | David Cabo | 2011-09-25 | -2/+6 |
| | ||||
* | Remove invalid collate argument for public body searches | David Cabo | 2011-09-23 | -1/+1 |
| | | | | The existing bug wasn't catched by the tests, because it only fails when running in dev: otherwise all the classes are loaded before the search is done, and acts_as_xapian can find the provided 'request_collapse' argument, even if the PublicBody class doesn't define it, since all the init options end up together in acts_as_xapian. | |||
* | Wrap categories loading into singleton and add support for multiple locales ↵ | David Cabo | 2011-09-19 | -2/+2 |
| | | | | simultaneously. Fixes #178 | |||
* | Hide Internal Admin from user, but using SQL conditions instead, fixes #173 | David Cabo | 2011-09-07 | -2/+4 |
| | ||||
* | Hide Internal Admin body from the user, fixes #173 | David Cabo | 2011-09-06 | -1/+2 |
| | ||||
* | Merge branch 'develop' of github.com:sebbacon/alaveteli into develop | David Cabo | 2011-09-03 | -0/+1 |
|\ | ||||
| * | Fixes to get tests pass following new design changes | Seb Bacon | 2011-09-01 | -0/+1 |
| | | ||||
* | | Merge branch 'asktheeu-new-design' into develop (update New Request workflow ↵ | David Cabo | 2011-09-01 | -0/+12 |
|\ \ | |/ |/| | | | to match new wireframes) | |||
| * | implementing new request wireframes: new page to select authority to write to | David Cabo | 2011-08-02 | -0/+12 |
| | | ||||
| * | Add cache headers to various pages (in three categories: short, medium, and ↵ | Seb Bacon | 2011-07-25 | -0/+2 |
| | | | | | | | | long). | |||
* | | Merge branch 'develop' into new-base-design-seb | Seb Bacon | 2011-08-30 | -1/+1 |
|\ \ | ||||
| * | | Additional changes omitted from commit ↵ | Seb Bacon | 2011-08-30 | -1/+1 |
| | | | | | | | | | | | | 9d8388c03d0faeaca29d233a340c58bd65f28a97 (distinguish 404s and 500s), fixes #161. | |||
* | | | Correct previous bad merges | Seb Bacon | 2011-08-29 | -1/+3 |
|/ / | ||||
* | | Add tests & fixes for new search/filtering functionality | Seb Bacon | 2011-08-29 | -6/+6 |
| | | ||||
* | | Further work in progress on better search functionality | Seb Bacon | 2011-08-29 | -11/+7 |
| | | ||||
* | | more work in progress on search forms | Seb Bacon | 2011-08-29 | -10/+19 |
| | | ||||
* | | Add cache headers to various pages (in three categories: short, medium, and ↵ | Seb Bacon | 2011-07-26 | -0/+2 |
|/ | | | | long). | |||
* | initial merge of Kosovan branch; still need to get tests passing, factor out ↵ | Seb Bacon | 2011-07-06 | -3/+6 |
|\ | | | | | | | Kosovan-specific code | |||
| * | I18n string for controllers | Faton Selishta | 2011-06-30 | -1/+1 |
| | | ||||
| * | I18n fix | Faton Selishta | 2011-06-02 | -1/+1 |
| | | ||||
| * | added i18n strings in controller's template | Faton Selishta | 2011-04-26 | -1/+1 |
| | | ||||
* | | ensure all with_locale calls end with explicit render | Seb Bacon | 2011-06-13 | -7/+8 |
| | | ||||
* | | Make sure the template rendering happens within the scope of | Seb Bacon | 2011-06-13 | -5/+8 |
|/ | | | | | with_locale, so it's rendered using the correct locale. (+ test for this) | |||
* | fix bad merges from rebase with master | Seb Bacon | 2011-03-10 | -1/+1 |
| | ||||
* | new i18n tests for controllers and associated fixes | Seb Bacon | 2011-03-10 | -47/+56 |
| | ||||
* | Factor out some of the JSON generation | Francis Irving | 2010-10-20 | -17/+1 |
| |