Andy Allan
389095df1c
Remove unused user save template.
...
This template isn't used, since all the controller methods redirect
to other views.
2017-08-02 14:48:04 +01:00
Andy Allan
3e4255eb2c
Use current_user instead of @user.
2017-08-02 12:21:51 +01:00
Andy Allan
e31376e28d
Merge branch 'master' into moderation
2017-08-02 12:12:57 +01:00
Tom Hughes
f258af223b
Fix user settings form
...
Fixes #1601
2017-08-01 19:25:07 +01:00
Tom Hughes
72fb2062b5
Update to rails 5.0.5
2017-07-31 21:55:40 +01:00
Tom Hughes
4bd49a8cd7
Update bundle
2017-07-31 21:55:32 +01:00
Tom Hughes
8c513beec6
Update rack-cors and fix tests for changes in behaviour
2017-07-31 21:55:01 +01:00
Andy Allan
aa821971dd
Merge pull request #1597 from tomhughes/current-user
...
Complete @user to current_user transition
2017-07-28 12:42:33 +01:00
Tom Hughes
ebeea34670
Replace @user with @current_user
...
This ensures that that we will find any more hidden references
to @user that might be hanging around...
2017-07-27 19:44:14 +01:00
Tom Hughes
24fc94944b
Change user forms to use current user instead of @user
2017-07-27 19:40:20 +01:00
Tom Hughes
2c9c427587
Convert @user to current_user in helpers
2017-07-27 19:27:17 +01:00
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
Bryan Housel
c555c91204
Clarify image dimensions
2017-07-17 14:03:12 -04: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
Andy Allan
c1cdddf11f
Use rails 5 version of redirect_back.
2017-07-12 13:57:09 +01:00
Andy Allan
9c1c696141
Remove indirection.
2017-07-12 13:42:39 +01:00
Andy Allan
506c0b5f0d
Set the reported_user in a callback
...
This avoids passing around the reported_user via forms. There was no
validation anywhere that the reported_user corresponded to the object
being reported. This approach removes those worries too.
2017-07-12 13:36:48 +01:00
Andy Allan
65e1dbb4a6
Rubocop autofixes.
2017-07-12 11:49:23 +01:00
Andy Allan
99df5f6179
Rename association to reported_user, for clarity
2017-07-12 11:44:05 +01:00
Andy Allan
6f375ef493
Get tests passing. Use factories instead of fixtures.
2017-07-12 11:38:50 +01:00
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
Bryan Housel
ee04490f7c
Add FAQ and information about creating a banner image
2017-07-11 01:06:22 -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
