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

4626 commits

Author SHA1 Message Date
Rajdeep Mandrekar
3def2f839f Use rails helpers to construct URLs 
Fixes #1817
Closes #1840
 2018-04-25 22:22:51 +01: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
9d739b3d5b Merge remote-tracking branch 'upstream/pull/1826' 2018-04-18 18:38:50 +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
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
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
J Guthrie
606c0adf29 Remove error class when right-click-selecting destination 2018-04-15 18:05:25 +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
be35dda9c3 Merge remote-tracking branch 'upstream/pull/1804' 2018-04-02 15:41:35 +01:00
Tom Hughes
7e6e1dfbaf Tweak highlighting of geolocation errors 2018-04-02 15:24:03 +01:00
J Guthrie
65ceb77eab Added autoPan for Directions markers 2018-03-31 22:18:25 +01:00
J Guthrie
efd17cfbe9 Moved inline styling to stylesheet 2018-03-29 22:48:39 +01:00
J Guthrie
becccea034 Remove/replace redundant no_place locale translation 2018-03-29 22:27:33 +01:00
J Guthrie
1bb52e3cb6 Unlocateable place now highlighted in red and specified in error message 
The textbox containing the unlocateable place gets highlighted in red
Also added a new locale value to specify an error for a specific place
 2018-03-29 21:02:42 +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
Tom Hughes
1f2ac59d1d Fix new rubocop warnings 2018-03-26 19:00:03 +01:00
Andy Allan
9f84c6f46e Use user_path links. Fixes #1785 2018-03-21 11:33:45 +08:00
Andy Allan
0f5ad1f3cc Merge branch 'pull/1765' 2018-03-09 15:57:24 +08:00
Andy Allan
b2ff9f3aad Simplify redirect. 2018-03-09 15:56:56 +08:00
Štefan Baebler
36a382bb43 Added support for 2 more secondary wikidata tag links 
Listed on in https://wiki.openstreetmap.org/wiki/Key:wikidata :
* name:etymology:wikidata
* network:wikidata
 2018-03-05 08:38:50 +00:00
Tom Hughes
276859d0c9 Validate user location is sensible 2018-03-04 10:53:14 +00:00
Tom Hughes
9361478e74 Use home_tile to find nearby users 2018-03-04 09:59:24 +00:00
Tom Hughes
f1e9dcc66a Add an indexed home_tile column to the user table 2018-03-04 09:59:23 +00:00