Commit graph

6047 commits

Author SHA1 Message Date
Tom Hughes
e3ed9988ce Merge remote-tracking branch 'upstream/pull/2177' 2019-03-16 15:39:03 +00:00
Tom Hughes
874fddf499 Merge remote-tracking branch 'upstream/pull/2164' 2019-03-16 15:31:29 +00:00
Andy Allan
d98683abfb Rubocop fix 2019-03-16 15:30:41 +00:00
Andy Allan
656ed0af76 Move changeset builder views to the api namespace 2019-03-16 15:30:41 +00:00
Frederik Ramm
538bfed8a6 Move changeset XML generation to a view 2019-03-16 15:30:18 +00:00
Tom Hughes
8949737692 Add Spanish attribution to copyright page
Fixes #2179
2019-03-15 09:17:52 +00:00
Andy Allan
b3e74b0650 Instruct sprockets to recompile this file based on the settings files changing 2019-03-13 18:06:23 +01:00
Andy Allan
d102c9aaf4 Move all settings to settings.yml
We leave the STATUS setting alone, since it's required before rails
boots. The test-specific settings now live in config/settings/test.yml
2019-03-13 18:06:23 +01:00
Tom Hughes
7ccf6964e3 Prevent leading and trailing whitespace on email addresses 2019-03-08 11:17:51 +00:00
Tom Hughes
e174eb762f Strip leading and trailing whitespace for email authentication
Fixes #2173
2019-03-08 10:59:57 +00:00
Tom Hughes
94b59f4403 Merge remote-tracking branch 'upstream/pull/2161' 2019-02-28 19:17:40 +00:00
Tom Hughes
73214da35d Merge remote-tracking branch 'upstream/pull/2160' 2019-02-28 18:58:05 +00:00
Andy Allan
5f59845575 Move the api trace methods into a separate controller under the api namespace 2019-02-28 17:12:28 +01:00
Andy Allan
46bc4650d2 Move the amf and swf controllers into the api namespace 2019-02-28 17:12:28 +01:00
Andy Allan
b4dbf6233c Move the notes api methods into a controller in the api namespace 2019-02-28 17:12:28 +01:00
Andy Allan
4b4c5aac2f Move the user api methods into a separate controller in the api namespace 2019-02-28 17:12:28 +01:00
Andy Allan
b38343e5bd Move node/way/relation/old_* controllers into the api namespace 2019-02-28 17:12:28 +01:00
Tom Hughes
4a902a701c Flip header image horizontally on RTL pages
Fixes #2158
2019-02-25 19:02:21 +00:00
Tom Hughes
2d4c548a9e Prevent reversal of sprite positions on welcome screen
Fixes #2156
2019-02-25 18:50:40 +00:00
Tom Hughes
d2ff1491b4 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
2019-02-25 11:46:12 +00:00
Andy Allan
9186a6155c Move the user preferences controller into the api namespace 2019-02-24 12:47:26 +01:00
Andy Allan
2b81437fcd Move the search controller to the api namespace 2019-02-24 12:42:07 +01:00
Andy Allan
947a41edee Move the api methods from changeset_comments_controller into the api namespaced controller 2019-02-24 12:38:09 +01:00
Andy Allan
1778fa3d9c Move the api methods from changesets_controller into the api namespaced controller 2019-02-24 12:18:31 +01:00
Andy Allan
f4e2990526 Move map method to its own controller 2019-02-24 11:44:10 +01:00
Andy Allan
d887252eeb Move the changes api to its own controller 2019-02-24 11:00:28 +01:00
Andy Allan
8383fd0928 Move the permissions call out of api_controller 2019-02-24 11:00:28 +01:00
Andy Allan
317b8f9d45 Move the trackpoints call into its own controller (and rename to tracepoints) 2019-02-24 11:00:28 +01:00
Andy Allan
6a4092bc16 Move the capabilities call out of api_controller 2019-02-24 11:00:20 +01:00
Tom Hughes
22fefc3df0 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
2019-02-19 10:09:07 +00:00
Tom Hughes
fbefe3550c Always look to the global scope for the GPX module 2019-02-07 18:40:35 +00:00
Tom Hughes
908324323e Merge remote-tracking branch 'upstream/pull/2136' 2019-02-06 18:30:41 +00:00
Tom Hughes
43c09d8062 Merge remote-tracking branch 'upstream/pull/2134' 2019-02-06 18:17:03 +00:00
Andy Allan
35a2d66e19 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.
2019-02-06 15:50:57 +01:00
Andy Allan
3795da4014 Remove the require_terms_seen configuration option
This option has been set to 'true' for over six years in production.

Refs #2097
2019-02-06 14:54:56 +01:00
Andy Allan
c4a192f436 Remove unnecessary requires from app 2019-02-06 12:26:30 +01:00
Andy Allan
061c53ff1d Remove unnecessary requires from helpers 2019-02-06 12:17:54 +01:00
Andy Allan
32ce4ea527 Move utf8 validator into app/validators 2019-02-06 12:11:44 +01:00
Tom Hughes
fa0a933c24 Replace augment.js with conditional polyfills for ES5 and ES6 2019-01-30 12:11:57 +00:00
Tom Hughes
9c83235f72 Replace conditional comments with browser detection 2019-01-30 12:11:34 +00:00
Tom Hughes
48e886784e Change default directions engine to fossgis_osrm_car
Also handle old cookies and URLs that ask for engines that
are no longer available.
2019-01-29 20:19:36 +00:00
Simon Poole
26102f581f Remove old MapQuest Directions routing support 2019-01-29 20:19:36 +00:00
Simon Poole
067290f19f Remove old OSRM routing support 2019-01-29 20:19:36 +00:00
Simon Poole
8937099429 Add support for FOSSGIS routing server 2019-01-29 20:19:36 +00:00
Tom Hughes
c583ca92ed Don't swallow exceptions deleting traces 2019-01-28 19:10:35 +00:00
Tom Hughes
3e7bc943fe Merge remote-tracking branch 'upstream/pull/2120' 2019-01-28 19:04:02 +00:00
Quincy Morgan
3f2a42bf77 Add passthrough of new locale, maprules, and presets URL hash parameters to iD 2019-01-23 12:13:27 -05:00
Tom Hughes
d021f7b625 Merge remote-tracking branch 'upstream/pull/2118' 2019-01-16 12:22:31 +00:00
Andy Allan
8a2df0e0b5 More resourceful routing for nodes, ways, relations and changesets controllers 2019-01-16 13:10:11 +01:00
Andy Allan
30a4fb85a9 Remove old authorization helpers
These have been replaced by abilities and capabilities
2019-01-16 11:55:01 +01:00