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

2108 commits

Author SHA1 Message Date
Andy Allan
8445561fcc Use lazy translation lookups for the oauth controller. 2018-04-25 15:42:34 +08:00
Tom Hughes
9ced230fe1 Merge remote-tracking branch 'upstream/pull/1827' 2018-04-18 20:21:52 +01:00
Tom Hughes
7a64ebe982 Merge remote-tracking branch 'upstream/pull/1824' 2018-04-18 18:36:22 +01:00
Andy Allan
736ff9b1a0 Use lazy translation lookups for the user_blocks partials. 2018-04-18 14:20:41 +08:00
Tom Hughes
c174845258 Merge remote-tracking branch 'upstream/pull/1816' 2018-04-15 19:55:03 +01:00
Andy Allan
713de1fadb Set default_url_options for action_mailer 
This saves having to repeat the same host and protocol options
throughout the notifiers
 2018-04-11 15:53:30 +08:00
Andy Allan
0a86a1ea8d Fix handling of title when replying to diary entries 2018-04-11 14:03:17 +08:00
Andy Allan
7b2af50f4a Refactor @this_user to @user 
Historically we used @user for the currently logged in user, but
this was changed to `current_user` in 2017.
 2018-04-11 11:42:33 +08:00
Tom Hughes
adbd737a0c Ask for confirmation before deleting a trace 
Fixes #1812
 2018-04-05 21:16:28 +01:00
Tom Hughes
357de642b3 Merge remote-tracking branch 'upstream/pull/1799' 2018-03-28 17:38:34 +01:00
Andy Allan
3b75e92415 Be more consistent with 'my' vs 'your' for objects that belong to 
the user
 2018-03-28 17:07:50 +08:00
Andy Allan
5e76b66271 Use named paths for a few trace links 2018-03-28 16:55:10 +08:00
Andy Allan
9f84c6f46e Use user_path links. Fixes #1785 2018-03-21 11:33:45 +08:00
biswesh456
646dcb62fc Allow admins and moderators to delete traces 
Fixes #1625
 2018-02-24 20:36:12 +05:30
Biswesh Mohapatra
dd27ee8afe Add marker at trace start coordinate 
Fixes #1676
Closes #1731
 2018-02-04 15:04:17 +00:00
Biswesh Mohapatra
16b78022c7 Remove duplicate link: traces >> more 
Fixes #1699
Closes #1730
 2018-02-04 15:00:30 +00:00
Tom Hughes
9d2f920feb Merge remote-tracking branch 'upstream/pull/1693' 2018-02-03 16:12:51 +00:00
Tom Hughes
a83030dab7 Fix new rubocop warnings 2018-01-22 18:55:45 +00:00
Tom Hughes
be86e4824f Convert various URLs to https 2018-01-08 20:18:21 +00:00
Tom Hughes
9340c46173 Remove dependencies on mapzen services 2018-01-02 18:45:20 +00:00
mmd-osm
965123372d Added explanation about discussions on open changesets 
Closes #1705
 2017-12-18 21:19:35 +00:00
J Guthrie
7a933cf928 Added 'Reverse Directions' link 
Added a text link that reverses the directions of the planned route
 2017-12-17 01:09:09 +00:00
Tom Hughes
30757696bd Move advice on what to enter in a note to guide text 2017-12-14 16:07:32 +00:00
Tom Hughes
a3519348c6 Remove inline javascript from user settings page 2017-11-24 16:20:50 +00:00
Andy Allan
1b181d4c1d Put specific page titles at the start 
The makes the shortened titles commonly shown on browser tabs more
useful.
 2017-11-22 14:57:26 +00:00
Tom Hughes
1c77d2432e Avoid using rinku's auto_link helper 
It's currently broken (https://github.com/vmg/rinku/issues/70) and
in case our own linkify has some additional customisations.
 2017-10-27 19:45:32 +01:00
Tom Hughes
0b0ff1bcc5 Remove reference to large screen stylesheet 
The separate large screen stylesheet was removed in 4dceacdeb but
we are still referencing it on Internet Explorer.
 2017-10-09 13:47:48 +01:00
Tom Hughes
6e0ca57e2f Fix typo that means fe0f4543c1 has never worked 2017-10-09 08:39:14 +01:00
Wille Marcel
a402e811da Add padding between the last diary post and the pagination links 
Closes #1634
 2017-09-08 16:50:09 +01:00
Tom Hughes
a70898be6d Make sure we show errors correctly when resetting a password 2017-08-11 17:45:57 +01:00
Tom Hughes
85b0098b1c Make sure the account form is POSTed 
Fixes #1601
 2017-08-02 15:32:13 +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
24fc94944b Change user forms to use current user instead of @user 2017-07-27 19:40:20 +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
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
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
Andy Allan
396f2e28dd Rework coordinates to avoid scientific formatting of small numbers. Fixes #1509 2017-06-23 14:03:57 +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
Tom Hughes
3a16b68368 Use POST when editing GPX trace details 
Fixes #1533
 2017-05-01 16:56:02 +01:00
daganzdaanda
8b68acec3e Move list of containing relations to top of browse views 
Moves the list of containing relations to above the list of
members for ways and relations - nodes have no equivalent list
so no change is needed there.

Fixes #794
Closes #1501
 2017-04-24 20:25:22 +01:00
Matt Amos
c7391595d8 Credit the whole of UCL, rather than just the Bartlett / VR centre. 2017-04-22 11:47:12 +01:00
Herve Saint-Amand
2ae479e3f3 Fix indentation in email template 
The plain text templates had nice indentation in the source however that
got reflected in the output, which was visibly and needlessly indented.

Closes #1512
 2017-04-08 16:36:40 +01:00