Tom Hughes
555a821c3e
Merge remote-tracking branch 'upstream/pull/1595'
2017-07-27 19:18:31 +01:00
Andy Allan
09ba878519
Convert @user to current_user
2017-07-27 10:31:31 +01:00
Andy Allan
c819bec8b7
Use a current_user helper for accessing the logged in user in all views.
2017-07-27 10:07:51 +01:00
Andy Allan
41000078b9
Convert remaining controller code to use current_user
...
The `self.current_user` is important when assigning to the current user,
to avoid creating a local variable called `current_user`
2017-07-27 10:07:51 +01:00
Nick Doiron
de3e02d41a
use no-r2 comment to block RTL gem from changing sprites
2017-07-26 09:15:07 -10:00
Bryan Housel
34a918c59e
Update to iD v2.3.2
2017-07-24 18:55:40 -04:00
Christian Schmidt
f45f27627c
Update to Leaflet.Locate 0.62.0
2017-07-21 20:51:16 +02:00
Tom Hughes
4874219ab8
Mark account suspended flash message as HTML safe
...
Fixes #1590
2017-07-19 00:31:03 +01:00
Tom Hughes
d14b251767
Merge remote-tracking branch 'upstream/pull/1587'
2017-07-17 14:27:58 +01:00
Benoît
90325dc5d5
new png file for banner with square 350x350
2017-07-17 15:26:03 +02:00
Benoît
1d49b0d71d
Delete sotmlatam-2016.jpg
2017-07-17 13:35:41 +02:00
Benoît
18fb0f8461
Delete sotmasia-2016.jpg
2017-07-17 13:35:29 +02:00
Benoît
e0163b5803
Delete donate-2016.jpg
2017-07-17 13:35:19 +02:00
Benoît
eb1db9dcff
image with proper width 350px
2017-07-17 13:34:48 +02:00
Benoît
5d97162d83
remove old entries in banner.yml
2017-07-17 13:19:07 +02:00
Benoît
fdf48bb183
add sotm2017 in banner.yml
2017-07-17 13:17:53 +02:00
Benoît
9b37228097
add png file with background
2017-07-17 13:13:11 +02:00
Tom Hughes
ee53b7a298
Add geoip_database key to example configuration
...
Fixes #1586
2017-07-16 18:36:16 +01:00
Tom Hughes
39c5d8caa7
Merge remote-tracking branch 'upstream/pull/1583'
2017-07-12 17:53:49 +01:00
Andy Allan
6f89da05d1
Use current_user to represent the currently logged in user.
...
This is already used by the oauth plugin, and is a general rails convention.
2017-07-12 16:10:50 +01:00
Andy Allan
6fe5d42100
Standardise on basic_authorization without the parentheses
2017-07-12 14:36:17 +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
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
