Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'rss-addresses' | Struan Donald | 2011-11-30 | -5/+63 |
|\ | | | | | | | | | | | Conflicts: db/schema.sql perllib/FixMyStreet/DB/Result/Problem.pm | |||
| * | move format postcode to cobrand so can be overridden if outside uk | Struan Donald | 2011-11-29 | -14/+4 |
| | | ||||
| * | tidy up nearest street and postcode adding code | Struan Donald | 2011-11-29 | -10/+26 |
| | | ||||
| * | add in postcode to email alert titles | Struan Donald | 2011-11-28 | -3/+5 |
| | | ||||
| * | commented out code to add addresses to alerts | Struan Donald | 2011-09-21 | -1/+28 |
| | | ||||
| * | Merge remote branch 'origin/master' into rss-addresses | Struan Donald | 2011-09-20 | -7/+5 |
| |\ | ||||
| * | | geocode column to bytea type | Struan Donald | 2011-09-19 | -3/+3 |
| | | | ||||
| * | | sort of working rss address stuff with db caching and populate script | Struan Donald | 2011-09-09 | -2/+26 |
| | | | ||||
* | | | put filter column after loader hash | Struan Donald | 2011-10-19 | -3/+3 |
| | | | ||||
* | | | Merge remote branch 'origin/master' into open311-consumer | Struan Donald | 2011-10-10 | -7/+5 |
|\ \ \ | | |/ | |/| | ||||
| * | | Decode template files read in with read_file, to prevent double encoding ↵ | Matthew Somerville | 2011-09-20 | -6/+4 |
| | | | | | | | | | | | | (fixes #159). Also fix Welsh I18N test. | |||
| * | | Don't fail if the result is empty. | Matthew Somerville | 2011-09-15 | -1/+1 |
| |/ | ||||
* | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-09-08 | -2/+5 |
|\| | | | | | | | | | | | | | | | into open311-consumer Conflicts: web/css/core.css web/js/fixmystreet.js | |||
| * | Show datetimes on front page, fewer headings. | Matthew Somerville | 2011-09-06 | -2/+5 |
| | | ||||
* | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-22 | -19/+216 |
|\| | | | | | | | | | | | | | | | | | into open311-consumer Conflicts: t/app/model/problem.t templates/web/default/report/new/fill_in_details.html web/css/core.css | |||
| * | few more static states | Struan Donald | 2011-08-18 | -1/+1 |
| | | ||||
| * | remove hard coded references to fixed | Struan Donald | 2011-08-18 | -3/+4 |
| | | ||||
| * | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-17 | -1/+5 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| * | | use the correct council separator character | Struan Donald | 2011-07-27 | -1/+1 |
| | | | ||||
| * | | allow council user to update state on problem sent to multiple councils | Struan Donald | 2011-07-27 | -0/+19 |
| | | | ||||
| * | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-07-26 | -4/+32 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses Conflicts: perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/App/Controller/JSON.pm perllib/FixMyStreet/Map/Tilma/Original.pm web/css/core.css | |||
| * \ \ | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-06-28 | -11/+12 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses Conflicts: perllib/FixMyStreet/App/Controller/Report/Update.pm templates/web/default/report/display.html | |||
| * | | | | indicate problem has been closed in alert | Struan Donald | 2011-06-28 | -5/+8 |
| | | | | | ||||
| * | | | | Display council name next to updates from council users | Struan Donald | 2011-06-27 | -0/+17 |
| | | | | | ||||
| * | | | | change to use from_council in users table and store the council id in | Struan Donald | 2011-06-27 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | there so we can check that the problem is for the council the user is from | |||
| * | | | | remove merge cruft | Struan Donald | 2011-06-27 | -1/+0 |
| | | | | | ||||
| * | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-06-27 | -38/+48 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses Conflicts: perllib/FixMyStreet/DB/Result/Comment.pm perllib/FixMyStreet/DB/Result/User.pm web/css/core.css | |||
| * | | | | | indicate changes state in update meta information | Struan Donald | 2011-06-23 | -0/+16 |
| | | | | | | ||||
| * | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-06-23 | -1/+17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses Conflicts: templates/web/default/report/display.html | |||
| * | | | | | | add problem state_column to comment | Struan Donald | 2011-06-23 | -2/+4 |
| | | | | | | | ||||
| * | | | | | | is_closed utility method | Struan Donald | 2011-06-22 | -0/+31 |
| | | | | | | | ||||
| * | | | | | | add from_authority flag to users table for council employees etc | Struan Donald | 2011-06-22 | -2/+4 |
| | | | | | | | ||||
| * | | | | | | unconfirmed is not really an open state | Struan Donald | 2011-06-21 | -1/+0 |
| | | | | | | | ||||
| * | | | | | | stop using hard coded names for fixed/visible states ( work in progress ) | Struan Donald | 2011-06-16 | -8/+10 |
| | | | | | | | ||||
| * | | | | | | rename will not fix to closed | Struan Donald | 2011-06-16 | -1/+1 |
| | | | | | | | ||||
| * | | | | | | handle new states in report display and updating | Struan Donald | 2011-06-16 | -20/+88 |
| | | | | | | | ||||
| * | | | | | | send questionnaires for all open states | Struan Donald | 2011-06-15 | -1/+17 |
| | | | | | | | ||||
| * | | | | | | docs and formatting | Struan Donald | 2011-06-15 | -5/+11 |
| | | | | | | | ||||
| * | | | | | | update report display to handle new statuses | Struan Donald | 2011-06-15 | -0/+15 |
| | | | | | | | ||||
* | | | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-16 | -0/+4 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into open311-consumer Conflicts: db/schema.sql perllib/FixMyStreet/DB/Result/Problem.pm | |||
| * | | | | | | add flagged flags to problems and users | Struan Donald | 2011-08-09 | -0/+4 |
| | | | | | | | ||||
* | | | | | | | move problem update into problem model and add some tests, plus attempt some ↵ | Struan Donald | 2011-08-11 | -0/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | timezone things | |||
* | | | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-04 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | into open311-consumer | |||
| * | | | | | | Relationship is has_one, not has_many, was causing wrong nearby photos to ↵ | Matthew Somerville | 2011-08-03 | -1/+1 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | appear on alert page. | |||
* | | | | | | add in extra field to contacts for storing open311 meta data | Struan Donald | 2011-08-01 | -2/+23 |
| | | | | | | ||||
* | | | | | | open311conf id to type serial | Struan Donald | 2011-07-29 | -3/+8 |
| | | | | | | ||||
* | | | | | | add in table to store configuration of councils using open311 | Struan Donald | 2011-07-29 | -0/+34 |
| | | | | | | ||||
* | | | | | | add extra column to problem for storing addition open311 meta information | Struan Donald | 2011-07-29 | -2/+24 |
|/ / / / / | ||||
* | | | | | Don't use update name if marked as anonymous. | Matthew Somerville | 2011-07-16 | -2/+3 |
| | | | | | ||||
* | | | | | Unique users of problem reports, and summary table by category. Fixes #108. | Matthew Somerville | 2011-07-12 | -2/+29 |
| |_|_|/ |/| | | |