aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* Fix CSS bug on inspect form duplicate loaderZarino Zappia2017-08-15-1/+1
|
* Clearer highlight for selected duplicate on inspect formZarino Zappia2017-08-15-2/+17
| | | | Fixes mysociety/fixmystreetforcouncils#211.
* Include MapIt API key in admin config if present.Matthew Somerville2017-08-15-0/+3
| | | | Fixes #1778.
* Ignore translation if fewer than two languages.Matthew Somerville2017-08-15-15/+25
|
* Add fn to fetch bodies plus the translated names.Matthew Somerville2017-08-15-1/+30
|
* Remember translation lookup for request remainder.Matthew Somerville2017-08-15-2/+14
|
* Remove a couple of debug lines.Matthew Somerville2017-08-15-3/+0
|
* [FiksGataMi] Fix "%s" in translation.Matthew Somerville2017-08-15-1/+1
|
* translate report template category names in controllerStruan Donald2017-08-14-2/+2
| | | | | | | We can't translate them in the template as we're just passing in the category name and not the object. Fixes mysociety/fixmystreetforcouncils#216
* Fix typo stopping response templates appearingDave Arter2017-08-14-1/+1
| | | | Fixes mysociety/fixmystreetforcouncils#215
* [Zurich] Fix map on /reportsDave Arter2017-08-14-1/+9
| | | | | | | | | | | | | | | | | | A seemingly unrelated change in ef6ffbdb was causing JS errors on the /reports page which meant the map loading spinner was permanently present. This commit fixes that, and also fixes another bug which was uncovered where the ?ajax=1 param was being ignored by the Zürich /reports page, leading to HTML being returned and another JS error. The call to `new OpenLayers.Bounds` in OpenLayers.Strategy.FixMyStreet.getMapBounds was causing three of the 4 bounds params to be lost when run on OpenLayers 2.11, as this version doesn’t accept an array to the Bounds constructor. This in turn was using an invalid `bbox` parameter (only the west value was present) in the AJAX call to /reports which returned a 500 error. This then crashed the JS and caused the loading spinner to get stuck.
* Prevent unnecessary string translation.Matthew Somerville2017-08-11-5/+3
| | | | | | Calling the function 'translate' causes gettext-extract to add the string to the .po file. Also, we no longer need an admin 'updated' message as the main form has its own success message.
* Merge branch 'switch-site-script'Matthew Somerville2017-08-10-3/+40
|\
| * Add switch-site script for easily switching configZarino Zappia2017-08-10-3/+40
| | | | | | | | | | | | | | Given a set of config files of the format `conf/general-{cobrand}.yml` this script lets you easily create and recreate a symlink at `conf/general.yml` that points to the cobrand config of your choice. The test suite also then uses this naming convention.
* | Fix issues with database migration script.Matthew Somerville2017-08-10-3/+2
| | | | | | | | | | | | A reference to ->storage was missed as this script changed in a different branch. The schema files contain transaction commands themselves. A check for migration 52 was missing.
* | [FixaMinGata] Forgot to gettext-merge.Matthew Somerville2017-08-10-862/+265
|/ | | | This makes the diff much easier to view.
* Merge branch '1244-corps-translatable-body-names'Matthew Somerville2017-08-10-136/+785
|\
| * Body/category translation admin interface.Struan Donald2017-08-10-35/+371
| |
| * correct mismatched header tags in admin contact form templateStruan Donald2017-08-10-1/+1
| |
| * fetch and create translation methods for translatableStruan Donald2017-08-10-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | Add a `translation_for` method and an `add_transation` method to Translatable to help hide the details when editing and listing translations. `translation_for` returns all translations if only passed a column or a single translation if passed with a column and a language. `add_translation` will add, or update, a translation if passed in the column, language and string.
| * Set up translatable category columns.Matthew Somerville2017-08-10-67/+120
| | | | | | | | | | | | As category is used both for display and as a link between Problem and Contact tables, add `category_display` for use whenever a category is displayed.
| * Set up translatable body name.Matthew Somerville2017-08-09-4/+112
| |
| * Move FixMyStreet::DB to FixMyStreet::DB::Schema.Matthew Somerville2017-08-09-29/+54
| | | | | | | | Store a schema object on FixMyStreet::DB instead.
| * Add translation table.Matthew Somerville2017-08-09-0/+72
| |
| * Ensure user has from_body for contribute as body.Matthew Somerville2017-08-09-1/+1
| |
* | Merge branch 'master' of git://github.com/jonkri/fixmystreetMatthew Somerville2017-08-10-296/+892
|\ \
| * | [FixaMinGata] Add updated translationJon Kristensen2017-08-09-296/+892
| |/
* | [Borsetshire] Custom Google Map stylesZarino Zappia2017-08-09-1/+2
| | | | | | | | Fixes #1792.
* | [Borsetshire] Demo behaviour and help.Matthew Somerville2017-08-08-0/+69
| | | | | | | | | | The front page redirects to report area, ignoring whatever is entered, and the sign in page includes details of the demo accounts.
* | Don't redirect if logged in & auth form submitted.Matthew Somerville2017-08-08-1/+1
|/ | | | | | If you submit the auth form (as opposed to clicking a link to something that redirects to the auth form), we should assume you want to treat that as a login.
* Merge branch 'always-show-list-numbers'Matthew Somerville2017-08-08-1/+3
|\
| * Always show pagination figures if >1 report.Matthew Somerville2017-08-08-1/+3
| | | | | | | | Even if no next/previous page, the number of items can be useful.
* | Merge branch 'issues/forcouncils/208-shortlisted-tooltip'Matthew Somerville2017-08-08-1/+5
|\ \ | |/ |/|
| * Output current shortlist holder in list tooltips.Matthew Somerville2017-08-04-1/+5
| |
* | [fixmystreet.com] Send demo request emails to bettercities@ instead of the ↵Dave Arter2017-08-07-1/+1
| | | | | | | | whole team
* | Update map size if an extra column has appeared.Matthew Somerville2017-08-05-1/+2
| | | | | | | | | | | | Pulling in a report via JavaScript that has two columns (e.g. the inspect form) changes the size of the map, so updateSize needs to be called.
* | Stop update form toggle causing report submission.Matthew Somerville2017-08-05-1/+3
| | | | | | | | | | | | If the report is loaded with JavaScript, the outer form (for a new report) is present and would otherwise take this click and start a broken new report submission.
* | Stop errors from JS validator due to form in form.Matthew Somerville2017-08-05-1/+2
| | | | | | | | | | | | | | | | | | The outer form is using the JS validator, which means the validator is called for any event on the inner form fields. If the inner form isn't using the JS validator, it errors as it assumes the closest form has a validator object on it. Having the inner form use the JS validator shouldn't have any effect.
* | Set up action scheduled field when report loaded.Matthew Somerville2017-08-05-0/+3
| | | | | | | | | | This meant if a report was loaded via JavaScript, the action scheduled buttons were not being shown at the appropriate point.
* | Don't put filter_category in URL if no categories.Matthew Somerville2017-08-05-2/+7
|/
* [fixmystreet.com] More realistic asphalt tile imageZarino Zappia2017-08-04-4/+33
| | | | | | | | | | The black and yellow background image tiles now look more like asphalt and less like leather. Also, high-dpi screens now get a double resolution tile, which avoids noticeable jpeg artifacting on the yellow #front-main in particular. Fixes #1715.
* Version 2.1.1v2.1.1Struan Donald2017-08-03-2/+6
|
* Translation updates from Transifex/new strings.Matthew Somerville2017-08-03-6769/+9817
|
* Make map image in HTML emails clickableZarino Zappia2017-08-03-8/+21
| | | | | | | | Emails that contain a report’s title, description, and location in the ”sidebar” will now have a map that takes you to the report’s web page when clicked. Fixes #1596. Thanks to @MyfanwyNixon for the suggestion!
* Update changelog.Matthew Somerville2017-08-03-0/+13
|
* Merge branch '1752-show-hide-js'Matthew Somerville2017-08-03-35/+20
|\
| * Use standard JS translation for show/hide pins.Matthew Somerville2017-08-03-35/+20
| |
* | Merge branch '1755-update-schema-when-empty'Matthew Somerville2017-08-03-27/+32
|\ \ | |/ |/|
| * Allow update-schema to run on empty database.Matthew Somerville2017-08-03-27/+32
| |
* | Merge branch '1765-localise-about-templates'Dave Arter2017-08-02-6/+8
|\ \ | |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-19 02:39:21 +0000