]> git.openstreetmap.org Git - rails.git/log
rails.git
5 years agoAvoid bundler 2.x for now
Tom Hughes [Wed, 20 Feb 2019 21:46:21 +0000 (21:46 +0000)]
Avoid bundler 2.x for now

Fixes #2149

5 years agoSet language and text direction properly on the copyright page
Tom Hughes [Tue, 19 Feb 2019 10:06:58 +0000 (10:06 +0000)]
Set language and text direction properly on the copyright page

Also add style overrides for explicit LTR and RTL text that work
independently of the main page styling.

Fixes #2148

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Feb 2019 07:13:52 +0000 (08:13 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoRevert to rinku 2.0.4
Tom Hughes [Thu, 14 Feb 2019 21:25:34 +0000 (21:25 +0000)]
Revert to rinku 2.0.4

5 years agoRevert to bootsnap 1.3.2
Tom Hughes [Thu, 14 Feb 2019 19:24:46 +0000 (19:24 +0000)]
Revert to bootsnap 1.3.2

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Feb 2019 08:24:45 +0000 (09:24 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoUpdate bundle
Tom Hughes [Wed, 13 Feb 2019 18:45:32 +0000 (18:45 +0000)]
Update bundle

5 years agoUpdate tests for changes in FactoryBot 5.x
Tom Hughes [Thu, 7 Feb 2019 20:21:40 +0000 (20:21 +0000)]
Update tests for changes in FactoryBot 5.x

5 years agoUpdate bundle
Tom Hughes [Thu, 7 Feb 2019 18:41:36 +0000 (18:41 +0000)]
Update bundle

5 years agoAlways look to the global scope for the GPX module
Tom Hughes [Thu, 7 Feb 2019 18:40:35 +0000 (18:40 +0000)]
Always look to the global scope for the GPX module

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 7 Feb 2019 15:07:57 +0000 (16:07 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoMerge remote-tracking branch 'upstream/pull/2136'
Tom Hughes [Wed, 6 Feb 2019 18:30:41 +0000 (18:30 +0000)]
Merge remote-tracking branch 'upstream/pull/2136'

5 years agoMerge remote-tracking branch 'upstream/pull/2135'
Tom Hughes [Wed, 6 Feb 2019 18:21:50 +0000 (18:21 +0000)]
Merge remote-tracking branch 'upstream/pull/2135'

5 years agoMerge remote-tracking branch 'upstream/pull/2134'
Tom Hughes [Wed, 6 Feb 2019 18:17:03 +0000 (18:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2134'

5 years agoMerge remote-tracking branch 'upstream/pull/2125'
Tom Hughes [Wed, 6 Feb 2019 18:15:40 +0000 (18:15 +0000)]
Merge remote-tracking branch 'upstream/pull/2125'

5 years agoMerge pull request #2126 from MaZderMind/patch-1
Andy Allan [Wed, 6 Feb 2019 16:00:05 +0000 (17:00 +0100)]
Merge pull request #2126 from MaZderMind/patch-1

Advise to run i18n:js:export before assets:precompile

5 years agoFix typo
Andy Allan [Wed, 6 Feb 2019 15:59:27 +0000 (16:59 +0100)]
Fix typo

5 years agoRemove require_terms_agreed configuration option
Andy Allan [Wed, 6 Feb 2019 14:50:57 +0000 (15:50 +0100)]
Remove require_terms_agreed configuration option

This has been set to true for 6 years in production. Refs #2097

As per other user settings, we set the terms as seen by default for tests,
and we can override that when necessary for specific tests.

5 years agoRemove the require_terms_seen configuration option
Andy Allan [Wed, 6 Feb 2019 13:54:56 +0000 (14:54 +0100)]
Remove the require_terms_seen configuration option

This option has been set to 'true' for over six years in production.

Refs #2097

5 years agoCopy i18n strings from validates_email_format_of plugin
Andy Allan [Wed, 6 Feb 2019 13:20:03 +0000 (14:20 +0100)]
Copy i18n strings from validates_email_format_of plugin

This allows our translators to work in languages not yet supported
by the upstream plugin. Fixes #2128

5 years agoRemove unnecessary requires from app
Andy Allan [Wed, 6 Feb 2019 11:25:43 +0000 (12:25 +0100)]
Remove unnecessary requires from app

5 years agoRemove unnecessary requires from helpers
Andy Allan [Wed, 6 Feb 2019 11:17:54 +0000 (12:17 +0100)]
Remove unnecessary requires from helpers

5 years agoMove utf8 validator into app/validators
Andy Allan [Wed, 6 Feb 2019 11:11:44 +0000 (12:11 +0100)]
Move utf8 validator into app/validators

5 years agoRemove unnecessary requires from tests
Andy Allan [Wed, 6 Feb 2019 10:44:34 +0000 (11:44 +0100)]
Remove unnecessary requires from tests

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 4 Feb 2019 08:09:16 +0000 (09:09 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoFix broken translation
Tom Hughes [Thu, 31 Jan 2019 13:56:48 +0000 (13:56 +0000)]
Fix broken translation

5 years agoRevert to kramdown 1.x for now
Tom Hughes [Thu, 31 Jan 2019 13:52:42 +0000 (13:52 +0000)]
Revert to kramdown 1.x for now

https://github.com/gettalong/kramdown/issues/571

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Wed, 30 Jan 2019 22:52:53 +0000 (23:52 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoAdvise to run i18n:js:export before assets:precompile
Peter [Wed, 30 Jan 2019 20:18:02 +0000 (21:18 +0100)]
Advise to run i18n:js:export before assets:precompile

5 years agoReplace augment.js with conditional polyfills for ES5 and ES6
Tom Hughes [Wed, 30 Jan 2019 12:02:06 +0000 (12:02 +0000)]
Replace augment.js with conditional polyfills for ES5 and ES6

5 years agoReplace conditional comments with browser detection
Tom Hughes [Wed, 30 Jan 2019 12:01:00 +0000 (12:01 +0000)]
Replace conditional comments with browser detection

5 years agoAdd browser detection framework
Tom Hughes [Wed, 30 Jan 2019 11:59:47 +0000 (11:59 +0000)]
Add browser detection framework

5 years agoUpdate bundle
Tom Hughes [Wed, 30 Jan 2019 12:06:21 +0000 (12:06 +0000)]
Update bundle

5 years agoAdd polyfill for Array.prototype.findIndex
Tom Hughes [Tue, 29 Jan 2019 23:14:25 +0000 (23:14 +0000)]
Add polyfill for Array.prototype.findIndex

Fixes #2124

5 years agoMerge remote-tracking branch 'upstream/pull/2063'
Tom Hughes [Tue, 29 Jan 2019 21:35:29 +0000 (21:35 +0000)]
Merge remote-tracking branch 'upstream/pull/2063'

5 years agoChange default directions engine to fossgis_osrm_car
Tom Hughes [Tue, 29 Jan 2019 19:17:01 +0000 (19:17 +0000)]
Change default directions engine to fossgis_osrm_car

Also handle old cookies and URLs that ask for engines that
are no longer available.

5 years agoRemove old MapQuest Directions routing support
Simon Poole [Tue, 29 Jan 2019 19:03:30 +0000 (19:03 +0000)]
Remove old MapQuest Directions routing support

5 years agoRemove old OSRM routing support
Simon Poole [Wed, 14 Nov 2018 18:05:33 +0000 (19:05 +0100)]
Remove old OSRM routing support

5 years agoAdd support for FOSSGIS routing server
Simon Poole [Fri, 10 Aug 2018 13:24:25 +0000 (15:24 +0200)]
Add support for FOSSGIS routing server

5 years agoClear notifications after trace import tests
Tom Hughes [Tue, 29 Jan 2019 00:00:46 +0000 (00:00 +0000)]
Clear notifications after trace import tests

5 years agoMerge remote-tracking branch 'upstream/pull/2123'
Tom Hughes [Mon, 28 Jan 2019 22:57:38 +0000 (22:57 +0000)]
Merge remote-tracking branch 'upstream/pull/2123'

5 years agoUpdate to iD v2.13.1
Quincy Morgan [Mon, 28 Jan 2019 22:44:11 +0000 (17:44 -0500)]
Update to iD v2.13.1

5 years agoDon't swallow exceptions deleting traces
Tom Hughes [Mon, 28 Jan 2019 19:10:35 +0000 (19:10 +0000)]
Don't swallow exceptions deleting traces

5 years agoMerge remote-tracking branch 'upstream/pull/2120'
Tom Hughes [Mon, 28 Jan 2019 19:04:02 +0000 (19:04 +0000)]
Merge remote-tracking branch 'upstream/pull/2120'

5 years agoMerge remote-tracking branch 'upstream/pull/2122'
Tom Hughes [Wed, 23 Jan 2019 19:05:14 +0000 (19:05 +0000)]
Merge remote-tracking branch 'upstream/pull/2122'

5 years agoAdd passthrough of new `locale`, `maprules`, and `presets` URL hash parameters to iD
Quincy Morgan [Wed, 23 Jan 2019 17:13:27 +0000 (12:13 -0500)]
Add passthrough of new `locale`, `maprules`, and `presets` URL hash parameters to iD

5 years agoUpdate to iD v2.13.0
Quincy Morgan [Wed, 23 Jan 2019 16:57:33 +0000 (11:57 -0500)]
Update to iD v2.13.0

5 years agoWrite some basic functionality tests for trace.import
Andy Allan [Wed, 23 Jan 2019 15:47:54 +0000 (16:47 +0100)]
Write some basic functionality tests for trace.import

5 years agoBasic tests for the trace jobs
Andy Allan [Wed, 23 Jan 2019 13:47:49 +0000 (14:47 +0100)]
Basic tests for the trace jobs

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 21 Jan 2019 09:07:09 +0000 (10:07 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 17 Jan 2019 10:01:22 +0000 (11:01 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoUse gd-ffij gem to create trace icons
Andy Allan [Wed, 16 Jan 2019 15:06:25 +0000 (16:06 +0100)]
Use gd-ffij gem to create trace icons

This is a port of the gd-based code from the gpx-importer at
https://github.com/openstreetmap/gpx-import

The gd-ffij library does not yet have support for animated gifs, so
we just create a static image for now. But at least that's better than
the non-functioning RMagick code.

5 years agoMerge pull request #1151 from polarbearing/patch-1
Andy Allan [Wed, 16 Jan 2019 13:30:28 +0000 (14:30 +0100)]
Merge pull request #1151 from polarbearing/patch-1

Holiday Apartment is more specific for tourism=apartment

5 years agoMerge remote-tracking branch 'upstream/pull/2118'
Tom Hughes [Wed, 16 Jan 2019 12:22:31 +0000 (12:22 +0000)]
Merge remote-tracking branch 'upstream/pull/2118'

5 years agoMore resourceful routing for nodes, ways, relations and changesets controllers
Andy Allan [Wed, 16 Jan 2019 12:10:11 +0000 (13:10 +0100)]
More resourceful routing for nodes, ways, relations and changesets controllers

5 years agoMerge remote-tracking branch 'upstream/pull/2117'
Tom Hughes [Wed, 16 Jan 2019 11:39:18 +0000 (11:39 +0000)]
Merge remote-tracking branch 'upstream/pull/2117'

5 years agoRemove old authorization helpers
Andy Allan [Wed, 16 Jan 2019 10:55:01 +0000 (11:55 +0100)]
Remove old authorization helpers

These have been replaced by abilities and capabilities

5 years agoEnsure authorization checks happen for all controller methods
Andy Allan [Wed, 16 Jan 2019 10:45:13 +0000 (11:45 +0100)]
Ensure authorization checks happen for all controller methods

5 years agoSkip authorization checks for the errors controller
Andy Allan [Wed, 16 Jan 2019 10:44:55 +0000 (11:44 +0100)]
Skip authorization checks for the errors controller

5 years agoFix rubocop warning
Tom Hughes [Wed, 16 Jan 2019 10:36:04 +0000 (10:36 +0000)]
Fix rubocop warning

5 years agoMerge remote-tracking branch 'upstream/pull/2116'
Tom Hughes [Wed, 16 Jan 2019 10:23:27 +0000 (10:23 +0000)]
Merge remote-tracking branch 'upstream/pull/2116'

5 years agoMerge remote-tracking branch 'upstream/pull/2115'
Tom Hughes [Wed, 16 Jan 2019 10:20:29 +0000 (10:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2115'

5 years agoMerge remote-tracking branch 'upstream/pull/2111'
Tom Hughes [Wed, 16 Jan 2019 10:15:34 +0000 (10:15 +0000)]
Merge remote-tracking branch 'upstream/pull/2111'

5 years agoAdd a configuration flag for using the job queue to import traces
Andy Allan [Wed, 16 Jan 2019 10:13:55 +0000 (11:13 +0100)]
Add a configuration flag for using the job queue to import traces

This will allow the code to be merged to master, even if osm.org
isn't ready to start using it yet.

5 years agoFix styling of nested lists in rich text
Tom Hughes [Wed, 16 Jan 2019 10:09:47 +0000 (10:09 +0000)]
Fix styling of nested lists in rich text

5 years agoAdd noopener and noreferer to links in user generated content
Tom Hughes [Wed, 9 Jan 2019 18:00:47 +0000 (18:00 +0000)]
Add noopener and noreferer to links in user generated content

5 years agoSwitch to using kramdown for markdown formatting
Tom Hughes [Wed, 9 Jan 2019 17:52:24 +0000 (17:52 +0000)]
Switch to using kramdown for markdown formatting

Fixes #2103

5 years agoSketch out how to use the jobs queue for trace insertion and deletion
Andy Allan [Wed, 31 Oct 2018 16:51:30 +0000 (17:51 +0100)]
Sketch out how to use the jobs queue for trace insertion and deletion

Refs #1852

5 years agoUse CanCanCan to control access to oauth controller actions
Andy Allan [Wed, 9 Jan 2019 15:58:38 +0000 (16:58 +0100)]
Use CanCanCan to control access to oauth controller actions

5 years agoMark non-action methods as protected
Andy Allan [Wed, 9 Jan 2019 15:43:41 +0000 (16:43 +0100)]
Mark non-action methods as protected

5 years agoUse CanCanCan for nodes, ways, relations, old and api controllers
Andy Allan [Wed, 9 Jan 2019 17:28:27 +0000 (18:28 +0100)]
Use CanCanCan for nodes, ways, relations, old and api controllers

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 14 Jan 2019 08:42:18 +0000 (09:42 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 10 Jan 2019 07:57:06 +0000 (08:57 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoAdd basic tests for browse#new_note and browse#query
Tom Hughes [Wed, 9 Jan 2019 21:12:33 +0000 (21:12 +0000)]
Add basic tests for browse#new_note and browse#query

5 years agoAllow everybody to query features
Tom Hughes [Wed, 9 Jan 2019 19:15:55 +0000 (19:15 +0000)]
Allow everybody to query features

5 years agoAllow everybody to create new notes
Tom Hughes [Wed, 9 Jan 2019 18:13:05 +0000 (18:13 +0000)]
Allow everybody to create new notes

Fixes #2110

5 years agoMerge remote-tracking branch 'upstream/pull/2109'
Tom Hughes [Wed, 9 Jan 2019 17:27:16 +0000 (17:27 +0000)]
Merge remote-tracking branch 'upstream/pull/2109'

5 years agoMerge remote-tracking branch 'upstream/pull/2108'
Tom Hughes [Wed, 9 Jan 2019 17:24:28 +0000 (17:24 +0000)]
Merge remote-tracking branch 'upstream/pull/2108'

5 years agoMerge remote-tracking branch 'upstream/pull/2107'
Tom Hughes [Wed, 9 Jan 2019 17:20:08 +0000 (17:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2107'

5 years agoMerge remote-tracking branch 'upstream/pull/2106'
Tom Hughes [Wed, 9 Jan 2019 17:16:01 +0000 (17:16 +0000)]
Merge remote-tracking branch 'upstream/pull/2106'

5 years agoMerge remote-tracking branch 'upstream/pull/2105'
Tom Hughes [Wed, 9 Jan 2019 17:14:53 +0000 (17:14 +0000)]
Merge remote-tracking branch 'upstream/pull/2105'

5 years agoUse CanCanCan for oauth clients controller
Andy Allan [Wed, 9 Jan 2019 14:34:54 +0000 (15:34 +0100)]
Use CanCanCan for oauth clients controller

5 years agoUse CanCanCan for messages controller
Andy Allan [Wed, 9 Jan 2019 14:27:29 +0000 (15:27 +0100)]
Use CanCanCan for messages controller

5 years agoUse a builder view for the capabilities call
Andy Allan [Wed, 9 Jan 2019 13:30:18 +0000 (14:30 +0100)]
Use a builder view for the capabilities call

This is easier to work with than building the XML document by hand
in the controller.

5 years agoUse full list of osm xml root attributes in builder templates
Andy Allan [Wed, 9 Jan 2019 13:15:39 +0000 (14:15 +0100)]
Use full list of osm xml root attributes in builder templates

5 years agoUse CanCanCan for changesets controller
Andy Allan [Wed, 9 Jan 2019 11:22:39 +0000 (12:22 +0100)]
Use CanCanCan for changesets controller

The expand_bbox method now needs require_write_api capability on tokens.

5 years agoUse CanCanCan for traces controller
Andy Allan [Wed, 9 Jan 2019 10:40:54 +0000 (11:40 +0100)]
Use CanCanCan for traces controller

5 years agoUse CanCanCan for swf controller
Andy Allan [Wed, 9 Jan 2019 09:32:57 +0000 (10:32 +0100)]
Use CanCanCan for swf controller

5 years agoSkip authorization checks for amf controller
Andy Allan [Wed, 9 Jan 2019 09:26:12 +0000 (10:26 +0100)]
Skip authorization checks for amf controller

5 years agoAdd missing authorize_resource declaration to geocoder controller
Andy Allan [Wed, 9 Jan 2019 09:14:52 +0000 (10:14 +0100)]
Add missing authorize_resource declaration to geocoder controller

5 years agoUse CanCanCan for directions controller
Andy Allan [Wed, 9 Jan 2019 09:12:14 +0000 (10:12 +0100)]
Use CanCanCan for directions controller

5 years agoUse CanCanCan for browse controller
Andy Allan [Wed, 9 Jan 2019 09:10:12 +0000 (10:10 +0100)]
Use CanCanCan for browse controller

5 years agoUpdate bundle
Tom Hughes [Tue, 8 Jan 2019 18:21:03 +0000 (18:21 +0000)]
Update bundle

5 years agoRevert to omniauth-google-oauth2 version 0.5.3
Tom Hughes [Tue, 8 Jan 2019 09:40:38 +0000 (09:40 +0000)]
Revert to omniauth-google-oauth2 version 0.5.3

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 7 Jan 2019 09:19:15 +0000 (10:19 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoFix new rubocop warning
Tom Hughes [Mon, 7 Jan 2019 09:04:13 +0000 (09:04 +0000)]
Fix new rubocop warning

5 years agoUpdate bundle
Tom Hughes [Mon, 7 Jan 2019 08:58:37 +0000 (08:58 +0000)]
Update bundle

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 3 Jan 2019 15:50:51 +0000 (16:50 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoUse CanCanCan for export controller
Andy Allan [Wed, 2 Jan 2019 18:21:10 +0000 (19:21 +0100)]
Use CanCanCan for export controller

5 years agoUse CanCanCan for search controller
Andy Allan [Wed, 2 Jan 2019 18:17:32 +0000 (19:17 +0100)]
Use CanCanCan for search controller