Andy Allan
dbd88d893f
Merge branch 'master' into moderation
2017-07-12 10:16:11 +01:00
Bryan Housel
107e9515b3
Update to iD v2.3.1
2017-07-11 11:23:38 -04:00
Tom Hughes
28bfaa9fb6
Replace timecop with the rails builtin travel_to method
2017-07-10 21:19:22 +01:00
Bryan Housel
3ab39f48ba
Add iD walkthrough autostart parameter
2017-07-07 17:58:02 -04:00
Bryan Housel
eb89a462d4
Update to iD v2.3.0
2017-07-07 17:35:03 -04:00
Tom Hughes
d4a461dc26
Merge remote-tracking branch 'upstream/pull/1575'
2017-07-06 19:15:55 +01:00
Tom Hughes
87a7829eb8
Add some tests for the user helper
2017-07-06 19:11:21 +01:00
Andy Allan
9046b5ba8d
Revert unrelated changes from db/structure.sql
2017-07-05 15:36:56 +01:00
Andy Allan
d56b1400bc
Whitespace fixes.
2017-07-05 15:17:02 +01:00
Andy Allan
26210d639c
Remove unused files
2017-07-05 15:11:02 +01:00
Andy Allan
2278aec289
Revert changes to Vagrantfile
2017-07-05 15:06:57 +01:00
Andy Allan
cbf71f04c2
Hide contributor terms details, unless the user hasn't agreed
...
It's no longer important to show when users agreed to the contributor terms.
For users that haven't agreed, we still show their status on their profile.
Logic was also re-written to avoid lots of `if not` things, and tests added.
2017-07-05 12:39:52 +01:00
Tom Hughes
5d740d8733
Don't disable search submission buttons on form submission
2017-06-30 10:01:22 +01:00
Tom Hughes
fe1e28b4f4
Fix more parameter sanitisation issues and add tests
2017-06-29 20:52:57 +01:00
Tom Hughes
3763cbc7d4
Disable forgery protection for notes API methods
...
Fixes #1571
2017-06-29 19:14:55 +01:00
Tom Hughes
117f0e8226
Sanitize parameters for various paged views
2017-06-29 10:55:53 +01:00
Tom Hughes
1b7586c928
Merge remote-tracking branch 'upstream/pull/1561'
2017-06-29 08:58:29 +01:00
Tom Hughes
f76f838c84
Update to leaflet 1.1.0
2017-06-27 19:22:23 +01:00
Tom Hughes
2d80cd12ff
Monkey patch oauth-plugin to avoid using deprecated methods
2017-06-27 08:26:44 +01:00
Tom Hughes
3893fd72a9
Fix some tests for changes in rails 5
2017-06-27 08:26:44 +01:00
Tom Hughes
03408b6294
Update get/post etc to remove use of deprecated syntax
2017-06-27 08:26:44 +01:00
Tom Hughes
81deb35331
Update to rails 5.0.4
2017-06-27 08:26:44 +01:00
Tom Hughes
895b4e72ab
Update to rails 4.2.9
2017-06-27 08:18:16 +01:00
Andy Allan
396f2e28dd
Rework coordinates to avoid scientific formatting of small numbers. Fixes #1509
2017-06-23 14:03:57 +01:00
Tom Hughes
ab3df6fc56
Refactor AMF encodevalue routine
...
Simplify the switch, and raise an exception if we see an unexpected
type rather than just logging and then accidentally triggering a odd
error by returning true when a string is expected.
2017-06-21 21:20:41 +01:00
Tom Hughes
d892a9be52
Update bundle
2017-06-20 19:03:14 +01:00
Tom Hughes
1fe3fc2dbe
Disable removeUnknownsAndDefaults instead of removeUselessStrokeAndFill
2017-06-14 15:25:47 +01:00
Tom Hughes
ea9a4c2aa2
Convert XML document to a string when returning it
...
Otherwise the Rak::ETag module will throw an exception when it
tries to test if the response is empty.
2017-06-13 12:55:13 +01:00
Bryan Housel
13aae29476
Disable removeUselessStrokeAndFill svgo plugin
...
see https://github.com/openstreetmap/iD/issues/4105
2017-06-12 18:43:19 -04:00
Bryan Housel
71d19cebf3
No need to precompile traffico anymore, as it's been removed
2017-06-12 18:36:50 -04:00
Bryan Housel
727c1b0595
Update to iD v2.2.2
2017-06-12 11:24:59 -04:00
Bryan Housel
6837d7cdba
Remove old traffico mapillary signs library from Vendorfile
2017-06-12 11:22:53 -04:00
Tom Hughes
3cb294bebd
Update bundle
2017-06-11 19:32:51 +01:00
Tom Hughes
fb4ea1a02a
Add explicit primary key declaration for changeset subscriptions
...
This table has a composite primary key and although we don't really
rely on that at all rails 5.0 warns about itif you don't explcitly
declare it in order to trigger the CPK extension.
2017-06-06 22:42:25 +01:00
Tom Hughes
07673278f1
Remove deprecated get_via_direct and post_via_redirect methods
2017-06-06 00:03:39 +01:00
Tom Hughes
18c8946556
Use explicit to_unsafe_h method when converting parameters to a hash
2017-06-05 22:44:15 +01:00
Tom Hughes
d85621c7ae
Replace deprecated ActiveModel::Errors get/set methods
2017-06-05 22:41:23 +01:00
Tom Hughes
d4df87c1e1
Replace deprecated env method with request.env
2017-06-05 22:38:27 +01:00
Tom Hughes
4248e10946
Use distinct instead of uniq which is deprecated
2017-06-04 22:52:41 +01:00
Tom Hughes
9dafeda080
Replace render :nothing with non-deprecated alternatives
2017-06-04 22:52:41 +01:00
Tom Hughes
339d8e46ff
Sanitise parameters used in URL generation
2017-06-04 20:24:53 +01:00
Tom Hughes
03a9df9288
Replace render :nothing with head
2017-06-04 20:24:53 +01:00
Tom Hughes
38a39352cb
Replace deprecated xxx_filter methods with xxx_action
2017-06-03 17:33:19 +01:00
Tom Hughes
8412ed0bed
Replace deprecated Mime::XXX with Mime[:xxx]
2017-06-03 17:33:13 +01:00
Tom Hughes
2357118c46
Avoid using format as a URL parameter name
...
This prevents rails confusing it with the builtin format
parameter derived from the URL extension.
2017-06-03 12:08:35 +01:00
Tom Hughes
3b2d1886eb
Make delete button translatable
2017-06-03 12:04:00 +01:00
Tom Hughes
124ec2e9d5
Merge remote-tracking branch 'openstreetmap/pull/1553'
2017-06-02 20:34:17 +01:00
Hamel Desai
fa7b3022a8
Add delete button to message view
...
Fixes #1504
Closes #1557
2017-06-02 20:31:59 +01:00
Tom Hughes
80d27a7fae
Sanitise parameters used in URL generation
2017-06-02 20:27:07 +01:00
Tom Hughes
4ef7b2c651
Remove duplicate size specification for user image
...
Either the size or the width and height can be passed but passing
both doesn't make any sense and in rails 5.0 will error.
2017-06-02 20:27:07 +01:00
