aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| | * | | | | | | | | | | | | | | Make marking an event as a clarification a RESTful routeLouise Crow2014-12-18-18/+85
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Make hide a RESTful action accessed via POSTLouise Crow2014-12-12-6/+6
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Make show_raw_email a RESTful action via GETLouise Crow2014-12-12-83/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move specs that involve receiving email and then viewing the interface to be integration specs, which is what they really are.
| | * | | | | | | | | | | | | | | RESTful routing for editing and updating.Louise Crow2014-12-12-6/+4
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | RESTful routing for editing and updating commentsLouise Crow2014-12-12-35/+119
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Move generate_upload_url action to be RESTfulLouise Crow2014-12-12-3/+8
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Make move a RESTful actionLouise Crow2014-12-12-5/+4
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Use RESTful routing for destroy actionLouise Crow2014-12-12-5/+4
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Use RESTful routing for resend actionLouise Crow2014-12-12-34/+35
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Use RESTful routing for index and show actionsLouise Crow2014-12-12-45/+42
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'admin-public-holiday-interface' into rails-3-developLouise Crow2014-12-18-601/+1015
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Add holidays admin linkLouise Crow2014-12-15-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use dropdown to group related authority pages.
| | * | | | | | | | | | | | | | | | Remove bootstrap libs in favour of using the bootstrap-sass gem.Louise Crow2014-12-15-538/+2
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add red outline for admin fields with errorsLouise Crow2014-12-15-0/+4
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Allow import of holidays from feed or built-in suggestionsLouise Crow2014-12-15-10/+497
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add description of the effect of public holidaysLouise Crow2014-12-15-0/+15
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add some inline editingLouise Crow2014-12-15-10/+72
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add create actionLouise Crow2014-12-15-0/+48
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add new actionLouise Crow2014-12-15-0/+33
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add basic destroy action.Louise Crow2014-12-15-0/+32
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add basic update action.Louise Crow2014-12-15-2/+56
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add basic edit actionLouise Crow2014-12-15-2/+71
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add index method for listing existing holidaysLouise Crow2014-12-15-0/+111
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add validation for presence of day.Louise Crow2014-12-15-61/+74
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add routes for admin of holidaysLouise Crow2014-12-15-0/+15
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'hotfix/0.20.0.1' into rails-3-developLouise Crow2014-12-18-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rails-3-develop' of ↵Louise Crow2014-12-15-5/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gettext_clean_theme' into rails-3-developGareth Rees2014-12-12-5/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Extract duplication in gettext theme tasksGareth Rees2014-12-11-11/+10
| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Add task to clean theme translationsGareth Rees2014-12-11-0/+16
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'misc-fixes' into rails-3-developLouise Crow2014-12-15-301/+453
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Refactor the application of masks and censor rules to messages.Louise Crow2014-12-15-270/+371
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems more logical to make this one method that figures out what to do based on file type. Plus, incoming message does so many things, it seemed like having these related methods be separate would make them easier to read and understand. Also, email, mobile and login substitution texts weren't being translated. Finally, I think passing the censor rules and masks as arguments is a first step in some more decoupling of models.
| | * | | | | | | | | | | | | | | | | | Enforce a lifetime on session cookiesLouise Crow2014-12-12-9/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem described in http://seclists.org/fulldisclosure/2013/Sep/145 Pattern taken from https://www.coffeepowered.net/2013/09/26/rails-session-cookies/
| | * | | | | | | | | | | | | | | | | | Remove obsolete 'require' statementLouise Crow2014-12-12-2/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Only mark email_subject_request as HTML safe when used in email subject.Louise Crow2014-12-12-20/+26
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's also used in the web interface and needs to be escaped there.
| * | | | | | | | | | | | | | | | | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-12-11-5/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| | * | | | | | | | | | | | | | | | | Merge branch '2022-fragmented-translation' into rails-3-developGareth Rees2014-12-11-2/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Improve translation on /details/request/:idGareth Rees2014-12-11-2/+7
| | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better to translate the full string
| | * | | | | | | | | | | | | | | | | Merge branch '2021-fragmented-translation' into rails-3-developGareth Rees2014-12-11-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Unify add annotation <title> and <h1>Gareth Rees2014-12-11-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same msgids so that translators only have to translate one thing.
| | | * | | | | | | | | | | | | | | | Translate annotation ‘to’ headingGareth Rees2014-12-11-2/+4
| | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge branch 'catch-openuri-timeout-errors' into rails-3-developLouise Crow2014-12-11-3/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Use exception notification for third party url errorsLouise Crow2014-11-14-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include URL and error in notification and log.
| | * | | | | | | | | | | | | | | | Catch timeouts in quietly_try_to_purgeIan Chard2014-11-03-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although many times of errors are caught, the case where a connection is made but no reply is received resulted in an uncaught Timeout::Error.
| * | | | | | | | | | | | | | | | | Merge branch 'sanitize-non-utf8-request-uri' into rails-3-developLouise Crow2014-12-09-8/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | fixup! Use rack-utf8_sanitizer gemLouise Crow2014-11-18-1/+1
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Use rack-utf8_sanitizer gemLouise Crow2014-11-18-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sanitises non utf-8 params before they're processed by Rails.
| * | | | | | | | | | | | | | | | | | Merge branch 'owasp-fixes' into rails-3-developLouise Crow2014-12-09-11/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Don't display specific error messages in production.Louise Crow2014-12-05-7/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Add secureheadersLouise Crow2014-12-05-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue some security-related headers by default.