| Commit message (Collapse) | Author | Age | Lines | ||
|---|---|---|---|---|---|
| ... | |||||
| | * | sort out small issues from merge | Struan Donald | 2012-08-22 | -9/+1 | |
| | | | |||||
| | * | fix accidentally commited conflicted file :( | Struan Donald | 2012-08-22 | -36/+0 | |
| | | | |||||
| | * | Merge remote-tracking branch 'origin/master' into fmb-read-only | Struan Donald | 2012-08-22 | -13766/+12849 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore bin/make_css conf/general.yml-example perllib/FixMyStreet/App/Controller/Council.pm perllib/FixMyStreet/App/Controller/Report/New.pm perllib/FixMyStreet/Cobrand/Default.pm templates/web/default/around/around_index.html templates/web/default/index.html templates/web/emptyhomes/index.html templates/web/fixmystreet/around/around_index.html templates/web/fixmystreet/index.html web/fixmystreet_app_cgi.cgi web/fixmystreet_app_fastcgi.cgi | ||||
| | * | | move localstorage to sessionstorage, and clear on logout | Dave Whiteland | 2012-07-24 | -15/+30 | |
| | | | | |||||
| | * | | reintroduce logic for sending external_id to fixmybarangay Open311 | Dave Whiteland | 2012-07-22 | -1/+6 | |
| | | | | |||||
| | * | | do not fall back to the default get_council_sender method | Struan Donald | 2012-07-13 | -0/+13 | |
| | | | | |||||
| | * | | allow send-reports etc to run on fmb test | Struan Donald | 2012-07-12 | -1/+1 | |
| | | | | |||||
| | * | | END token not in braces confuses parser so be a bit more explicit | Struan Donald | 2012-07-12 | -5/+4 | |
| | | | | |||||
| | * | | make external_source_id text for flexibility | Struan Donald | 2012-07-12 | -1/+1 | |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/fmb-read-only' into fmb-read-only | Struan Donald | 2012-07-12 | -276/+24 | |
| | |\ \ | |||||
| | | * | | Tidy up templates, to make it easier to keep in sync. | Matthew Somerville | 2012-07-12 | -276/+24 | |
| | | | | | |||||
| | * | | | add in external_source and external_source_id to schema | Struan Donald | 2012-07-12 | -1/+5 | |
| | |/ / | |||||
| | * | | Merge remote-tracking branch 'origin/fmb-read-only' into fmb-read-only | Struan Donald | 2012-07-12 | -31/+46 | |
| | |\ \ | |||||
| | | * | | changed mm_msg_id to external_source_id, and added external_source col | Dave Whiteland | 2012-07-12 | -22/+27 | |
| | | | | | |||||
| | | * | | added Message Manager ID (mm_msg_id) column and used it | Dave Whiteland | 2012-07-11 | -12/+23 | |
| | | | | | |||||
| | | * | | whoops XXX | Dave Whiteland | 2012-07-11 | -1/+0 | |
| | | | | | |||||
| | | * | | Merge remote branch 'origin/fmb-read-only' into fmb-read-only | Dave Whiteland | 2012-07-11 | -2/+8 | |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: perllib/FixMyStreet/App/Controller/Report/New.pm | ||||
| | | * | | | reworking mm_msg_id, instead of service | Dave Whiteland | 2012-07-11 | -17/+18 | |
| | | | | | | |||||
| | * | | | | have to have a value, even if it is an empty string | Struan Donald | 2012-07-12 | -1/+1 | |
| | | |/ / | |/| | | |||||
| | * | | | if report generated from message manager pass id to report page | Struan Donald | 2012-07-11 | -2/+9 | |
| | |/ / | |||||
| | * | | add MESSAGE_MANAGER_URL config | Dave Whiteland | 2012-07-11 | -3/+7 | |
| | | | | |||||
| | * | | handle no MM messages nicely | Dave Whiteland | 2012-07-11 | -4/+7 | |
| | | | | |||||
| | * | | ensure MM URL has a trailing slash | Dave Whiteland | 2012-07-11 | -0/+3 | |
| | | | | |||||
| | * | | don't just say 'Error: 0 error' if there's a x-domain error (certainly in FF) | Dave Whiteland | 2012-07-11 | -1/+7 | |
| | | | | |||||
| | * | | fix jslint issue | Dave Whiteland | 2012-07-10 | -4/+1 | |
| | | | | |||||
| | * | | passing MM message number through service field, callback on view (needs ↵ | Dave Whiteland | 2012-07-10 | -25/+36 | |
| | | | | | | | | | | | | | client check to only trigger on rreports created this session) | ||||
| | * | | remove some assumptions from MM about what elements are present on the page ↵ | Dave Whiteland | 2012-07-10 | -8/+20 | |
| | | | | | | | | | | | | | when js is run | ||||
| | * | | jslint-inspired change of JS 'module pattern' here | Dave Whiteland | 2012-07-06 | -53/+61 | |
| | | | | |||||
| | * | | jslint fixes | Dave Whiteland | 2012-07-06 | -56/+55 | |
| | | | | |||||
| | * | | showing login form after initial call is unexpected, so remove all messages ↵ | Dave Whiteland | 2012-07-05 | -3/+8 | |
| | | | | | | | | | | | | | (expect to call /available again to re-populate), closes #18 | ||||
| | * | | store MM auth credentials in localstorage to avoid repeat login | Dave Whiteland | 2012-07-05 | -15/+29 | |
| | | | | |||||
| | * | | pass the MM message ID into FMS on submit, if there is one | Dave Whiteland | 2012-07-05 | -0/+9 | |
| | | | | |||||
| | * | | switch click listener to the radio button (not the li) to make user action ↵ | Dave Whiteland | 2012-07-05 | -2/+2 | |
| | | | | | | | | | | | | | unambiguous | ||||
| | * | | Call /messages/available on load (and remove spurious extra div) | Dave Whiteland | 2012-07-05 | -2/+2 | |
| | | | | |||||
| | * | | login hidden except when needed | Dave Whiteland | 2012-07-05 | -2/+2 | |
| | | | | |||||
| | * | | mm layout/locks after /avaible messages are pulled from MM | Dave Whiteland | 2012-07-05 | -36/+57 | |
| | | | | |||||
| | * | | MM ajax calls, using message_manager_client.js | Dave Whiteland | 2012-07-04 | -2/+402 | |
| | | | | |||||
| | * | | some CSS tweaks | Dave Whiteland | 2012-07-03 | -7/+16 | |
| | | | | |||||
| | * | | FMB web fixes | Dave Whiteland | 2012-06-25 | -1/+139 | |
| | | | | |||||
| | * | | delete overlooked conflict marker? | Dave Whiteland | 2012-06-25 | -1/+0 | |
| | | | | |||||
| | * | | FMB scss needs contrast1_dark declaration | Dave Whiteland | 2012-06-25 | -0/+1 | |
| | | | | |||||
| | * | | barnet missing from the compass-using cobrands list in make_css | Dave Whiteland | 2012-06-25 | -1/+1 | |
| | | | | |||||
| | * | | Merge branch 'master' into fmb-read-only | Dave Whiteland | 2012-06-25 | -742/+34398 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore bin/make_css perllib/FixMyStreet/Cobrand/FixMyStreet.pm | ||||
| | * \ \ | Merge remote branch 'origin/master' into fmb-read-only | Dave Whiteland | 2012-05-29 | -1809/+5851 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/send-reports perllib/FixMyStreet/Cobrand/Default.pm perllib/FixMyStreet/Cobrand/FixMyStreet.pm templates/web/fixmystreet/alert/index.html templates/web/fixmystreet/around/display_location.html web/cobrands/fixmystreet/_layout.scss web/js/map-OpenLayers.js | ||||
| | * \ \ \ | Merge branch 'fmb-read-only' of ↵ | Dave Whiteland | 2012-05-17 | -92/+230 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/fixmystreet into fmb-read-only | ||||
| | | * \ \ \ | Merge branch 'master' into fmb-read-only | Matthew Somerville | 2012-05-17 | -92/+230 | |
| | | |\ \ \ \ | |||||
| | * | | | | | | whoops should be checking cobrand moniker, not cobrand object | Dave Whiteland | 2012-05-17 | -2/+3 | |
| | |/ / / / / | |||||
| | * | | | | | FMB sends external_id as an Open311 attrib | Dave Whiteland | 2012-05-17 | -0/+9 | |
| | | | | | | | |||||
| | * | | | | | Allow display of areas on /around. | Matthew Somerville | 2012-05-08 | -16/+34 | |
| | | | | | | | |||||
| | * | | | | | correct BSN lat/long | Dave Whiteland | 2012-05-04 | -2/+2 | |
| | | | | | | | |||||
 |
index : fixmystreet | |
| This is mySociety's popular map-based reporting platform: easy to install in new countries and regions http://fixmystreet.org/ | FiksGataMi |
| aboutsummaryrefslogtreecommitdiffstats |