Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'open311-consumer' | Struan Donald | 2011-10-20 | -2/+809 |
|\ | ||||
| * | fix some failing encoding tests | Struan Donald | 2011-10-20 | -2/+3 |
| | | ||||
| * | if we have two conflicting existing contacts then skip the update | Struan Donald | 2011-10-11 | -4/+63 |
| | | ||||
| * | reduce duplicate code | Struan Donald | 2011-10-11 | -135/+38 |
| | | ||||
| * | test existing contacts are deleted | Struan Donald | 2011-10-11 | -1/+71 |
| | | | | | | | | udpate service code for contact with same category | |||
| * | handle change of service name for existing service code | Struan Donald | 2011-10-11 | -0/+75 |
| | | ||||
| * | rewrite populate service list to enable testing and add some tests | Struan Donald | 2011-10-10 | -0/+148 |
| | | ||||
| * | Merge remote branch 'origin/master' into open311-consumer | Struan Donald | 2011-10-10 | -25/+81 |
| |\ | ||||
| * \ | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-09-08 | -22/+59 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into open311-consumer Conflicts: web/css/core.css web/js/fixmystreet.js | |||
| * | | | fix failing test and remove debug code | Struan Donald | 2011-08-22 | -4/+4 |
| | | | | ||||
| * | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-22 | -64/+1069 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into open311-consumer Conflicts: t/app/model/problem.t templates/web/default/report/new/fill_in_details.html web/css/core.css | |||
| * \ \ \ | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-16 | -14/+192 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into open311-consumer Conflicts: db/schema.sql perllib/FixMyStreet/DB/Result/Problem.pm | |||
| * | | | | | shuffle problem update code about to make it easier to test and write some tests | Struan Donald | 2011-08-12 | -0/+198 |
| | | | | | | ||||
| * | | | | | delete user created in test | Struan Donald | 2011-08-12 | -0/+1 |
| | | | | | | ||||
| * | | | | | move problem update into problem model and add some tests, plus attempt some ↵ | Struan Donald | 2011-08-11 | -0/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | timezone things | |||
| * | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-09 | -6/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into open311-consumer | |||
| * \ \ \ \ \ | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-09 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into open311-consumer Conflicts: web/css/core.css | |||
| * | | | | | | | check that the generated select has all the elements we expect | Struan Donald | 2011-08-04 | -0/+9 |
| | | | | | | | | ||||
| * | | | | | | | unit tests for extra open311 fields in report pages | Struan Donald | 2011-08-04 | -0/+158 |
| | | | | | | | | ||||
| * | | | | | | | configure open311 endpoint etc in admin interface | Struan Donald | 2011-08-04 | -0/+53 |
| | | | | | | | | ||||
| * | | | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-04 | -1/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into open311-consumer | |||
| * \ \ \ \ \ \ \ | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-03 | -1/+4 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into open311-consumer | |||
| * | | | | | | | | | add simple open311 test, add some error checking and reduce repeated code | Struan Donald | 2011-08-02 | -0/+24 |
| | | | | | | | | | | ||||
* | | | | | | | | | | Stop warnings if org is not provided. | Matthew Somerville | 2011-10-10 | -5/+5 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||
* | | | | | | | | | Decode template files read in with read_file, to prevent double encoding ↵ | Matthew Somerville | 2011-09-20 | -5/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fixes #159). Also fix Welsh I18N test. | |||
* | | | | | | | | | Change JSON response header for browsing map, so is not double-encoded. Add ↵ | Matthew Somerville | 2011-09-12 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests for it. | |||
* | | | | | | | | | Fix redirect of old Open311 URIs when they have query parameters. | Matthew Somerville | 2011-09-12 | -0/+13 |
| | | | | | | | | | ||||
* | | | | | | | | | Fix tests, and remove unwanted height. | Matthew Somerville | 2011-09-08 | -15/+17 |
| | | | | | | | | | ||||
* | | | | | | | | | Tidy up a bit of CSS. | Matthew Somerville | 2011-09-08 | -4/+4 |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||
* | | | | | | | | display link to site for all visible states plus fix a few other hardcoded | Struan Donald | 2011-09-05 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | states. fixes #154 | |||
* | | | | | | | | Fix questionnaire test (broke due to being 6 months after fixed date); more ↵ | Matthew Somerville | 2011-09-02 | -17/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes to update tests. | |||
* | | | | | | | | more sensible test for non authority users making forbidden state changes | Struan Donald | 2011-09-02 | -5/+1 |
| | | | | | | | | ||||
* | | | | | | | | test for removing flag and make it work | Struan Donald | 2011-08-26 | -0/+14 |
| | | | | | | | | ||||
* | | | | | | | | add flagged checkbox to user edit admin page | Struan Donald | 2011-08-26 | -0/+20 |
| |_|_|_|_|_|/ |/| | | | | | | ||||
* | | | | | | | correct council list delimiter | Struan Donald | 2011-08-19 | -2/+2 |
| | | | | | | | ||||
* | | | | | | | use correct skip | Struan Donald | 2011-08-18 | -60/+62 |
| | | | | | | | ||||
* | | | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-17 | -24/+205 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses Conflicts: db/schema.sql perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/DB/Result/User.pm t/app/controller/admin.t templates/web/default/admin/update_edit.html web/css/core.css | |||
| * | | | | | | Merge branch 'admin_abuse_additions' | Matthew Somerville | 2011-08-09 | -14/+192 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | ||||
| | * | | | | | add remove user flag button to report and update edit pages | Struan Donald | 2011-08-09 | -4/+41 |
| | | | | | | | ||||
| | * | | | | | allow flagging of user from report and update pages | Struan Donald | 2011-08-09 | -0/+39 |
| | | | | | | | ||||
| | * | | | | | extra test for auto flagging | Struan Donald | 2011-08-09 | -1/+3 |
| | | | | | | | ||||
| | * | | | | | auto flag reported problems | Struan Donald | 2011-08-09 | -0/+9 |
| | | | | | | | ||||
| | * | | | | | add flagged checkbox for report editing | Struan Donald | 2011-08-09 | -14/+45 |
| | | | | | | | ||||
| | * | | | | | list flagged items page for admin | Struan Donald | 2011-08-09 | -0/+12 |
| | | | | | | | ||||
| | * | | | | | abuse table search | Struan Donald | 2011-08-09 | -0/+6 |
| | | | | | | | ||||
| | * | | | | | add a ban email address button | Struan Donald | 2011-08-09 | -0/+42 |
| | | | | | | | ||||
| * | | | | | | Fix broken lack of paragraphing, fixes #140. | Matthew Somerville | 2011-08-09 | -5/+5 |
| |/ / / / / | ||||
| * | | | / | Lowercase email addresses sent via /import. Fixes #146. | Matthew Somerville | 2011-08-09 | -1/+1 |
| | |_|_|/ | |/| | | | ||||
| * | | | | Probably wise not to have a test dependent on another server not ↵ | Matthew Somerville | 2011-08-05 | -1/+1 |
| | |_|/ | |/| | | | | | | | | | | reorganising its db internally :) | |||
| * | | | Make sure Message-ID is set on outgoing messages. | Matthew Somerville | 2011-08-03 | -1/+2 |
| | |/ | |/| |