aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Revert most of "Experiment, no pins by default."Matthew Somerville2015-01-09-104/+2
| | | | | | This reverts most of commit 71b400a1f5991b9a693095c417aa61e274a5215d, leaving the skip-this-step CSS changes and the tweaks to the /ajax JSON output.
* Merge branch 'east-sussex-disable-questionnaires'Hakim Cassimally2015-01-09-0/+4
|\
| * [EastSussex] disable questionnairesHakim Cassimally2015-01-09-0/+4
|/ | | | at ESCC request today
* [Harrogate] update email for live deploymentHakim Cassimally2015-01-08-1/+1
|
* Merge branch 'harrogate-candidate'Hakim Cassimally2015-01-08-17/+949
|\
| * [Harrogate] wordings and stylesHakim Cassimally2015-01-08-21/+487
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - auth and intro pages - wording of around page - Styling work with Mike - FAQ and footer tweaks https://github.com/mysociety/FixMyStreet-Commercial/issues/654 https://github.com/mysociety/FixMyStreet-Commercial/issues/655 - Extra spacing https://github.com/mysociety/FixMyStreet-Commercial/issues/656 - Width of footer (override auto -> 100%) - style and logo tweaks - Logo/header same height on all pages (inc mappage) - Content spacing tweaks - Correct "Harrogate district" wording https://github.com/mysociety/FixMyStreet-Commercial/issues/658 - Add extra disclaimer about reports fwd'd to NYCC - push fms_pan_zoom down with css!important (alternative is to use JS as Hart does, or possibly to fix this so doesn't require !important) - add privacy section (Copies part of text on main page, this should perhaps be factored out.) - Set bodyclass for change_password Sets a bodyclass that's unused outwith harrogate cobrand, so should be safe.
| * [Harrogate] custom form fieldsHakim Cassimally2015-01-08-23/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Requires previous (generic) commit to prevent information only categories (e.g. Dead animals message) from displaying a spurious textbox. Also support for sending these custom fields by email: Requires a hook in RS::Problem method, as by default, only a restricted number of hard-coded fields are send in the email. (And the template language is pseudo-PHP so we can't simply pass in the whole data-structure.)
| * Open311: honour `variable` field in form displayHakim Cassimally2015-01-08-15/+19
| | | | | | | | | | Potentially addresses #42 and https://github.com/mysociety/FixMyStreet-Commercial/issues/647
| * [Harrogate] basic cobrandHakim Cassimally2015-01-08-0/+256
| |
| * Add executable permissions to scriptHakim Cassimally2015-01-08-0/+0
|/
* [Warwickshire] suppress front-page statsHakim Cassimally2014-12-30-0/+1
|
* Merge branch 'issues/850/bromley-geocoding-BR5'Hakim Cassimally2014-12-29-0/+18
|\
| * [Bromley] fix BR5 and BR6 geocoding issuesHakim Cassimally2014-12-29-0/+18
|/ | | | | | | | | fixes #850 by adding appropriate postcodes to fix some issues reported by council. Unsure why, but one of these (Kelsey Hill) seemed to require different ordering than others: is this a Bing oddity, or am I doing something wrong?
* Update UNIX_USER on installation setup of crontab.Matthew Somerville2014-12-19-0/+1
| | | | Fixes #974.
* Version 1.5.2.v1.5.2Matthew Somerville2014-12-17-48/+60
| | | | | | | Includes: * [UK] Don't show topic form field when reporting abuse. * Use token in moderation response URL to prevent hidden report leak. * Make sure successful submission page is full width.
* Hide unneeded heading on default footer.Matthew Somerville2014-12-17-1/+3
|
* Don't try and shown pagination if no pager presentMatthew Somerville2014-12-17-0/+2
| | | | Prevents 'Argument "" isn't numeric' warning on admin report edit page.
* Version 1.5.1.v1.5.1Matthew Somerville2014-12-12-2/+17
|
* Don't install open311-endpoint feature by default.Matthew Somerville2014-12-12-1/+1
|
* Add a script to always test on a clean db/config.Hakim Cassimally2014-12-12-2/+157
| | | | Fixes #786.
* By default, use area-based alerts.Matthew Somerville2014-12-12-198/+224
| | | | | | | | | The body-based alert only works if the body ID matches the MapIt ID. This fixes #959. Further work needs to be done to enable proper body-based alerts that work properly in all circumstances. Consequently, factor out fixed body IDs from many tests. Also fix a couple of tests not overriding geocoder correctly.
* New UK specific FAQ, more generic base FAQ.Matthew Somerville2014-12-11-368/+574
| | | | Fixes #753 and #935.
* [fixmystreet.com] New posters page layout/content.Zarino Zappia2014-12-11-1083/+278
|
* Add Open311 i18n test, and add utf8 pragma.Matthew Somerville2014-12-10-15/+28
| | | | Also remove some unused variables.
* Set DefaultLocale appropriately when language set.Matthew Somerville2014-12-10-7/+8
|
* Fix encoding of signature in emails.Matthew Somerville2014-12-10-0/+105
| | | | | This text was being imported encoded, which led to double-encoding when used in templates. Fixes #960 and #961.
* Pass cobrand into send_email_cron when sending SendReport emailsSteven Day2014-12-09-1/+3
| | | | | | | | | | | | | | Without this, email sending within a cobrand will get the right main email template (submit.txt) for the email - because it uses the cobrand inside get_template - but it doesn't use the cobrand for things like the email signature, because you have to pass it into send_email_cron manually to make it cobrand-aware. This probably hasn't been noticed before because most cobrands are called Something FixMyStreet, but Collideoscope is different and hence it caused a problem there. Closes mysociety/FixMyStreet-Commercial#621.
* Merge branch 'issues/commercial/641-642-eastsussex-candidate'Hakim Cassimally2014-12-02-8/+278
|\
| * [EastSussex] Fix layout without JSHakim Cassimally2014-12-02-1/+9
| | | | | | | | The non-js view positioned the map badly (over the issue text).
| * [EastSussex] UI improvements to encourage good updatesHakim Cassimally2014-12-02-7/+269
|/ | | | | | | | | | | | | | | | | | | | | | | | ESCC advised us of concerns that users: * were unaware of how much of their report/update would be visible on the site - make "public" text more visible. - label is presented as fairly flat, with the cursor suppressed (to avoid it looking like a button) but with an explanatory tooltip. The intent is for it to be highly visible, but not too startling. - https://github.com/mysociety/FixMyStreet-Commercial/issues/642 * often comment on an existing report when instead creating a new report would be more appropriate. - Present two buttons, one to create a new report in the same location, another to open the comment box. - (this functionality degrades without Javascript, by simply showing the comment box by default.) - https://github.com/mysociety/FixMyStreet-Commercial/issues/641 Most templates have been split into partials, to avoid long-term forking, however update-form.html is still forked from fixmystreet, which would ideally be fixed in a future commit.
* Merge branch 'open311-populate-error-improvement'Matthew Somerville2014-11-26-15/+17
|\
| * Only have jurisdiction_id in request if present.Matthew Somerville2014-11-26-7/+7
| | | | | | | | | | | | So don't request '...services.xml?jurisdiction_id=' as that can lead to an error from an Open311 server that expects either no parameter at all or a stated jurisdiction_id.
| * Better error if Open311 returns nil service list.Matthew Somerville2014-11-21-8/+10
| | | | | | | | | | | | | | | | If an Open311 server responded with e.g. '<services></services>', you got a strange hash error as the code treated it as one undef service. Spot this at the same point we check anything was returned. Also remove a couple of warnings due to lc of a maybe-undef variable.
* | Provide guidance at top of example config file.Matthew Somerville2014-11-26-4/+11
|/
* [Zurich] Move admin table CSS to base stylesheet.v1.5Matthew Somerville2014-11-19-48/+47
| | | | To match shift of styles in bb07940.
* Version 1.5.Matthew Somerville2014-11-19-28431/+25108
|
* Updated translations from Transifex.Matthew Somerville2014-11-19-1807/+18762
|
* Don't generate unused special templates/po files.Matthew Somerville2014-11-19-6/+6
|
* Merge remote-tracking branch 'origin/fiksgatami-update'Matthew Somerville2014-11-19-250/+278
|\
| * [FiksGataMi] Update cobrand to current design.Matthew Somerville2014-11-19-250/+189
| |
| * [FiksGataMi] Add two testing scripts for roads.Matthew Somerville2014-11-19-0/+89
| |
* | Add encouraging message about help to admin front.Matthew Somerville2014-11-19-152/+170
|/ | | | Fixes #929. Also move admin hint CSS to base CSS, not just layout.
* Move tips/sidebar to separate templates.Matthew Somerville2014-11-19-68/+62
| | | | | Also apply to UK council cobrands. Fixes #926, more food for #344.
* Tidy up reporting sidebar notes and privacy.Matthew Somerville2014-11-19-131/+201
| | | | For #344 and #935.
* Show logged in message as success, not error.Matthew Somerville2014-11-18-66/+58
| | | | | | Fixes #357. Also consolidate almost-identical fill_in_details.html template (for #344).
* Only show text on /reports if appropriate.Matthew Somerville2014-11-14-9/+18
| | | | | Only show "select..." if more than one body, and only mention greyed out lines if there are any. Fixes #869.
* Move some data: URIs to FixMyStreet style.Matthew Somerville2014-11-14-5/+13
| | | | | | Easier if the default shared styles stick with the sprite for everything, then you can just change that sprite rather than having to override CSS as well.
* Move footer styling to shared stylesheet.Matthew Somerville2014-11-14-46/+65
| | | | This look works well on the default styling also.
* Don't height fix any full width page.Matthew Somerville2014-11-14-1/+1
|
* Generalise footer-marketing template.Matthew Somerville2014-11-14-12/+31
| | | | Move UK specific text to fixmystreet.com template.
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 10:21:10 +0000