aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | | Merge branch 'analytics-report-events'Struan Donald2014-04-11-0/+12
|\ \ \
| * | | Fire a google analytics event on report completionStruan Donald2014-04-09-0/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | At the moment it's hard to use google analytics to track when someone has completed a report due to the various redirects which can occur too quickly for the analytics javascript to fire. So now we fire an event if we've set a flash value. This also allows us to track how they created the report.
* / / bin/geocode script for testing geocodingHakim Cassimally2014-04-10-1/+82
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run bin/geocode -h for options. Has: * configurable cobrand / config-file / geocoder * some diagnostics for missing cobrand Minor fixes rebased into this commit: * bin/geocode error if no --cobrand passed * bin/geocode docs and accept GEOCODER as string Notable TODOs remaining: * reverse geocoding, to double check that latitude actually maps somewhere useful (and is within Cobrand's boundaries) * diagnosis of relevant CONFIG settings * flag to disable caching
* | If we only have one real category option, automatically select it.Matthew Somerville2014-04-07-1/+1
| | | | | | | | Fixes #690.
* | Mock a date for dashboard testsHakim Cassimally2014-04-07-1/+15
| | | | | | | | | | | | | | Fixes #365 (how appropriate) by mocking datetime to allow the dashboard test's assumptions (that we're not so near beginning of year that a report from X days ago isn't still in same year) to hold.
* | Update old-style open311 script to use bodies.Matthew Somerville2014-04-07-60/+70
| | | | | | | | Add some comments to the top of the open311 bin scripts.
* | Ubuntu Apache vhost config exampleKindrat2014-04-07-2/+10
| |
* | Use local DateTimes in dashboard and its tests.Matthew Somerville2014-04-07-14/+16
| | | | | | | | | | Otherwise oddities arise due to summer time differences putting a BST now-6d23h time behind a UTC now+1s-1w.
* | send a virtual page view when we click on the mapStruan Donald2014-04-04-0/+4
| | | | | | | | Only if universal analytics turned on and on the fixmystreet cobrand
* | upgrade google analytics code to use universal snippetStruan Donald2014-04-03-11/+7
| |
* | Update colours for Trinidad and Tobago cobrandStruan Donald2014-04-02-0/+59
| | | | | | | | | | Add in we/cobrand directory with basic sass files, update colours file and set background on 'click map to report' banner
* | remove survey link from front pageStruan Donald2014-04-02-5/+0
| |
* | remove survey linksStruan Donald2014-03-31-56/+12
| |
* | Fetch/send archive of modules before/after tests.Matthew Somerville2014-03-30-3/+85
| | | | | | | | | | | | | | Before running carton install, see if we have a stored copy of the local directory on ge.tt - if so, download and use that instead. After running the tests, if we didn't download a copy, bundle it up and upload it to ge.tt for use next time.
* | Allow cobrands to set their own path to pin filesHakim Cassimally2014-03-25-8/+25
| | | | | | | | | | | | | | | | | | New cobrand function of pin_path that sets the path to where the image files for pins are located. Defaults to /i This still means they need to use the same file names but they can at least put those in a cobrand directory rather than having to overwrite the files in /i or fudge it with pin_colour
* | Add no-op sending method.Matthew Somerville2014-03-22-0/+12
| | | | | | | | | | This simply always skips reports for this body, in case you need to suspend reports there. Fixes #507.
* | Ipswich/St Edmundsbury roads handled by Suffolk.Matthew Somerville2014-03-21-6/+0
| |
* | Update code.fixmystreet.com references to fixmystreet.org.Matthew Somerville2014-03-19-12/+11
| |
* | Change default email indentation to none.Matthew Somerville2014-03-17-33/+20
| | | | | | | | | | This is very old, no-one seems to want/need it any more, and more than one reuser does not want it. Fixes #715.
* | Don't mark Swedish title for translation.Matthew Somerville2014-03-14-1/+1
| |
* | Merge branch 'css-watcher'Matthew Somerville2014-03-14-0/+83
|\ \
| * | CSS watcherHakim Cassimally2014-03-13-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run with bin/make_css_watch This watches the .scss files in web/cobrands/* and runs the appropriate sass/compass commands (as per bin/make_css) on just those directories with changed files. As a special case, a change to the partials in web/cobrands/sass will cause a rebuild of all cobrands.
* | | Merge branch 'jonkri-master'Matthew Somerville2014-03-14-3/+7
|\ \ \
| * | | Add extra Open311 strings for FixaMinGataJon Kristensen2014-03-14-0/+4
| | | |
| * | | Minor template fixes for FixaMinGataJon Kristensen2014-03-14-3/+3
|/ / / | | | | | | | | | | | | * Use correct body name value in submit templates * Update FAQ to link to MySociety's repository instead of our own
* | | Fix slight regression in cf20c709, to still match all UK cobrands.Matthew Somerville2014-03-13-1/+2
| | |
* | | add a contribution guidelines section to readmeGerald2014-03-12-0/+9
| | |
* | | Set report->send_questionnaire on report creationAndy Lulham2014-03-12-0/+30
|/ / | | | | | | | | Include a one-off script that sets send_questionnaire to 0 for all available cobrands that have send_questionnaires set to 0.
* | [Zurich] basic commandline tool for geocoderHakim Cassimally2014-03-12-0/+46
| | | | | | | | | | Also add warning to Geocoder to pass on server error if you are running in development.
* | Merge branch 'delete-mobile-app-folders'Matthew Somerville2014-03-12-36470/+5
|\ \
| * | Add note to README about mobile apps repositoryEdmund von der Burg2014-03-12-0/+5
| | |
| * | Remove the android directoryEdmund von der Burg2014-03-12-2070/+0
| | |
| * | Remove the iphone directoryEdmund von der Burg2014-03-12-7612/+0
| | |
| * | Remove the phonegap directoryEdmund von der Burg2014-03-12-26788/+0
|/ /
* | Add sv_SE to Travis so test using it passes.Matthew Somerville2014-03-12-1/+1
| |
* | Add back missing OSM attribution.Matthew Somerville2014-03-12-0/+1
| |
* | Use config's EMAIL_DOMAIN in cron email Message-ID.Matthew Somerville2014-03-12-2/+2
| | | | | | | | Rather than hardcoded mysociety.org.
* | Some bits of layout.scss override are variables now, yay.Matthew Somerville2014-03-12-22/+7
| |
* | Add test for de47a7f.Matthew Somerville2014-03-12-16/+64
| | | | | | | | | | | | This tests that the default string used by the old-style Open311 update code if there is no incoming string and the report is marked fixed, is translated.
* | Merge remote branch 'origin/sweden-rebase'Matthew Somerville2014-03-11-32/+2362
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: bin/update-schema locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po perllib/FixMyStreet/DB/Result/Body.pm
| * | Make sure language is set before updating report.Matthew Somerville2014-03-11-0/+2
| | | | | | | | | | | | So that e.g. 'Closed by council' is translated.
| * | Add `external_url' column to `body' table.Jon Kristensen2014-03-11-1/+29
| | |
| * | Alter Open311 description to only include English on FixMyStreet.Jon Kristensen2014-03-11-13/+14
| | | | | | | | | | | | This could be made cobrand-customisable in future.
| * | Re-add information for Swedish councilsJon Kristensen2014-03-11-0/+5
| | |
| * | Bring back open311-update-reports, GetUpdates.pm and getupdates.tJon Kristensen2014-03-11-0/+301
| | | | | | | | | | | | | | | | | | This commit reverses the "Remove unused Open311 GetUpdates code." commit. FixaMinGata, the Swedish FixMyStreet cobrand, is still using open311-update-reports.
| * | Remove hardcoded Swedish translationsJon Kristensen2014-03-11-3/+3
| | |
| * | Move Swedish changes from Geocode/OSM.pm to Geocode/FixaMinGata.pmJon Kristensen2014-03-11-26/+214
| | |
| * | Add back translations from forks.Matthew Somerville2014-03-11-17/+13
| | | | | | | | | | | | | | | Translations previously directly in JS on fork can now be better placed in the translation file, as can some "marked as" strings.
| * | Rewrite parts of "Information för kommuner"Jon Kristensen2014-03-11-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specified info@fixamingata.se instead of linking to contact form. Updated the "referensgruppen" list. Added link to logotypes page. Fixes #2.
| * | Update "introductory" e-mail to municipalitiesJon Kristensen2014-03-11-13/+14
| | | | | | | | | | | | Fixes #10.