]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Wed, 18 Apr 2018 02:29:59 +0000 (10:29 +0800)]
Move the default_url_options config to the action_mailer initializer
We can't use Rails.application.config here because the initializers
run after ActionMailer::Base has been set up.
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
translatewiki.net [Mon, 9 Apr 2018 06:27:07 +0000 (08:27 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 5 Apr 2018 20:16:28 +0000 (21:16 +0100)]
Ask for confirmation before deleting a trace
Fixes #1812
translatewiki.net [Thu, 5 Apr 2018 07:31:53 +0000 (09:31 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 2 Apr 2018 14:41:35 +0000 (15:41 +0100)]
Merge remote-tracking branch 'upstream/pull/1804'
Tom Hughes [Mon, 2 Apr 2018 14:25:17 +0000 (15:25 +0100)]
Merge remote-tracking branch 'upstream/pull/1801'
Tom Hughes [Mon, 2 Apr 2018 14:24:03 +0000 (15:24 +0100)]
Tweak highlighting of geolocation errors
Tom Hughes [Mon, 2 Apr 2018 14:18:11 +0000 (15:18 +0100)]
Merge remote-tracking branch 'upstream/pull/1800'
J Guthrie [Sat, 31 Mar 2018 21:18:25 +0000 (22:18 +0100)]
Added autoPan for Directions markers
J Guthrie [Sat, 31 Mar 2018 15:31:35 +0000 (16:31 +0100)]
Added missing onramp instructions to locale file
J Guthrie [Thu, 29 Mar 2018 21:48:39 +0000 (22:48 +0100)]
Moved inline styling to stylesheet
J Guthrie [Thu, 29 Mar 2018 21:27:33 +0000 (22:27 +0100)]
Remove/replace redundant no_place locale translation
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
Tom Hughes [Thu, 29 Mar 2018 07:35:03 +0000 (08:35 +0100)]
Merge remote-tracking branch 'upstream/pull/1796'
translatewiki.net [Thu, 29 Mar 2018 07:16:45 +0000 (09:16 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 28 Mar 2018 16:38:34 +0000 (17:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1799'
Tom Hughes [Wed, 28 Mar 2018 16:33:35 +0000 (17:33 +0100)]
Merge remote-tracking branch 'upstream/pull/1798'
Tom Hughes [Wed, 28 Mar 2018 16:33:01 +0000 (17:33 +0100)]
Merge remote-tracking branch 'upstream/pull/1797'
Tom Hughes [Wed, 28 Mar 2018 16:23:21 +0000 (17:23 +0100)]
Merge remote-tracking branch 'upstream/pull/1795'
Andy Allan [Wed, 28 Mar 2018 09:16:17 +0000 (17:16 +0800)]
Strip trailing whitespace from multiline html translations
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
Andy Allan [Wed, 28 Mar 2018 08:55:10 +0000 (16:55 +0800)]
Use named paths for a few trace links
Andy Allan [Wed, 28 Mar 2018 07:38:10 +0000 (15:38 +0800)]
Move the api routes into the api/0.6 scope
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.
Andy Allan [Wed, 28 Mar 2018 07:03:32 +0000 (15:03 +0800)]
Use concise route definitions for single method routes
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.
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.
Andy Allan [Wed, 28 Mar 2018 05:30:31 +0000 (13:30 +0800)]
Silence puma startup messages when running tests
Tom Hughes [Mon, 26 Mar 2018 18:00:03 +0000 (19:00 +0100)]
Fix new rubocop warnings
Tom Hughes [Mon, 26 Mar 2018 17:49:50 +0000 (18:49 +0100)]
Update rubocop
Tom Hughes [Mon, 26 Mar 2018 08:20:34 +0000 (09:20 +0100)]
Revert to dalli 2.7.6
Tom Hughes [Mon, 26 Mar 2018 07:51:27 +0000 (08:51 +0100)]
Update bundle
translatewiki.net [Mon, 26 Mar 2018 06:19:11 +0000 (08:19 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 25 Mar 2018 13:27:16 +0000 (14:27 +0100)]
Merge remote-tracking branch 'upstream/pull/1788'
translatewiki.net [Thu, 22 Mar 2018 07:19:26 +0000 (08:19 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 21 Mar 2018 03:05:46 +0000 (11:05 +0800)]
Use user_path links. Fixes #1785
translatewiki.net [Mon, 19 Mar 2018 20:07:35 +0000 (21:07 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Mar 2018 15:10:33 +0000 (16:10 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Mar 2018 08:10:50 +0000 (09:10 +0100)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Sun, 11 Mar 2018 15:58:48 +0000 (11:58 -0400)]
Update to iD v2.7.1
Andy Allan [Fri, 9 Mar 2018 07:57:24 +0000 (15:57 +0800)]
Merge branch 'pull/1765'
Andy Allan [Fri, 9 Mar 2018 07:56:56 +0000 (15:56 +0800)]
Simplify redirect.
translatewiki.net [Thu, 8 Mar 2018 08:43:51 +0000 (09:43 +0100)]
Localisation updates from https://translatewiki.net.
Š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
Bryan Housel [Fri, 2 Mar 2018 23:06:44 +0000 (18:06 -0500)]
Update to iD v2.7.0
translatewiki.net [Mon, 5 Mar 2018 08:32:42 +0000 (09:32 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 4 Mar 2018 10:53:14 +0000 (10:53 +0000)]
Validate user location is sensible
Tom Hughes [Sun, 4 Feb 2018 16:03:16 +0000 (16:03 +0000)]
Use home_tile to find nearby users
Tom Hughes [Sun, 4 Feb 2018 15:54:13 +0000 (15:54 +0000)]
Make OSM::GreatCircle#bounds return a BoundingBox object
Tom Hughes [Sun, 4 Feb 2018 15:49:12 +0000 (15:49 +0000)]
Add an indexed home_tile column to the user table
biswesh456 [Sat, 3 Mar 2018 14:50:52 +0000 (20:20 +0530)]
Change test case
translatewiki.net [Thu, 1 Mar 2018 07:22:44 +0000 (08:22 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 27 Feb 2018 20:37:53 +0000 (20:37 +0000)]
Merge remote-tracking branch 'upstream/pull/1772'
Holger Jeromin [Tue, 27 Feb 2018 20:25:03 +0000 (21:25 +0100)]
Move abbr style from border to text-decoration
Tom Hughes [Tue, 27 Feb 2018 20:22:15 +0000 (20:22 +0000)]
Merge remote-tracking branch 'upstream/pull/1769'
Tom Hughes [Tue, 27 Feb 2018 20:19:52 +0000 (20:19 +0000)]
Remove underline from abbr elements
Fixes #1771
Aaron Lidman [Tue, 27 Feb 2018 06:42:29 +0000 (22:42 -0800)]
Trace everywhere in potlatch too
Aaron Lidman [Tue, 27 Feb 2018 06:42:03 +0000 (22:42 -0800)]
Use trace consistently, closes #1644
Tom Hughes [Mon, 26 Feb 2018 22:35:06 +0000 (22:35 +0000)]
Exclude hidden diary entries and comments from spam scoring
Tom Hughes [Sun, 25 Feb 2018 21:29:54 +0000 (21:29 +0000)]
Use bolded version of destinations
Tom Hughes [Sun, 25 Feb 2018 20:56:17 +0000 (20:56 +0000)]
Fix translation keys for on ramps
Tom Hughes [Sun, 25 Feb 2018 20:52:22 +0000 (20:52 +0000)]
Update to rails 5.1.5
Tom Hughes [Sun, 25 Feb 2018 20:51:11 +0000 (20:51 +0000)]
Show exit numbers for off ramps in OSRM directions
Fixes #1768
Mateusz Konieczny [Sat, 24 Feb 2018 18:31:09 +0000 (19:31 +0100)]
Update wiki page data
Closes #1767
biswesh456 [Sat, 24 Feb 2018 15:06:12 +0000 (20:36 +0530)]
Allow admins and moderators to delete traces
Fixes #1625
Andy Allan [Fri, 23 Feb 2018 03:01:11 +0000 (11:01 +0800)]
Merge pull request #1758 from ardean80/patch-1
Update country.rb
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
translatewiki.net [Thu, 22 Feb 2018 11:21:36 +0000 (12:21 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Feb 2018 08:22:31 +0000 (09:22 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 18 Feb 2018 10:22:34 +0000 (10:22 +0000)]
Add libffi to requirements
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.
Jamie Guthrie [Wed, 14 Feb 2018 19:54:53 +0000 (19:54 +0000)]
Fix route path 'hovering' when marker positions are changed
Closes #1755
Jamie Guthrie [Thu, 15 Feb 2018 09:53:00 +0000 (09:53 +0000)]
Fix directions for roundabout without exit number
Closes #1756
translatewiki.net [Thu, 15 Feb 2018 09:00:41 +0000 (10:00 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 14 Feb 2018 21:14:47 +0000 (21:14 +0000)]
Update bundle
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.
Tom Hughes [Wed, 14 Feb 2018 01:19:30 +0000 (01:19 +0000)]
Stop map zooming out after dropping marker
Closes #1751
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
mmd-osm [Tue, 13 Feb 2018 22:24:07 +0000 (23:24 +0100)]
Small comment fix
mmd-osm [Tue, 13 Feb 2018 22:07:30 +0000 (23:07 +0100)]
Remove BBOX expansion performance optimization
Closes #1749
Fixes #1742
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
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
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
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
mmd-osm [Sun, 11 Feb 2018 16:40:31 +0000 (17:40 +0100)]
Update wiki_pages.yml, fix http url in update script
Tom Hughes [Mon, 12 Feb 2018 20:11:30 +0000 (20:11 +0000)]
Fix broken translation
translatewiki.net [Mon, 12 Feb 2018 07:40:25 +0000 (08:40 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 9 Feb 2018 22:31:45 +0000 (22:31 +0000)]
Use https when redirecting to the render server
Tom Hughes [Fri, 9 Feb 2018 18:49:58 +0000 (18:49 +0000)]
Use correct class to disable zoom buttons
Fixes #1365
translatewiki.net [Thu, 8 Feb 2018 09:08:10 +0000 (10:08 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 5 Feb 2018 22:31:27 +0000 (22:31 +0000)]
Use configured protocol for URLs in diary feeds
Tom Hughes [Mon, 5 Feb 2018 21:03:45 +0000 (21:03 +0000)]
Use configured server protocol for shared URLs
Closes #939
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
Tom Hughes [Sun, 4 Feb 2018 17:42:40 +0000 (17:42 +0000)]
Make OSM::GreatCircle clamp results to the globe
Tom Hughes [Sun, 4 Feb 2018 17:38:55 +0000 (17:38 +0000)]
Make travis build 3GL quad tile functions
Tom Hughes [Sun, 4 Feb 2018 17:33:44 +0000 (17:33 +0000)]
Add tests for quad 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
Tom Hughes [Mon, 29 Jan 2018 18:53:57 +0000 (18:53 +0000)]
Remove npemap as a source for UK postcodes
Tom Hughes [Sun, 4 Feb 2018 15:09:40 +0000 (15:09 +0000)]
Merge remote-tracking branch 'upstream/pull/1704'