Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
| | * | | Couple of typos in bits of code. | Matthew Somerville | 2011-07-19 | -2/+3 | |
| | | | | |||||
| * | | | use belongs_to_council in admin update list | Struan Donald | 2011-07-27 | -1/+1 | |
| | | | | |||||
| * | | | allow council user to update state on problem sent to multiple councils | Struan Donald | 2011-07-27 | -5/+59 | |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-07-26 | -2811/+3668 | |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | brief documentation on states | Struan Donald | 2011-07-01 | -0/+74 | |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-07-01 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | | | | | | into new_statuses | ||||
| * | | | | check we have a council user before comparing with problem council | Struan Donald | 2011-06-30 | -1/+1 | |
| | | | | | |||||
| * | | | | rename constraint in line with how postgres would name it | Struan Donald | 2011-06-30 | -1/+1 | |
| | | | | | |||||
| * | | | | another syntax error | Struan Donald | 2011-06-30 | -1/+1 | |
| | | | | | |||||
| * | | | | syntax error | Struan Donald | 2011-06-30 | -1/+1 | |
| | | | | | |||||
| * | | | | indicate if update is from problem owner or council user | Struan Donald | 2011-06-30 | -0/+4 | |
| | | | | | |||||
| * | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-06-30 | -219/+487 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses Conflicts: perllib/FixMyStreet/App/Controller/Reports.pm | ||||
| * | | | | | some extra info on updates | Struan Donald | 2011-06-30 | -1/+85 | |
| | | | | | | |||||
| * | | | | | make sure cobrand summary tests pass even if we have barnet entries in db | Struan Donald | 2011-06-29 | -0/+3 | |
| | | | | | | |||||
| * | | | | | use is_fixed | Struan Donald | 2011-06-28 | -2/+2 | |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-06-28 | -279/+837 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+152 | |
| | | | | | | | |||||
| * | | | | | | correctly set mark_open/fixed in questionnaire generates updates | Struan Donald | 2011-06-28 | -2/+12 | |
| | | | | | | | |||||
| * | | | | | | store correct old state in questionnaire when creator marks problem as fixed | Struan Donald | 2011-06-28 | -1/+46 | |
| | | | | | | | |||||
| * | | | | | | display update marked as fixed text on questionnaire for all fixed states | Struan Donald | 2011-06-28 | -1/+50 | |
| | | | | | | | |||||
| * | | | | | | council users should be able to set state to confirmed | Struan Donald | 2011-06-27 | -1/+13 | |
| | | | | | | | |||||
| * | | | | | | 404 if no token | Struan Donald | 2011-06-27 | -1/+1 | |
| | | | | | | | |||||
| * | | | | | | user searching and editing | Struan Donald | 2011-06-27 | -0/+221 | |
| | | | | | | | |||||
| * | | | | | | allow user changes to be logged | Struan Donald | 2011-06-27 | -0/+13 | |
| | | | | | | | |||||
| * | | | | | | update users table to user from_council | Struan Donald | 2011-06-27 | -1/+1 | |
| | | | | | | | |||||
| * | | | | | | Display council name next to updates from council users | Struan Donald | 2011-06-27 | -0/+22 | |
| | | | | | | | |||||
| * | | | | | | change to use from_council in users table and store the council id in | Struan Donald | 2011-06-27 | -20/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -215/+260 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses Conflicts: perllib/FixMyStreet/DB/Result/Comment.pm perllib/FixMyStreet/DB/Result/User.pm web/css/core.css | ||||
| * | | | | | | | add extra states to problem count | Struan Donald | 2011-06-23 | -1/+1 | |
| | | | | | | | | |||||
| * | | | | | | | indicate changes state in update meta information | Struan Donald | 2011-06-23 | -0/+68 | |
| | | | | | | | | |||||
| * | | | | | | | check that state is permitted | Struan Donald | 2011-06-23 | -1/+41 | |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-06-23 | -10/+37 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses | ||||
| * | | | | | | | | in progress banner | Struan Donald | 2011-06-23 | -0/+42 | |
| | | | | | | | | | |||||
| * | | | | | | | | update problem status from update | Struan Donald | 2011-06-23 | -1/+57 | |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-06-23 | -20/+13 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses | ||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-06-23 | -174/+105 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses Conflicts: templates/web/default/report/display.html | ||||
| * | | | | | | | | | | add problem state_column to comment | Struan Donald | 2011-06-23 | -2/+30 | |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | prevent non authority users from changing the state on updates | Struan Donald | 2011-06-23 | -0/+43 | |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | only display states that can be set | Struan Donald | 2011-06-23 | -2/+1 | |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | display state dropdown on updates to authority users | Struan Donald | 2011-06-23 | -7/+45 | |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | display banner on closed problems | Struan Donald | 2011-06-22 | -185/+121 | |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | is_closed utility method | Struan Donald | 2011-06-22 | -90/+69 | |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | correct check for is fixed | Struan Donald | 2011-06-22 | -1/+1 | |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | add from_authority flag to users table for council employees etc | Struan Donald | 2011-06-22 | -2/+11 | |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | add new states into admin | Struan Donald | 2011-06-22 | -5/+10 | |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into new_statuses | Struan Donald | 2011-06-22 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | remove hard coded confirmeds from questionnaire | Struan Donald | 2011-06-21 | -4/+6 | |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-06-21 | -120/+132 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses | ||||
| * | | | | | | | | | | | | check for open states instead of confirmed | Struan Donald | 2011-06-21 | -7/+9 | |
| | | | | | | | | | | | | |