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

4683 commits

Author SHA1 Message Date
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
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
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
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
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
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
3893fd72a9 Fix some tests for changes in rails 5 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
Andy Allan
396f2e28dd Rework coordinates to avoid scientific formatting of small numbers. Fixes #1509 2017-06-23 14:03:57 +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
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
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
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
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