]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Mon, 25 Feb 2019 18:58:19 +0000 (18:58 +0000)]
Flip header image horizontally on RTL pages
Fixes #2158
Tom Hughes [Mon, 25 Feb 2019 18:50:40 +0000 (18:50 +0000)]
Prevent reversal of sprite positions on welcome screen
Fixes #2156
Tom Hughes [Mon, 25 Feb 2019 11:44:24 +0000 (11:44 +0000)]
Avoid CSP issues with OpenID login
To avoid Chrom getting upset about sending form data to sites
that our policy doesn't allow, even when it isn't, use Javascript
to jump straight to Omniauth as the direct OpenID based login
buttons were already doing.
Fixes #1909
translatewiki.net [Mon, 25 Feb 2019 09:54:34 +0000 (10:54 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 24 Feb 2019 22:40:01 +0000 (22:40 +0000)]
Allow loading of our manifest
Andy Allan [Sun, 24 Feb 2019 11:47:26 +0000 (12:47 +0100)]
Move the user preferences controller into the api namespace
Andy Allan [Sun, 24 Feb 2019 11:42:07 +0000 (12:42 +0100)]
Move the search controller to the api namespace
Andy Allan [Sun, 24 Feb 2019 11:38:09 +0000 (12:38 +0100)]
Move the api methods from changeset_comments_controller into the api namespaced controller
Andy Allan [Sun, 24 Feb 2019 11:18:31 +0000 (12:18 +0100)]
Move the api methods from changesets_controller into the api namespaced controller
Andy Allan [Sun, 24 Feb 2019 09:42:01 +0000 (10:42 +0100)]
Move map method to its own controller
Andy Allan [Sun, 24 Feb 2019 09:27:48 +0000 (10:27 +0100)]
Move the changes api to its own controller
Andy Allan [Sat, 23 Feb 2019 15:06:30 +0000 (16:06 +0100)]
Move the permissions call out of api_controller
Andy Allan [Sat, 23 Feb 2019 14:59:45 +0000 (15:59 +0100)]
Rename api controller test files
Andy Allan [Sat, 23 Feb 2019 14:53:49 +0000 (15:53 +0100)]
Move the trackpoints call into its own controller (and rename to tracepoints)
Andy Allan [Sat, 23 Feb 2019 13:36:02 +0000 (14:36 +0100)]
Move the capabilities call out of api_controller
Tom Hughes [Fri, 22 Feb 2019 15:41:33 +0000 (15:41 +0000)]
Improve detection of browsers needing ES6 shims
Tom Hughes [Thu, 21 Feb 2019 23:00:55 +0000 (23:00 +0000)]
Merge remote-tracking branch 'upstream/pull/2153'
Quincy Morgan [Thu, 21 Feb 2019 22:06:43 +0000 (17:06 -0500)]
Update to iD v2.14.2
Tom Hughes [Wed, 20 Feb 2019 23:57:50 +0000 (23:57 +0000)]
Merge remote-tracking branch 'upstream/pull/2152'
Quincy Morgan [Wed, 20 Feb 2019 23:30:22 +0000 (18:30 -0500)]
Update to iD v2.14.1
Tom Hughes [Wed, 20 Feb 2019 22:13:50 +0000 (22:13 +0000)]
Merge remote-tracking branch 'upstream/pull/2151'
Tom Hughes [Wed, 20 Feb 2019 21:46:21 +0000 (21:46 +0000)]
Avoid bundler 2.x for now
Fixes #2149
Quincy Morgan [Wed, 20 Feb 2019 21:43:54 +0000 (16:43 -0500)]
Update to iD v2.14.0
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
translatewiki.net [Mon, 18 Feb 2019 07:13:52 +0000 (08:13 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 14 Feb 2019 21:25:34 +0000 (21:25 +0000)]
Revert to rinku 2.0.4
Tom Hughes [Thu, 14 Feb 2019 19:24:46 +0000 (19:24 +0000)]
Revert to bootsnap 1.3.2
translatewiki.net [Thu, 14 Feb 2019 08:24:45 +0000 (09:24 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 13 Feb 2019 18:45:32 +0000 (18:45 +0000)]
Update bundle
Tom Hughes [Thu, 7 Feb 2019 20:21:40 +0000 (20:21 +0000)]
Update tests for changes in FactoryBot 5.x
Tom Hughes [Thu, 7 Feb 2019 18:41:36 +0000 (18:41 +0000)]
Update bundle
Tom Hughes [Thu, 7 Feb 2019 18:40:35 +0000 (18:40 +0000)]
Always look to the global scope for the GPX module
translatewiki.net [Thu, 7 Feb 2019 15:07:57 +0000 (16:07 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 6 Feb 2019 18:30:41 +0000 (18:30 +0000)]
Merge remote-tracking branch 'upstream/pull/2136'
Tom Hughes [Wed, 6 Feb 2019 18:21:50 +0000 (18:21 +0000)]
Merge remote-tracking branch 'upstream/pull/2135'
Tom Hughes [Wed, 6 Feb 2019 18:17:03 +0000 (18:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2134'
Tom Hughes [Wed, 6 Feb 2019 18:15:40 +0000 (18:15 +0000)]
Merge remote-tracking branch 'upstream/pull/2125'
Andy Allan [Wed, 6 Feb 2019 17:12:20 +0000 (18:12 +0100)]
Output both the local simplecov html and the coveralls report
Fixes #2066
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
Andy Allan [Wed, 6 Feb 2019 15:59:27 +0000 (16:59 +0100)]
Fix typo
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.
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
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
Andy Allan [Wed, 6 Feb 2019 11:25:43 +0000 (12:25 +0100)]
Remove unnecessary requires from app
Andy Allan [Wed, 6 Feb 2019 11:17:54 +0000 (12:17 +0100)]
Remove unnecessary requires from helpers
Andy Allan [Wed, 6 Feb 2019 11:11:44 +0000 (12:11 +0100)]
Move utf8 validator into app/validators
Andy Allan [Wed, 6 Feb 2019 10:44:34 +0000 (11:44 +0100)]
Remove unnecessary requires from tests
translatewiki.net [Mon, 4 Feb 2019 08:09:16 +0000 (09:09 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 31 Jan 2019 13:56:48 +0000 (13:56 +0000)]
Fix broken translation
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
translatewiki.net [Wed, 30 Jan 2019 22:52:53 +0000 (23:52 +0100)]
Localisation updates from https://translatewiki.net.
Peter [Wed, 30 Jan 2019 20:18:02 +0000 (21:18 +0100)]
Advise to run i18n:js:export before assets:precompile
Tom Hughes [Wed, 30 Jan 2019 12:02:06 +0000 (12:02 +0000)]
Replace augment.js with conditional polyfills for ES5 and ES6
Tom Hughes [Wed, 30 Jan 2019 12:01:00 +0000 (12:01 +0000)]
Replace conditional comments with browser detection
Tom Hughes [Wed, 30 Jan 2019 11:59:47 +0000 (11:59 +0000)]
Add browser detection framework
Tom Hughes [Wed, 30 Jan 2019 12:06:21 +0000 (12:06 +0000)]
Update bundle
Tom Hughes [Tue, 29 Jan 2019 23:14:25 +0000 (23:14 +0000)]
Add polyfill for Array.prototype.findIndex
Fixes #2124
Tom Hughes [Tue, 29 Jan 2019 21:35:29 +0000 (21:35 +0000)]
Merge remote-tracking branch 'upstream/pull/2063'
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.
Simon Poole [Tue, 29 Jan 2019 19:03:30 +0000 (19:03 +0000)]
Remove old MapQuest Directions routing support
Simon Poole [Wed, 14 Nov 2018 18:05:33 +0000 (19:05 +0100)]
Remove old OSRM routing support
Simon Poole [Fri, 10 Aug 2018 13:24:25 +0000 (15:24 +0200)]
Add support for FOSSGIS routing server
Tom Hughes [Tue, 29 Jan 2019 00:00:46 +0000 (00:00 +0000)]
Clear notifications after trace import tests
Tom Hughes [Mon, 28 Jan 2019 22:57:38 +0000 (22:57 +0000)]
Merge remote-tracking branch 'upstream/pull/2123'
Quincy Morgan [Mon, 28 Jan 2019 22:44:11 +0000 (17:44 -0500)]
Update to iD v2.13.1
Tom Hughes [Mon, 28 Jan 2019 19:10:35 +0000 (19:10 +0000)]
Don't swallow exceptions deleting traces
Tom Hughes [Mon, 28 Jan 2019 19:04:02 +0000 (19:04 +0000)]
Merge remote-tracking branch 'upstream/pull/2120'
Tom Hughes [Wed, 23 Jan 2019 19:05:14 +0000 (19:05 +0000)]
Merge remote-tracking branch 'upstream/pull/2122'
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
Quincy Morgan [Wed, 23 Jan 2019 16:57:33 +0000 (11:57 -0500)]
Update to iD v2.13.0
Andy Allan [Wed, 23 Jan 2019 15:47:54 +0000 (16:47 +0100)]
Write some basic functionality tests for trace.import
Andy Allan [Wed, 23 Jan 2019 13:47:49 +0000 (14:47 +0100)]
Basic tests for the trace jobs
translatewiki.net [Mon, 21 Jan 2019 09:07:09 +0000 (10:07 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 17 Jan 2019 10:01:22 +0000 (11:01 +0100)]
Localisation updates from https://translatewiki.net.
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.
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
Tom Hughes [Wed, 16 Jan 2019 12:22:31 +0000 (12:22 +0000)]
Merge remote-tracking branch 'upstream/pull/2118'
Andy Allan [Wed, 16 Jan 2019 12:10:11 +0000 (13:10 +0100)]
More resourceful routing for nodes, ways, relations and changesets controllers
Tom Hughes [Wed, 16 Jan 2019 11:39:18 +0000 (11:39 +0000)]
Merge remote-tracking branch 'upstream/pull/2117'
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
Andy Allan [Wed, 16 Jan 2019 10:45:13 +0000 (11:45 +0100)]
Ensure authorization checks happen for all controller methods
Andy Allan [Wed, 16 Jan 2019 10:44:55 +0000 (11:44 +0100)]
Skip authorization checks for the errors controller
Tom Hughes [Wed, 16 Jan 2019 10:36:04 +0000 (10:36 +0000)]
Fix rubocop warning
Tom Hughes [Wed, 16 Jan 2019 10:23:27 +0000 (10:23 +0000)]
Merge remote-tracking branch 'upstream/pull/2116'
Tom Hughes [Wed, 16 Jan 2019 10:20:29 +0000 (10:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2115'
Tom Hughes [Wed, 16 Jan 2019 10:15:34 +0000 (10:15 +0000)]
Merge remote-tracking branch 'upstream/pull/2111'
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.
Tom Hughes [Wed, 16 Jan 2019 10:09:47 +0000 (10:09 +0000)]
Fix styling of nested lists in rich text
Tom Hughes [Wed, 9 Jan 2019 18:00:47 +0000 (18:00 +0000)]
Add noopener and noreferer to links in user generated content
Tom Hughes [Wed, 9 Jan 2019 17:52:24 +0000 (17:52 +0000)]
Switch to using kramdown for markdown formatting
Fixes #2103
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
Andy Allan [Wed, 9 Jan 2019 15:58:38 +0000 (16:58 +0100)]
Use CanCanCan to control access to oauth controller actions
Andy Allan [Wed, 9 Jan 2019 15:43:41 +0000 (16:43 +0100)]
Mark non-action methods as protected
Andy Allan [Wed, 9 Jan 2019 17:28:27 +0000 (18:28 +0100)]
Use CanCanCan for nodes, ways, relations, old and api controllers
translatewiki.net [Mon, 14 Jan 2019 08:42:18 +0000 (09:42 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 10 Jan 2019 07:57:06 +0000 (08:57 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 9 Jan 2019 21:12:33 +0000 (21:12 +0000)]
Add basic tests for browse#new_note and browse#query
Tom Hughes [Wed, 9 Jan 2019 19:15:55 +0000 (19:15 +0000)]
Allow everybody to query features
Tom Hughes [Wed, 9 Jan 2019 18:13:05 +0000 (18:13 +0000)]
Allow everybody to create new notes
Fixes #2110
Tom Hughes [Wed, 9 Jan 2019 17:27:16 +0000 (17:27 +0000)]
Merge remote-tracking branch 'upstream/pull/2109'