aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | | Merge branch 'issues/forcouncils/187-all-reports-filter-by-substates'Matthew Somerville2017-08-17-0/+105
|\ \ \
| * | | allow body users to filter on all problem categoriesStruan Donald2017-08-17-0/+105
| |/ / | | | | | | | | | | | | | | | Not just New/Fixed/Closed but the Investigating etc Fixes #1790
* | | Merge branch 'edit-defecttypes-tests'Matthew Somerville2017-08-17-0/+193
|\ \ \ | |/ / |/| |
| * | tests for the defect types admin interfaceStruan Donald2017-08-17-0/+193
| | |
* | | [fixmystreet.com] Encode ampersands in link hrefsZarino Zappia2017-08-17-8/+8
|/ /
* / [fixmystreet.com] Donation link on success pagesZarino Zappia2017-08-17-20/+15
|/ | | | Part of #1384.
* [Travis] Ignore perllib/Email.Matthew Somerville2017-08-17-1/+1
|
* Merge branch '1743-report-extras-editing'Dave Arter2017-08-17-31/+883
|\
| * Add site-wide extra fields for reports, and admin UI to manageDave Arter2017-08-17-31/+877
| | | | | | | | | | | | | | - Also provides an editor for the extra Open311 fields on contacts. - Adds .btn--small class for small buttons Fixes #1743.
| * Add make_css flag to run script after compilationDave Arter2017-08-17-0/+6
|/ | | | | | | | | In conjunction with the --watch flag, the new --script flag can be used to run a given command after compilation caused by files changing. E.g. you could reload your browser automatically upon hitting save in your editor, with something like https://gist.github.com/davea/07a7456da15eeb8c47f1fb66e4b96c54
* Merge branch 'duplicate-reverse'Matthew Somerville2017-08-17-3/+47
|\
| * Store duplicate reverse lookups upon dupe setting.Matthew Somerville2017-08-17-3/+47
| | | | | | | | | | | | This avoids the need to search the whole table to find a report's duplicates. And is easier than constructing an index or upgrading PostgreSQL.
* | [Bromley] Template text tweaks.Matthew Somerville2017-08-17-5/+18
| |
* | translate defect category names in the controllerStruan Donald2017-08-16-2/+2
| | | | | | | | | | | | | | As we're only passing category names through we need to do the translation in the controller and not the template Fixes mysociety/fixmystreetforcouncils#218
* | enable body users to add problem updates anonymouslyStruan Donald2017-08-16-2/+22
| |
* | enable body users to report problems anonymouslyStruan Donald2017-08-16-3/+44
|/ | | | | | uses the body user but flags the report as anonymous Fixes #fixmystreetforcouncils/207
* Document fetch-comments-24hs in crontab example.Matthew Somerville2017-08-15-2/+4
| | | | In the absence of making any changes. Fixes #1739.
* Don't use phone number as report ID.Matthew Somerville2017-08-15-3/+1
| | | | This led to a wrong/bad request for nearby duplicates.
* The Nearby model works in kilometres, not metres.Matthew Somerville2017-08-15-1/+1
| | | | | I think we probably don't care about reports in John o'Groats when we're in Oxford.
* 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
|\
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 12:17:10 +0000