rails.git
2 years agoAdd a redirect and error message if user ends up trying to report something without...
Andy Allan [Wed, 14 Mar 2018 09:09:57 +0000 (17:09 +0800)]
Add a redirect and error message if user ends up trying to report something without the correct parameters

2 years agoHandle issue_types properly if current_user is both and admin and a moderator
Andy Allan [Wed, 14 Mar 2018 08:45:57 +0000 (16:45 +0800)]
Handle issue_types properly if current_user is both and admin and a moderator

2 years agoHandle current_user being both an admin and a moderator for building user list
Andy Allan [Wed, 14 Mar 2018 08:41:07 +0000 (16:41 +0800)]
Handle current_user being both an admin and a moderator for building user list

2 years agoUnwind the set_issues method
Andy Allan [Wed, 14 Mar 2018 08:34:19 +0000 (16:34 +0800)]
Unwind the set_issues method

2 years agoCreate a more accurate permissions check message
Andy Allan [Wed, 14 Mar 2018 08:29:47 +0000 (16:29 +0800)]
Create a more accurate permissions check message

2 years agoRemove cascading deletes, add another foreign key, and switch index around.
Andy Allan [Wed, 14 Mar 2018 08:15:39 +0000 (16:15 +0800)]
Remove cascading deletes, add another foreign key, and switch index around.

2 years agoEnsure reports have an issue id and a user id
Andy Allan [Wed, 14 Mar 2018 07:24:16 +0000 (15:24 +0800)]
Ensure reports have an issue id and a user id

2 years agoRemove nonsense has_one relationship
Andy Allan [Wed, 14 Mar 2018 07:20:04 +0000 (15:20 +0800)]
Remove nonsense has_one relationship

2 years agoFix class name
Andy Allan [Wed, 14 Mar 2018 07:18:47 +0000 (15:18 +0800)]
Fix class name

2 years agoRemove unnecessary div
Andy Allan [Wed, 14 Mar 2018 07:16:51 +0000 (15:16 +0800)]
Remove unnecessary div

2 years agoApply list styling to list of related reports
Andy Allan [Wed, 14 Mar 2018 07:14:35 +0000 (15:14 +0800)]
Apply list styling to list of related reports

2 years agoUse th instead of td and b
Andy Allan [Wed, 14 Mar 2018 06:56:06 +0000 (14:56 +0800)]
Use th instead of td and b

2 years agoUser user_path to generate links to users
Andy Allan [Wed, 14 Mar 2018 06:21:43 +0000 (14:21 +0800)]
User user_path to generate links to users

2 years agoAvoid wrapping in the reports count column
Andy Allan [Wed, 14 Mar 2018 05:06:32 +0000 (13:06 +0800)]
Avoid wrapping in the reports count column

2 years agoCombine last_updated_by and last_updated_at columns on issues index
Andy Allan [Wed, 14 Mar 2018 04:50:25 +0000 (12:50 +0800)]
Combine last_updated_by and last_updated_at columns on issues index

Also change to use time as a distance, and link to the user.

2 years agoCombine category and reporting user
Andy Allan [Wed, 14 Mar 2018 04:21:52 +0000 (12:21 +0800)]
Combine category and reporting user

2 years agoIncrease padding around report disclaimer
Andy Allan [Wed, 14 Mar 2018 04:18:25 +0000 (12:18 +0800)]
Increase padding around report disclaimer

2 years agoRemove vandalism as an option for reporting notes.
Andy Allan [Wed, 14 Mar 2018 04:14:59 +0000 (12:14 +0800)]
Remove vandalism as an option for reporting notes.

2 years agoUse lower case to refer to reportable objects
Andy Allan [Wed, 14 Mar 2018 04:13:43 +0000 (12:13 +0800)]
Use lower case to refer to reportable objects

2 years agoUse underscore versions of model names for translation keys.
Andy Allan [Wed, 14 Mar 2018 04:12:24 +0000 (12:12 +0800)]
Use underscore versions of model names for translation keys.

2 years agoFix grammar
Andy Allan [Wed, 14 Mar 2018 03:58:55 +0000 (11:58 +0800)]
Fix grammar

