Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'master' into fmb-read-only | Dave Whiteland | 2012-06-25 | -91/+439 |
|\ | | | | | | | | | | | | | Conflicts: .gitignore bin/make_css perllib/FixMyStreet/Cobrand/FixMyStreet.pm | |||
| * | Only create alert if actual parameters differ, not just cobrand/lang. | Matthew Somerville | 2012-06-21 | -8/+14 |
| | | ||||
| * | Call process_extras() from updates too, so that error checking runs. | Matthew Somerville | 2012-06-21 | -9/+12 |
| | | ||||
| * | Unused variable. | Matthew Somerville | 2012-06-21 | -2/+0 |
| | | ||||
| * | Unneeded code, as is ignored, and same thing happens in Open311.pm anyway. | Matthew Somerville | 2012-06-21 | -8/+0 |
| | | ||||
| * | Fix spelling of this variable. | Matthew Somerville | 2012-06-21 | -1/+1 |
| | | ||||
| * | Treat update calling of extra_name same as reporting does it. | Matthew Somerville | 2012-06-21 | -0/+2 |
| | | ||||
| * | display category prompts on southampton cobrand | Struan Donald | 2012-06-19 | -5/+2 |
| | | ||||
| * | Change alerts on council cobrands so they link to main | Struan Donald | 2012-06-18 | -4/+11 |
| | | | | | | | | | | | | site if sending alerts about problems not covered by the cobrand. Also remove cobrand restriction from local area alerts | |||
| * | Merge branch 'phonegap' | Struan Donald | 2012-06-15 | -0/+112 |
| |\ | ||||
| | * | inital pass at sign in/sign out functionality | Struan Donald | 2012-06-01 | -0/+49 |
| | | | ||||
| | * | update photo processing path | Struan Donald | 2012-05-25 | -1/+1 |
| | | | ||||
| | * | Merge remote-tracking branch 'origin/master' into phonegap | Struan Donald | 2012-05-23 | -220/+3576 |
| | |\ | ||||
| | * | | first pass of using password to loging. needs lots of work still | Struan Donald | 2012-03-15 | -6/+11 |
| | | | | ||||
| | * | | Merge remote-tracking branch 'origin/master' into phonegap | Struan Donald | 2012-03-14 | -197/+236 |
| | |\ \ | ||||
| | * | | | add in new handler for report submission from phonegap apps | Struan Donald | 2012-03-12 | -0/+58 |
| | | | | | ||||
| * | | | | Fix bounds ordering (SW first). | Matthew Somerville | 2012-06-14 | -1/+1 |
| | | | | | ||||
| * | | | | photo is url, not photos | Struan Donald | 2012-06-13 | -1/+1 |
| | | | | | ||||
| * | | | | Use config domain if a development site. | Matthew Somerville | 2012-06-13 | -1/+2 |
| | | | | | ||||
| * | | | | Update councils links to new location at mysociety.org | Matthew Somerville | 2012-06-13 | -7/+0 |
| | | | | | ||||
| * | | | | Put admin URL in cobrand where it should be. | Matthew Somerville | 2012-06-08 | -8/+15 |
| | | | | | ||||
| * | | | | Merge remote-tracking branch 'origin/master' | Struan Donald | 2012-06-08 | -3/+5 |
| |\ \ \ \ | ||||
| | * | | | | after overnight messages, apply Barnet timeout message tidying to the output ↵ | Dave Whiteland | 2012-06-08 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | as well as to send_fail_reason | |||
| * | | | | | update Bromley cobrand to use re-organised code | Struan Donald | 2012-06-08 | -0/+1 |
| | | | | | | ||||
| * | | | | | Merge branch 'barnet-newstyle' | Struan Donald | 2012-06-08 | -0/+95 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore perllib/FixMyStreet/Cobrand/FixMyStreet.pm perllib/FixMyStreet/Cobrand/UKCouncils.pm templates/web/default/reports/council.html templates/web/fixmystreet/header.html templates/web/fixmystreet/report/display.html web/cobrands/bromley/layout.scss web/cobrands/fixmystreet/fixmystreet.js web/js/map-OpenLayers.js | |||
| | * | | | | Work much better if reporting pin is clicked/dragged outside council boundary | Struan Donald | 2012-05-18 | -1/+8 |
| | | | | | | ||||
| | * | | | | put in barnet example places and add barnet to disambiguation | Struan Donald | 2012-05-18 | -0/+5 |
| | | | | | | ||||
| | * | | | | use is_council as used for bromley and reduce template duplication | Struan Donald | 2012-05-17 | -2/+4 |
| | | | | | | ||||
| | * | | | | Merge branch 'master' into barnet-newstyle | Matthew Somerville | 2012-05-17 | -104/+3290 |
| | |\ \ \ \ | ||||
| | * | | | | | different text for updates on council cobrand reports page | Struan Donald | 2012-05-14 | -0/+2 |
| | | | | | | | ||||
| | * | | | | | wording changes for barnet cobrand | Struan Donald | 2012-05-14 | -0/+44 |
| | | | | | | | ||||
| | * | | | | | correct fixed tag on problem page | Struan Donald | 2012-05-03 | -0/+26 |
| | | | | | | | ||||
| | * | | | | | configure all reports problem style in the cobrand | Struan Donald | 2012-05-02 | -0/+12 |
| | | | | | | | ||||
| | * | | | | | New style map Barnet Cobrand Work in Progress | Struan Donald | 2012-04-24 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, pull out map positioning JS to a separate file to make cobrands a bit more modular. | |||
| * | | | | | | Use problem_state column rather than mark_fixed for updates from council. | Matthew Somerville | 2012-06-06 | -4/+2 |
| | | | | | | | ||||
| * | | | | | | tidy up timeout error reporting for Barnet FMS back-end | Dave Whiteland | 2012-06-06 | -1/+6 |
| | | | | | | | ||||
| * | | | | | | Merge branch 'council-dashboard' | Matthew Somerville | 2012-06-06 | -31/+124 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: perllib/FixMyStreet/App/Controller/Dashboard.pm templates/web/default/dashboard/index.html | |||
| | * | | | | | | problem_status is only set for council user updates so check for | Struan Donald | 2012-05-24 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mark_fixed and null problem_status to identify user - fixed updates | |||
| | * | | | | | | add closed state to page | Struan Donald | 2012-05-16 | -1/+1 |
| | | | | | | | | ||||
| | * | | | | | | small tweak to calculation of user fixed problem counts | Struan Donald | 2012-05-15 | -1/+1 |
| | | | | | | | | ||||
| | * | | | | | | need council details for setup categories as need type to get category list | Struan Donald | 2012-05-15 | -2/+1 |
| | | | | | | | | ||||
| | * | | | | | | add council name to dashboard | Struan Donald | 2012-05-14 | -0/+4 |
| | | | | | | | | ||||
| | * | | | | | | move wards to json file | Struan Donald | 2012-05-14 | -0/+1 |
| | | | | | | | | ||||
| | * | | | | | | Merge remote-tracking branch 'origin/master' into council-dashboard | Struan Donald | 2012-05-14 | -1/+8 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | ||||
| | * | | | | | | change example data on category or ward selection | Struan Donald | 2012-05-10 | -1/+6 |
| | | | | | | | | ||||
| | * | | | | | | put example dashboard data in json file | Struan Donald | 2012-05-10 | -11/+19 |
| | | | | | | | | ||||
| | * | | | | | | Lists of reports by age. | Matthew Somerville | 2012-05-09 | -7/+23 |
| | | | | | | | | ||||
| | * | | | | | | Not marked statistic. | Matthew Somerville | 2012-05-09 | -6/+17 |
| | | | | | | | | ||||
| | * | | | | | | Initial example page. | Matthew Somerville | 2012-05-09 | -0/+29 |
| | | | | | | | | ||||
| | * | | | | | | Initial time to fix/mark rows. | Matthew Somerville | 2012-05-09 | -24/+44 |
| | | | | | | | |