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

2128 commits

Author SHA1 Message Date
Andy Allan
00bd64c7fb Rename message_controller to messages_controller 2018-05-09 16:38:37 +08:00
Andy Allan
011cfa794a Use named paths for messages 2018-05-09 11:24:11 +08:00
Tom Hughes
827024f7e6 Merge remote-tracking branch 'upstream/pull/1833' 2018-04-25 17:44:53 +01:00
Tom Hughes
b15a8c73d9 Merge remote-tracking branch 'upstream/pull/1839' 2018-04-25 17:39:27 +01:00
Tom Hughes
00425c8fca Merge remote-tracking branch 'upstream/pull/1838' 2018-04-25 17:38:35 +01:00
Tom Hughes
aebfbdcfbd Merge remote-tracking branch 'upstream/pull/1837' 2018-04-25 17:38:19 +01:00
Tom Hughes
0d7c9a187e Merge remote-tracking branch 'upstream/pull/1836' 2018-04-25 17:37:55 +01:00
Tom Hughes
7f24a2f1d6 Merge remote-tracking branch 'upstream/pull/1835' 2018-04-25 17:37:34 +01:00
Andy Allan
af4003e2ee Lazy translation lookups and key renames for help page. 2018-04-25 17:09:29 +08:00
Andy Allan
7d0a94552c Lazy translation lookup and key renames for fixthemap page. 2018-04-25 17:09:29 +08:00
Andy Allan
fb16b5ed14 Use lazy lookups and rename translation keys for export 2018-04-25 17:09:29 +08:00
Andy Allan
c7e514a56b Use lazy lookups and rename keys for the copyright page 2018-04-25 16:33:34 +08:00
Andy Allan
ab79d8c520 Use lazy lookups and rename keys for the welcome page. 2018-04-25 16:33:34 +08:00
Andy Allan
246596225e Use lazy lookups and rename keys for the about page. 2018-04-25 16:19:46 +08:00
Andy Allan
8d45f1a5cf Use lazy lookups for site translations 2018-04-25 16:04:34 +08:00
Andy Allan
3720004d9c Remove empty and unused view template 2018-04-25 15:51:48 +08:00
Andy Allan
8445561fcc Use lazy translation lookups for the oauth controller. 2018-04-25 15:42:34 +08:00
Andy Allan
dfa2fd7d3d Rename note to notes in i18n lookups 
Enables lazy translation lookups for most cases. Additionally, rename
keys for notes.description.* to notes.comment.* to match partial
name.
 2018-04-25 14:56:20 +08:00
Andy Allan
2c7bc36493 Use lazy translation lookups for redactions 
Requires renaming the translation keys
 2018-04-25 14:39:37 +08:00
Andy Allan
5bed217823 Use lazy translations where possible 2018-04-25 14:10:59 +08:00
Andy Allan
a0de9b780d Use lazy lookups for user_blocks translations 2018-04-25 12:03:58 +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