2 years agoRemove unused code
Andy Allan [Mon, 5 Mar 2018 02:19:11 +0000 (10:19 +0800)]
Remove unused code

2 years agoRubocop fixes
Andy Allan [Wed, 28 Feb 2018 08:23:25 +0000 (16:23 +0800)]
Rubocop fixes

2 years agoUpdate tests for new link text
Andy Allan [Wed, 28 Feb 2018 08:10:30 +0000 (16:10 +0800)]
Update tests for new link text

2 years agoMerge branch 'master' into moderation
Andy Allan [Wed, 28 Feb 2018 07:55:28 +0000 (15:55 +0800)]
Merge branch 'master' into moderation

2 years agoMerge branch 'master' into moderation
Andy Allan [Wed, 28 Feb 2018 07:46:25 +0000 (15:46 +0800)]
Merge branch 'master' into moderation

2 years agoReposition the note and user report flags
Andy Allan [Wed, 28 Feb 2018 07:43:22 +0000 (15:43 +0800)]
Reposition the note and user report flags

2 years agoRework the new report form text and layout
Andy Allan [Wed, 28 Feb 2018 07:27:01 +0000 (15:27 +0800)]
Rework the new report form text and layout

2 years agoRearrange issues table and combine some columns.
Andy Allan [Wed, 28 Feb 2018 06:56:47 +0000 (14:56 +0800)]
Rearrange issues table and combine some columns.

2 years agoRemove reporting of changesets
Andy Allan [Wed, 28 Feb 2018 06:39:40 +0000 (14:39 +0800)]
Remove reporting of changesets

2 years agoAllow reporting of anonymous notes
Andy Allan [Wed, 28 Feb 2018 06:26:40 +0000 (14:26 +0800)]
Allow reporting of anonymous notes

2 years agoRefactor reportable_url to just return the url
Andy Allan [Wed, 28 Feb 2018 04:15:45 +0000 (12:15 +0800)]
Refactor reportable_url to just return the url

Allows removal of the largely duplicate instance_url helper (which
returned the same urls, but with a hard-coded title).

2 years agoRefactor reportable_url helper to focus on just the title choices.
Andy Allan [Wed, 28 Feb 2018 03:53:43 +0000 (11:53 +0800)]
Refactor reportable_url helper to focus on just the title choices.

2 years agoRemove the report_type helper and use the model_name.human to look up translations.
Andy Allan [Wed, 28 Feb 2018 03:40:00 +0000 (11:40 +0800)]
Remove the report_type helper and use the model_name.human to look up translations.

2 years agoLink to diary comments using anchors, rather than showing them alone
Andy Allan [Wed, 28 Feb 2018 03:24:00 +0000 (11:24 +0800)]
Link to diary comments using anchors, rather than showing them alone

Neither way is perfect, but this is less surprising than seeing a diary
entry with only one comment visible.

2 years agoAllow the status to be translated in the table of results
Andy Allan [Wed, 28 Feb 2018 02:50:27 +0000 (10:50 +0800)]
Allow the status to be translated in the table of results

2 years agoRework status search to avoid relying on the enum ids, and also to allow translations
Andy Allan [Wed, 28 Feb 2018 02:44:50 +0000 (10:44 +0800)]
Rework status search to avoid relying on the enum ids, and also to allow translations

2 years agoMerge remote-tracking branch 'upstream/pull/1772'
Tom Hughes [Tue, 27 Feb 2018 20:37:53 +0000 (20:37 +0000)]
Merge remote-tracking branch 'upstream/pull/1772'

2 years agoMove abbr style from border to text-decoration
Holger Jeromin [Tue, 27 Feb 2018 20:25:03 +0000 (21:25 +0100)]
Move abbr style from border to text-decoration

2 years agoMerge remote-tracking branch 'upstream/pull/1769'
Tom Hughes [Tue, 27 Feb 2018 20:22:15 +0000 (20:22 +0000)]
Merge remote-tracking branch 'upstream/pull/1769'

2 years agoRemove underline from abbr elements
Tom Hughes [Tue, 27 Feb 2018 20:19:52 +0000 (20:19 +0000)]
Remove underline from abbr elements

Fixes #1771

2 years agoTrace everywhere in potlatch too
Aaron Lidman [Tue, 27 Feb 2018 06:42:29 +0000 (22:42 -0800)]
Trace everywhere in potlatch too

2 years agoUse trace consistently, closes #1644
Aaron Lidman [Tue, 27 Feb 2018 06:42:03 +0000 (22:42 -0800)]
Use trace consistently, closes #1644

2 years agoExclude hidden diary entries and comments from spam scoring
Tom Hughes [Mon, 26 Feb 2018 22:35:06 +0000 (22:35 +0000)]
Exclude hidden diary entries and comments from spam scoring

2 years agoUse bolded version of destinations
Tom Hughes [Sun, 25 Feb 2018 21:29:54 +0000 (21:29 +0000)]
Use bolded version of destinations

2 years agoFix translation keys for on ramps
Tom Hughes [Sun, 25 Feb 2018 20:56:17 +0000 (20:56 +0000)]
Fix translation keys for on ramps

2 years agoUpdate to rails 5.1.5
Tom Hughes [Sun, 25 Feb 2018 20:52:22 +0000 (20:52 +0000)]
Update to rails 5.1.5

2 years agoShow exit numbers for off ramps in OSRM directions
Tom Hughes [Sun, 25 Feb 2018 20:51:11 +0000 (20:51 +0000)]
Show exit numbers for off ramps in OSRM directions

Fixes #1768

2 years agoUpdate wiki page data
Mateusz Konieczny [Sat, 24 Feb 2018 18:31:09 +0000 (19:31 +0100)]
Update wiki page data

Closes #1767

2 years agoAvoid submit_tag to avoid 'Save changes' default
Andy Allan [Fri, 23 Feb 2018 04:30:37 +0000 (12:30 +0800)]
Avoid submit_tag to avoid 'Save changes' default

2 years agoMerge pull request #1758 from ardean80/patch-1
Andy Allan [Fri, 23 Feb 2018 03:01:11 +0000 (11:01 +0800)]
Merge pull request #1758 from ardean80/patch-1

Update country.rb

2 years agoMerge pull request #1732 from tomhughes/npemap
Andy Allan [Fri, 23 Feb 2018 02:23:22 +0000 (10:23 +0800)]
Merge pull request #1732 from tomhughes/npemap

Remove npemap as a source for UK postcodes

2 years agoresolve last_reported_by vs last_updated_by duplication
Andy Allan [Fri, 23 Feb 2018 02:18:57 +0000 (10:18 +0800)]
resolve last_reported_by vs last_updated_by duplication

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Feb 2018 11:21:36 +0000 (12:21 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Feb 2018 08:22:31 +0000 (09:22 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoAdd libffi to requirements
Tom Hughes [Sun, 18 Feb 2018 10:22:34 +0000 (10:22 +0000)]
Add libffi to requirements

2 years agoUpdate country.rb
ardean80 [Fri, 16 Feb 2018 13:43:53 +0000 (14:43 +0100)]
Update country.rb

Without adding "Rails.root.join(...)" (or something else returning a complete path to the countries.xml file) this error occurred:
"No such file or directory @ rb_sysopen - config/countries.xml"
I think it happened because it could not find that file through a relative path.

2 years agoFix route path 'hovering' when marker positions are changed
Jamie Guthrie [Wed, 14 Feb 2018 19:54:53 +0000 (19:54 +0000)]
Fix route path 'hovering' when marker positions are changed

Closes #1755

2 years agoFix directions for roundabout without exit number
Jamie Guthrie [Thu, 15 Feb 2018 09:53:00 +0000 (09:53 +0000)]
Fix directions for roundabout without exit number

Closes #1756

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Feb 2018 09:00:41 +0000 (10:00 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate bundle
Tom Hughes [Wed, 14 Feb 2018 21:14:47 +0000 (21:14 +0000)]
Update bundle

2 years agoAvoid relying on global state to detect when we are dragging
Tom Hughes [Wed, 14 Feb 2018 17:58:01 +0000 (17:58 +0000)]
Avoid relying on global state to detect when we are dragging

We can't guarantee what order getRoute calls will finish in so
relying on global state is dangerous - capture it in the closure
instead so that each route knows what it is doing.

2 years agoStop map zooming out after dropping marker
Tom Hughes [Wed, 14 Feb 2018 01:19:30 +0000 (01:19 +0000)]
Stop map zooming out after dropping marker

Closes #1751

2 years agoChange directions start to say 'on road' rather than 'at end of road'
Jamie Guthrie [Wed, 14 Feb 2018 00:22:39 +0000 (00:22 +0000)]
Change directions start to say 'on road' rather than 'at end of road'

Closes #1750

2 years agoSmall comment fix
mmd-osm [Tue, 13 Feb 2018 22:24:07 +0000 (23:24 +0100)]
Small comment fix

2 years agoRemove BBOX expansion performance optimization
mmd-osm [Tue, 13 Feb 2018 22:07:30 +0000 (23:07 +0100)]
Remove BBOX expansion performance optimization

Closes #1749
Fixes #1742

2 years agoCorrectly swap from and to values when reversing directions
Jamie Guthrie [Wed, 14 Feb 2018 06:49:41 +0000 (06:49 +0000)]
Correctly swap from and to values when reversing directions

Closes #1752
Fixes #1748

2 years agoImprove OSRM directions for on and off ramps
Jamie Guthrie [Tue, 13 Feb 2018 17:28:09 +0000 (17:28 +0000)]
Improve OSRM directions for on and off ramps

Try and show both the name of the road being turned on to and the
destination depending on what is available.

Closes #1740

2 years agoAdd padding to directions popups
Jamie Guthrie [Tue, 13 Feb 2018 01:28:57 +0000 (01:28 +0000)]
Add padding to directions popups

Clicking on a direction step now pans to the popup, but includes some
padding so that the popup is not hidden in the corner of the screen.

Closes #1745

2 years agoUse both name and ref when naming roads in directions
Jamie Guthrie [Mon, 12 Feb 2018 07:29:31 +0000 (07:29 +0000)]
Use both name and ref when naming roads in directions

Closes #1741

2 years agoUpdate wiki_pages.yml, fix http url in update script
mmd-osm [Sun, 11 Feb 2018 16:40:31 +0000 (17:40 +0100)]
Update wiki_pages.yml, fix http url in update script

2 years agoFix broken translation
Tom Hughes [Mon, 12 Feb 2018 20:11:30 +0000 (20:11 +0000)]
Fix broken translation

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Feb 2018 07:40:25 +0000 (08:40 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoUse https when redirecting to the render server
Tom Hughes [Fri, 9 Feb 2018 22:31:45 +0000 (22:31 +0000)]
Use https when redirecting to the render server

2 years agoUse correct class to disable zoom buttons
Tom Hughes [Fri, 9 Feb 2018 18:49:58 +0000 (18:49 +0000)]
Use correct class to disable zoom buttons

Fixes #1365

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Feb 2018 09:08:10 +0000 (10:08 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoUse configured protocol for URLs in diary feeds
Tom Hughes [Mon, 5 Feb 2018 22:31:27 +0000 (22:31 +0000)]
Use configured protocol for URLs in diary feeds

2 years agoUse configured server protocol for shared URLs
Tom Hughes [Mon, 5 Feb 2018 21:03:45 +0000 (21:03 +0000)]
Use configured server protocol for shared URLs

Closes #939

2 years agoUse configured server protocol for links in e-mail notifications
Tom Hughes [Mon, 5 Feb 2018 21:01:36 +0000 (21:01 +0000)]
Use configured server protocol for links in e-mail notifications

Closes #1341

2 years agoMake OSM::GreatCircle clamp results to the globe
Tom Hughes [Sun, 4 Feb 2018 17:42:40 +0000 (17:42 +0000)]
Make OSM::GreatCircle clamp results to the globe

2 years agoMake travis build 3GL quad tile functions
Tom Hughes [Sun, 4 Feb 2018 17:38:55 +0000 (17:38 +0000)]
Make travis build 3GL quad tile functions

2 years agoAdd tests for quad tiles
Tom Hughes [Sun, 4 Feb 2018 17:33:44 +0000 (17:33 +0000)]
Add tests for quad tiles

2 years agoFix C version of QuadTile#tiles_for_area to return correct tiles
Tom Hughes [Sun, 4 Feb 2018 17:22:06 +0000 (17:22 +0000)]
Fix C version of QuadTile#tiles_for_area to return correct tiles

2 years agoRemove npemap as a source for UK postcodes
Tom Hughes [Mon, 29 Jan 2018 18:53:57 +0000 (18:53 +0000)]
Remove npemap as a source for UK postcodes

2 years agoMerge remote-tracking branch 'upstream/pull/1704'
Tom Hughes [Sun, 4 Feb 2018 15:09:40 +0000 (15:09 +0000)]
Merge remote-tracking branch 'upstream/pull/1704'

2 years agoAdd marker at trace start coordinate
Biswesh Mohapatra [Sun, 4 Feb 2018 00:32:35 +0000 (06:02 +0530)]
Add marker at trace start coordinate

Fixes #1676
Closes #1731

2 years agoRemove duplicate link: traces >> more
Biswesh Mohapatra [Sat, 3 Feb 2018 23:16:12 +0000 (04:46 +0530)]
Remove duplicate link: traces >> more

Fixes #1699
Closes #1730

2 years agoAllow lat/lon from the URL to take precedence when routing
Tom Hughes [Sat, 3 Feb 2018 16:39:39 +0000 (16:39 +0000)]
Allow lat/lon from the URL to take precedence when routing

2 years agoGo through the router when reversing directions
Tom Hughes [Sat, 3 Feb 2018 16:21:35 +0000 (16:21 +0000)]
Go through the router when reversing directions

2 years agoMerge remote-tracking branch 'upstream/pull/1693'
Tom Hughes [Sat, 3 Feb 2018 16:12:51 +0000 (16:12 +0000)]
Merge remote-tracking branch 'upstream/pull/1693'

2 years agoMerge remote-tracking branch 'upstream/pull/1727'
Tom Hughes [Thu, 1 Feb 2018 22:43:36 +0000 (22:43 +0000)]
Merge remote-tracking branch 'upstream/pull/1727'

2 years agoFix typo
Mikkel Kirkgaard Nielsen [Thu, 1 Feb 2018 20:37:40 +0000 (21:37 +0100)]
Fix typo

Closes #1728

2 years agoUse https for default style tiles
Tom Hughes [Thu, 1 Feb 2018 20:17:01 +0000 (20:17 +0000)]
Use https for default style tiles

2 years agoUpdate to iD v2.6.1
Bryan Housel [Thu, 1 Feb 2018 16:43:19 +0000 (11:43 -0500)]
Update to iD v2.6.1

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 1 Feb 2018 09:03:02 +0000 (10:03 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoAllow cross domain flash access from http sites
Tom Hughes [Tue, 30 Jan 2018 12:59:47 +0000 (12:59 +0000)]
Allow cross domain flash access from http sites

2 years agoNormalise newlines in incoming emails
Tom Hughes [Tue, 30 Jan 2018 00:27:01 +0000 (00:27 +0000)]
Normalise newlines in incoming emails

Fixes #1708

2 years agoMerge remote-tracking branch 'upstream/pull/1726'
Tom Hughes [Mon, 29 Jan 2018 18:54:18 +0000 (18:54 +0000)]
Merge remote-tracking branch 'upstream/pull/1726'

2 years agoUpdate query icon to display cursor with '?'
Bryan Housel [Mon, 29 Jan 2018 18:21:23 +0000 (13:21 -0500)]
Update query icon to display cursor with '?'
(fixes #1712)

2 years agoAdd '+' to note icon ("add a note to the map")
Bryan Housel [Mon, 29 Jan 2018 17:25:00 +0000 (12:25 -0500)]
Add '+' to note icon ("add a note to the map")