Commit graph

8666 commits

Author SHA1 Message Date
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
Bryan Housel
4a9846b078 Update to iD v2.8.1 2018-04-24 10:26:53 -04:00
translatewiki.net
3034556c82 Localisation updates from https://translatewiki.net. 2018-04-23 09:02:42 +02:00
Matt Amos
b73825efe7 Mention error message in OAuth setup for iD
Closes #1830
2018-04-19 12:29:42 +01:00
translatewiki.net
9a14456d30 Localisation updates from https://translatewiki.net. 2018-04-19 09:31:16 +02:00
Tom Hughes
9ced230fe1 Merge remote-tracking branch 'upstream/pull/1827' 2018-04-18 20:21:52 +01:00
Tom Hughes
9d739b3d5b Merge remote-tracking branch 'upstream/pull/1826' 2018-04-18 18:38:50 +01:00
Tom Hughes
9b82e13d17 Improve formatting 2018-04-18 18:37:18 +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
Andy Allan
9408ed6946 Pluralise user_preferences_controller
This is the rails convention for controllers and can make route
generation easier.

http://guides.rubyonrails.org/action_controller_overview.html#controller-naming-convention
2018-04-18 11:26:00 +08:00
Andy Allan
17c706291c Move the default_url_options config to the action_mailer initializer
We can't use Rails.application.config here because the initializers
run after ActionMailer::Base has been set up.
2018-04-18 10:53:22 +08:00
Bryan Housel
30424e89d2 Fix for empty array when querying for local community geometries 2018-04-16 15:49:14 -04:00
Bryan Housel
4399cc793f Allow changeset source tag to be settable via url api
(see https://github.com/openstreetmap/iD/issues/4899)
2018-04-16 14:49:46 -04:00
Bryan Housel
714d3d9e2d Update to iD v2.8.0 2018-04-16 14:43:49 -04:00
Tom Hughes
3da01218b3 Allow trusted addresses for better_errors to be set in the environment 2018-04-15 22:22:43 +01:00
Tom Hughes
4c9ec6a60c Merge remote-tracking branch 'upstream/pull/1815' 2018-04-15 21:26:38 +01:00
Tom Hughes
2160f820ac Merge remote-tracking branch 'upstream/pull/1820' 2018-04-15 19:57:37 +01:00
Tom Hughes
c174845258 Merge remote-tracking branch 'upstream/pull/1816' 2018-04-15 19:55:03 +01:00
Tom Hughes
b897832349 Merge remote-tracking branch 'upstream/pull/1814' 2018-04-15 19:52:31 +01:00
J Guthrie
606c0adf29 Remove error class when right-click-selecting destination 2018-04-15 18:05:25 +01:00
translatewiki.net
50aadfc6cd Localisation updates from https://translatewiki.net. 2018-04-12 19:26:02 +02:00
translatewiki.net
34f10464e8 Localisation updates from https://translatewiki.net. 2018-04-12 15:33:08 +02:00
translatewiki.net
bfe5b1ac77 Localisation updates from https://translatewiki.net. 2018-04-12 09:24:37 +02:00
Andy Allan
45e6ebcafc Alter class to avoid conflict with model test class 2018-04-11 16:05:13 +08: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
8d724600f3 Add better_errors gem for easier debugging 2018-04-11 14:07:38 +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
Andy Allan
7dbf8d8336 Merge branch 'master' into moderation 2018-04-11 09:54:04 +08:00
translatewiki.net
fc90b73581 Localisation updates from https://translatewiki.net. 2018-04-09 08:27:07 +02:00
Tom Hughes
adbd737a0c Ask for confirmation before deleting a trace
Fixes #1812
2018-04-05 21:16:28 +01:00
translatewiki.net
259f9650cb Localisation updates from https://translatewiki.net. 2018-04-05 09:31:53 +02:00
J Guthrie
d0c5871858 Reworded roundabout exit text 2018-04-02 23:20:31 +01:00
Tom Hughes
be35dda9c3 Merge remote-tracking branch 'upstream/pull/1804' 2018-04-02 15:41:35 +01:00
Tom Hughes
10c3230e27 Merge remote-tracking branch 'upstream/pull/1801' 2018-04-02 15:25:17 +01:00
Tom Hughes
7e6e1dfbaf Tweak highlighting of geolocation errors 2018-04-02 15:24:03 +01:00
Tom Hughes
87dfbda932 Merge remote-tracking branch 'upstream/pull/1800' 2018-04-02 15:18:11 +01:00
J Guthrie
65ceb77eab Added autoPan for Directions markers 2018-03-31 22:18:25 +01:00
J Guthrie
4b4449f724 Converted roundabouts to take "1st, 2nd, 3rd" exit etc 2018-03-31 18:22:56 +01:00