]> git.openstreetmap.org Git - rails.git/log
rails.git
6 years agoAlter class to avoid conflict with model test class
Andy Allan [Wed, 11 Apr 2018 08:05:13 +0000 (16:05 +0800)]
Alter class to avoid conflict with model test class

6 years agoSet default_url_options for action_mailer
Andy Allan [Wed, 11 Apr 2018 07:53:30 +0000 (15:53 +0800)]
Set default_url_options for action_mailer

This saves having to repeat the same host and protocol options
throughout the notifiers

6 years agoAdd better_errors gem for easier debugging
Andy Allan [Wed, 11 Apr 2018 06:07:38 +0000 (14:07 +0800)]
Add better_errors gem for easier debugging

6 years agoFix handling of title when replying to diary entries
Andy Allan [Wed, 11 Apr 2018 06:03:17 +0000 (14:03 +0800)]
Fix handling of title when replying to diary entries

6 years agoRefactor @this_user to @user
Andy Allan [Wed, 11 Apr 2018 03:42:33 +0000 (11:42 +0800)]
Refactor @this_user to @user

Historically we used @user for the currently logged in user, but
this was changed to `current_user` in 2017.

6 years agoMerge branch 'master' into moderation
Andy Allan [Wed, 11 Apr 2018 01:54:04 +0000 (09:54 +0800)]
Merge branch 'master' into moderation

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Apr 2018 06:27:07 +0000 (08:27 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoAsk for confirmation before deleting a trace
Tom Hughes [Thu, 5 Apr 2018 20:16:28 +0000 (21:16 +0100)]
Ask for confirmation before deleting a trace

Fixes #1812

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Apr 2018 07:31:53 +0000 (09:31 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoReworded roundabout exit text
J Guthrie [Mon, 2 Apr 2018 22:20:31 +0000 (23:20 +0100)]
Reworded roundabout exit text

6 years agoMerge remote-tracking branch 'upstream/pull/1804'
Tom Hughes [Mon, 2 Apr 2018 14:41:35 +0000 (15:41 +0100)]
Merge remote-tracking branch 'upstream/pull/1804'

6 years agoMerge remote-tracking branch 'upstream/pull/1801'
Tom Hughes [Mon, 2 Apr 2018 14:25:17 +0000 (15:25 +0100)]
Merge remote-tracking branch 'upstream/pull/1801'

6 years agoTweak highlighting of geolocation errors
Tom Hughes [Mon, 2 Apr 2018 14:24:03 +0000 (15:24 +0100)]
Tweak highlighting of geolocation errors

6 years agoMerge remote-tracking branch 'upstream/pull/1800'
Tom Hughes [Mon, 2 Apr 2018 14:18:11 +0000 (15:18 +0100)]
Merge remote-tracking branch 'upstream/pull/1800'

6 years agoAdded autoPan for Directions markers
J Guthrie [Sat, 31 Mar 2018 21:18:25 +0000 (22:18 +0100)]
Added autoPan for Directions markers

6 years agoConverted roundabouts to take "1st, 2nd, 3rd" exit etc
J Guthrie [Sat, 31 Mar 2018 15:58:17 +0000 (16:58 +0100)]
Converted roundabouts to take "1st, 2nd, 3rd" exit etc

6 years agoAdded missing onramp instructions to locale file
J Guthrie [Sat, 31 Mar 2018 15:31:35 +0000 (16:31 +0100)]
Added missing onramp instructions to locale file

6 years agoMoved inline styling to stylesheet
J Guthrie [Thu, 29 Mar 2018 21:48:39 +0000 (22:48 +0100)]
Moved inline styling to stylesheet

6 years agoRemove/replace redundant no_place locale translation
J Guthrie [Thu, 29 Mar 2018 21:27:33 +0000 (22:27 +0100)]
Remove/replace redundant no_place locale translation

6 years agoUnlocateable place now highlighted in red and specified in error message
J Guthrie [Thu, 29 Mar 2018 19:50:29 +0000 (20:50 +0100)]
Unlocateable place now highlighted in red and specified in error message

The textbox containing the unlocateable place gets highlighted in red
Also added a new locale value to specify an error for a specific place

6 years agoMerge remote-tracking branch 'upstream/pull/1796'
Tom Hughes [Thu, 29 Mar 2018 07:35:03 +0000 (08:35 +0100)]
Merge remote-tracking branch 'upstream/pull/1796'

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 29 Mar 2018 07:16:45 +0000 (09:16 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoMerge remote-tracking branch 'upstream/pull/1799'
Tom Hughes [Wed, 28 Mar 2018 16:38:34 +0000 (17:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1799'

6 years agoMerge remote-tracking branch 'upstream/pull/1798'
Tom Hughes [Wed, 28 Mar 2018 16:33:35 +0000 (17:33 +0100)]
Merge remote-tracking branch 'upstream/pull/1798'

6 years agoMerge remote-tracking branch 'upstream/pull/1797'
Tom Hughes [Wed, 28 Mar 2018 16:33:01 +0000 (17:33 +0100)]
Merge remote-tracking branch 'upstream/pull/1797'

6 years agoMerge remote-tracking branch 'upstream/pull/1795'
Tom Hughes [Wed, 28 Mar 2018 16:23:21 +0000 (17:23 +0100)]
Merge remote-tracking branch 'upstream/pull/1795'

6 years agoStrip trailing whitespace from multiline html translations
Andy Allan [Wed, 28 Mar 2018 09:16:17 +0000 (17:16 +0800)]
Strip trailing whitespace from multiline html translations

6 years agoBe more consistent with 'my' vs 'your' for objects that belong to
Andy Allan [Wed, 28 Mar 2018 09:07:50 +0000 (17:07 +0800)]
Be more consistent with 'my' vs 'your' for objects that belong to
the user

6 years agoUse named paths for a few trace links
Andy Allan [Wed, 28 Mar 2018 08:55:10 +0000 (16:55 +0800)]
Use named paths for a few trace links

6 years agoMove the api routes into the api/0.6 scope
Andy Allan [Wed, 28 Mar 2018 07:38:10 +0000 (15:38 +0800)]
Move the api routes into the api/0.6 scope

6 years agoRemove unnecessary route aliases
Andy Allan [Wed, 28 Mar 2018 07:29:24 +0000 (15:29 +0800)]
Remove unnecessary route aliases

These simply duplicate the aliases that are set by default.

6 years agoUse concise route definitions for single method routes
Andy Allan [Wed, 28 Mar 2018 07:03:32 +0000 (15:03 +0800)]
Use concise route definitions for single method routes

6 years agoDisable image_optim workers in tests
Andy Allan [Wed, 28 Mar 2018 05:52:51 +0000 (13:52 +0800)]
Disable image_optim workers in tests

They aren't needed for anything related to testing, and the warnings
about missing binaries adds noise to the test output.

6 years agoRemove image_optim config loading override
Andy Allan [Wed, 28 Mar 2018 05:50:26 +0000 (13:50 +0800)]
Remove image_optim config loading override

image_optim_rails loads the config files by default, and has a
built-in mechanism for per-environment configs. Forcing the config
loading in this way is unnecessary.

6 years agoSilence puma startup messages when running tests
Andy Allan [Wed, 28 Mar 2018 05:30:31 +0000 (13:30 +0800)]
Silence puma startup messages when running tests

6 years agoAdd more tests
Andy Allan [Wed, 28 Mar 2018 03:05:21 +0000 (11:05 +0800)]
Add more tests

6 years agoUpdate system tests for report link changes
Andy Allan [Wed, 28 Mar 2018 02:38:11 +0000 (10:38 +0800)]
Update system tests for report link changes

6 years agoAvoid sending a commit value from from the search button
Andy Allan [Wed, 21 Mar 2018 09:36:00 +0000 (17:36 +0800)]
Avoid sending a commit value from from the search button

6 years agoUse options_for_select to set the selected items in the search form
Andy Allan [Wed, 21 Mar 2018 09:35:36 +0000 (17:35 +0800)]
Use options_for_select to set the selected items in the search form

6 years agoCreate a report_link helper, and use text instead of a flag icon
Andy Allan [Wed, 21 Mar 2018 09:14:56 +0000 (17:14 +0800)]
Create a report_link helper, and use text instead of a flag icon

6 years agoFix new rubocop warnings
Tom Hughes [Mon, 26 Mar 2018 18:00:03 +0000 (19:00 +0100)]
Fix new rubocop warnings

6 years agoUpdate rubocop
Tom Hughes [Mon, 26 Mar 2018 17:49:50 +0000 (18:49 +0100)]
Update rubocop

6 years agoRevert to dalli 2.7.6
Tom Hughes [Mon, 26 Mar 2018 08:20:34 +0000 (09:20 +0100)]
Revert to dalli 2.7.6

6 years agoUpdate bundle
Tom Hughes [Mon, 26 Mar 2018 07:51:27 +0000 (08:51 +0100)]
Update bundle

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 26 Mar 2018 06:19:11 +0000 (08:19 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoMerge remote-tracking branch 'upstream/pull/1788'
Tom Hughes [Sun, 25 Mar 2018 13:27:16 +0000 (14:27 +0100)]
Merge remote-tracking branch 'upstream/pull/1788'

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Mar 2018 07:19:26 +0000 (08:19 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoConvert issue status to an enum
Andy Allan [Wed, 21 Mar 2018 04:05:08 +0000 (12:05 +0800)]
Convert issue status to an enum

6 years agoUse user_path links. Fixes #1785
Andy Allan [Wed, 21 Mar 2018 03:05:46 +0000 (11:05 +0800)]
Use user_path links. Fixes #1785

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Mar 2018 20:07:35 +0000 (21:07 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Mar 2018 15:10:33 +0000 (16:10 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoRefactor set_default_assigned_role to be more easily read.
Andy Allan [Wed, 14 Mar 2018 09:35:58 +0000 (17:35 +0800)]
Refactor set_default_assigned_role to be more easily read.

6 years agoRedirect to the reportable after creating a report.
Andy Allan [Wed, 14 Mar 2018 09:24:41 +0000 (17:24 +0800)]
Redirect to the reportable after creating a report.

6 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

6 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

6 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

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

6 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

6 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.

6 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

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

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

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

6 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

6 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

6 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

6 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

6 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.

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

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

6 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.

6 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

6 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.

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

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Mar 2018 08:10:50 +0000 (09:10 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoUpdate to iD v2.7.1
Bryan Housel [Sun, 11 Mar 2018 15:58:48 +0000 (11:58 -0400)]
Update to iD v2.7.1

6 years agoMerge branch 'pull/1765'
Andy Allan [Fri, 9 Mar 2018 07:57:24 +0000 (15:57 +0800)]
Merge branch 'pull/1765'

6 years agoSimplify redirect.
Andy Allan [Fri, 9 Mar 2018 07:56:56 +0000 (15:56 +0800)]
Simplify redirect.

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Mar 2018 08:43:51 +0000 (09:43 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoAdded support for 2 more secondary wikidata tag links
Štefan Baebler [Sun, 4 Mar 2018 23:01:19 +0000 (00:01 +0100)]
Added support for 2 more secondary wikidata tag links

Listed on in https://wiki.openstreetmap.org/wiki/Key:wikidata :
* name:etymology:wikidata
* network:wikidata

6 years agoUpdate to iD v2.7.0
Bryan Housel [Fri, 2 Mar 2018 23:06:44 +0000 (18:06 -0500)]
Update to iD v2.7.0

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 5 Mar 2018 08:32:42 +0000 (09:32 +0100)]
Localisation updates from https://translatewiki.net.

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

6 years agoValidate user location is sensible
Tom Hughes [Sun, 4 Mar 2018 10:53:14 +0000 (10:53 +0000)]
Validate user location is sensible

6 years agoUse home_tile to find nearby users
Tom Hughes [Sun, 4 Feb 2018 16:03:16 +0000 (16:03 +0000)]
Use home_tile to find nearby users

6 years agoMake OSM::GreatCircle#bounds return a BoundingBox object
Tom Hughes [Sun, 4 Feb 2018 15:54:13 +0000 (15:54 +0000)]
Make OSM::GreatCircle#bounds return a BoundingBox object

6 years agoAdd an indexed home_tile column to the user table
Tom Hughes [Sun, 4 Feb 2018 15:49:12 +0000 (15:49 +0000)]
Add an indexed home_tile column to the user table

6 years agoChange test case
biswesh456 [Sat, 3 Mar 2018 14:50:52 +0000 (20:20 +0530)]
Change test case

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 1 Mar 2018 07:22:44 +0000 (08:22 +0100)]
Localisation updates from https://translatewiki.net.

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

6 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

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

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

6 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

6 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

6 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.

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

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

6 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).

6 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.