aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'new_statuses'Struan Donald2011-08-19-149/+2376
|\
| * correct council list delimiterStruan Donald2011-08-19-2/+2
| |
| * few more static statesStruan Donald2011-08-18-4/+4
| |
| * regenerate cssStruan Donald2011-08-18-9/+649
| |
| * use correct skipStruan Donald2011-08-18-60/+62
| |
| * show closed problems on my pageStruan Donald2011-08-18-1/+6
| |
| * do not use raw problem state to categorise problemsStruan Donald2011-08-18-1/+2
| |
| * avoid warnings about uninitalized valuesStruan Donald2011-08-18-1/+1
| |
| * remove hard coded state stringsStruan Donald2011-08-18-7/+10
| |
| * remove hard coded references to fixedStruan Donald2011-08-18-8/+9
| |
| * Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵Struan Donald2011-08-17-1310/+3501
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | update test for changed maps and fix state checkingStruan Donald2011-07-28-10/+10
| | |
| * | use the correct council separator characterStruan Donald2011-07-27-3/+3
| | |
| * | Merge branch 'new_statuses' of ↵Struan Donald2011-07-27-2/+3
| |\ \ | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
| | * | Couple of typos in bits of code.Matthew Somerville2011-07-19-2/+3
| | | |
| * | | use belongs_to_council in admin update listStruan Donald2011-07-27-1/+1
| | | |
| * | | allow council user to update state on problem sent to multiple councilsStruan Donald2011-07-27-5/+59
| | | |
| * | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵Struan Donald2011-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 statesStruan Donald2011-07-01-0/+74
| | | |
| * | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵Struan Donald2011-07-01-1/+1
| |\ \ \ | | | | | | | | | | | | | | | into new_statuses
| * | | | check we have a council user before comparing with problem councilStruan Donald2011-06-30-1/+1
| | | | |
| * | | | rename constraint in line with how postgres would name itStruan Donald2011-06-30-1/+1
| | | | |
| * | | | another syntax errorStruan Donald2011-06-30-1/+1
| | | | |
| * | | | syntax errorStruan Donald2011-06-30-1/+1
| | | | |
| * | | | indicate if update is from problem owner or council userStruan Donald2011-06-30-0/+4
| | | | |
| * | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵Struan Donald2011-06-30-219/+487
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses Conflicts: perllib/FixMyStreet/App/Controller/Reports.pm
| * | | | | some extra info on updatesStruan Donald2011-06-30-1/+85
| | | | | |
| * | | | | make sure cobrand summary tests pass even if we have barnet entries in dbStruan Donald2011-06-29-0/+3
| | | | | |
| * | | | | use is_fixedStruan Donald2011-06-28-2/+2
| | | | | |
| * | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵Struan Donald2011-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 alertStruan Donald2011-06-28-5/+152
| | | | | | |
| * | | | | | correctly set mark_open/fixed in questionnaire generates updatesStruan Donald2011-06-28-2/+12
| | | | | | |
| * | | | | | store correct old state in questionnaire when creator marks problem as fixedStruan Donald2011-06-28-1/+46
| | | | | | |
| * | | | | | display update marked as fixed text on questionnaire for all fixed statesStruan Donald2011-06-28-1/+50
| | | | | | |
| * | | | | | council users should be able to set state to confirmedStruan Donald2011-06-27-1/+13
| | | | | | |
| * | | | | | 404 if no tokenStruan Donald2011-06-27-1/+1
| | | | | | |
| * | | | | | user searching and editingStruan Donald2011-06-27-0/+221
| | | | | | |
| * | | | | | allow user changes to be loggedStruan Donald2011-06-27-0/+13
| | | | | | |
| * | | | | | update users table to user from_councilStruan Donald2011-06-27-1/+1
| | | | | | |
| * | | | | | Display council name next to updates from council usersStruan Donald2011-06-27-0/+22
| | | | | | |
| * | | | | | change to use from_council in users table and store the council id inStruan Donald2011-06-27-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there so we can check that the problem is for the council the user is from
| * | | | | | remove merge cruftStruan Donald2011-06-27-1/+0
| | | | | | |
| * | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵Struan Donald2011-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 countStruan Donald2011-06-23-1/+1
| | | | | | | |
| * | | | | | | indicate changes state in update meta informationStruan Donald2011-06-23-0/+68
| | | | | | | |
| * | | | | | | check that state is permittedStruan Donald2011-06-23-1/+41
| | | | | | | |
| * | | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵Struan Donald2011-06-23-10/+37
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses
| * | | | | | | | in progress bannerStruan Donald2011-06-23-0/+42
| | | | | | | | |
| * | | | | | | | update problem status from updateStruan Donald2011-06-23-1/+57
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵Struan Donald2011-06-23-20/+13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses