cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11229 commits 4 branches 1 tag 499 MiB
Commit graph

5883 commits

Author SHA1 Message Date
Andy Allan
948fd8c8fa Use reports_count so that counter_cache works automatically. 2017-09-06 17:57:54 +01:00
Andy Allan
b578cee759 Remove the border around the radio boxes 
It looks strange.
 2017-09-06 16:27:54 +01:00
Tom Hughes
f1faffd4d1 Merge remote-tracking branch 'upstream/pull/1614' 2017-08-30 21:09:32 +01:00
Andy Allan
b4be5596f5 Rename xml processing methods with an update_ prefix 
They behave differently from the other from_xml methods on other models.
 2017-08-30 11:40:54 +01:00
Bryan Housel
8d2acb8ef0 Add iD hashtags parameter 2017-08-25 16:24:19 -04:00
Andy Allan
c647aa3d4d Refactor the from_xml methods to act on existing trace objects. 
Setting the new tags with the = operator takes care of removing the
old ones, and is the same approach as taken by the tagstring= method.

Fixes #1600
 2017-08-18 10:09:50 +01:00
plarus
dd207cc89f #5218 transform the www.osm.org webpage into a fullscreen web app 2017-08-15 15:44:54 +02:00
Tom Hughes
a70898be6d Make sure we show errors correctly when resetting a password 2017-08-11 17:45:57 +01:00
mmd-osm
7fd1e55938 Discard empty ways from query result geometries 
Fixes #1608
 2017-08-10 19:49:50 +01:00
Tom Hughes
85b0098b1c Make sure the account form is POSTed 
Fixes #1601
 2017-08-02 15:32:13 +01:00
Andy Allan
60f2074bac Merge pull request #1588 from Georeactor/master 
Update gem, fix icons on RTL/Arabic pages
 2017-08-02 15:15:25 +01:00
Tom Hughes
bc10bc8758 Merge remote-tracking branch 'upstream/pull/1603' 2017-08-02 15:02:39 +01:00
Andy Allan
980422533d Avoid passing the current_user.id when commenting 
Doing so doesn't appear to be necessary, and it opens up a spoofing
hole if it's actually used.
 2017-08-02 14:58:03 +01:00
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
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
Tom Hughes
4874219ab8 Mark account suspended flash message as HTML safe 
Fixes #1590
 2017-07-19 00:31:03 +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
9b37228097 add png file with background 2017-07-17 13:13:11 +02: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
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
3ab39f48ba Add iD walkthrough autostart parameter 2017-07-07 17:58:02 -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
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
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