aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* 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.
* Merge remote-tracking branch 'origin/remove-opacity-map-controls-mobile'Matthew Somerville2014-11-14-4/+13
|\
| * Remove opacity from map controls on mobile.Matthew Somerville2014-11-14-4/+13
| | | | | | | | | | This crashes at least one mobile browser; not sure why, but we can do without it.
* | Fix JS-disabled submission in Chrome/Firefox.Hakim Cassimally2014-11-14-2/+6
| | | | | | | | | | | | | | | | | | | | | | Fixes #932, which is caused by HTML5 validation firing for hidden elements, by setting #mapForm to novalidate by default, and reverting this in fixmystreet.js. Note that the 'novalidate' attribute, which is honoured by the browsers' HTML5 validation, isn't to be confused with the class (class="validate") which is picked up by fixmystreet.js, and therefore not problematic for the no-js case.
* | Make sentence a link for better accessibility.Matthew Somerville2014-11-14-16/+6
| | | | | | | | For starters, it actually appears on focus.
* | [Zurich] Show "new category" errors in admin.Matthew Somerville2014-11-14-15/+23
|/ | | | | | Error handling and changes to the base template were added in f0621930, so an error would cause the form to reshow in the cobrand, but not display the errors.
* more inviting click target for reporting hintZarino Zappia2014-11-12-1/+6
|
* reporting hint at top of /council pageZarino Zappia2014-11-12-0/+25
|
* Update graph crontab lines to use wrapper.Matthew Somerville2014-11-12-2/+2
| | | | | After the changes in b3c664b, these two lines need to be called with the cron-wrapper.
* [UK] Change most prominent "Get in touch" wording.abimysoc2014-11-11-1/+1
| | | | | With reference to #922, to see if the more 'businessy' phrase makes any difference.
* Switch graph generation programs to Perl.Matthew Somerville2014-11-11-128/+133
| | | | | | This means they access the database the same way all the other scripts do, preventing any issues due to different setups. Also tidy up state grouping in graph, add Norway start date.
* Merge branch 'trusty-tahr'Matthew Somerville2014-11-07-51/+255
|\
| * Reinstate some cpanfile.snapshot entries.Matthew Somerville2014-11-07-1/+184
| | | | | | | | | | | | | | This puts back any missing snapshot modules removed in 1708bc30af7176f95f0ec5718289d3a633daf32b, as they are required for installation on squeeze, which misses or does not have the required version of these.
| * Remove unused variable.Matthew Somerville2014-11-07-1/+0
| | | | | | | | | | Also, s///r isn't present in 5.10, and FixMyStreet should still install on squeeze.
| * Remove liberror-perl and libsoap-lite-perl.Matthew Somerville2014-11-05-24/+13
| | | | | | | | | | | | Try and save other people the potential pain of installing SOAP::Lite; only UK FixMyStreet and Zurich geocoder use it, so set it as an optional feature in the cpanfile instead.
| * Update to use bundler and work on Ubuntu Trusty.Matthew Somerville2014-11-05-25/+58
| | | | | | | | | | | | | | | | Switching to bundler saves confusion about gem paths when running sass/compass to compile the CSS. Trusty can use precisely the same packages as precise, with a few tweaks to generalise the contents.
* | EastSussex. z-index fixes for IE7Hakim Cassimally2014-11-04-2/+13
|/ | | | | | | | | | | | The #map_box div wasn't clickable, so we had to reset its z-index from the broken -1 to 0. IE7 doesn't like setting z-index to 0 in javascript (as it's a falsy value) so instead we set the z-index of parent and sibling elements (body and site-header) to 1 to make sure they are visible. position:relative in base.scss is to make sure that the header is now shown (similar to @6296cb33) See https://github.com/mysociety/FixMyStreet-Commercial/issues/639
* Warwickshire. front page wording for Street LightingHakim Cassimally2014-10-30-0/+7
| | | | At Noel's request.
* correct path for oxfordshire logo on council pageStruan Donald2014-10-28-1/+1
| | | | fixmystreet/com -> fixmystreet.com
* Category should be escaped in RSS feeds.Matthew Somerville2014-10-24-1/+1
| | | | In case it contains an ampersand or somesuch.
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 04:02:23 +0000