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

5883 commits

Author SHA1 Message Date
Tom Hughes
57095bc6c0 Merge remote-tracking branch 'upstream/pull/1955' 2018-10-11 17:41:47 +01:00
Tom Hughes
45c464a69a Suppress changeset pagination for inactive users 
Fixes #2024
 2018-10-11 09:39:56 +01:00
ENT8R
caef5828f4
Fix Rubocop issue 2018-10-11 08:36:13 +02:00
ENT8R
b19e424112
Fix some issues and improve code 2018-10-10 19:29:11 +02:00
Andy Allan
b7baa2c10a Remove temporary development code 2018-10-10 16:54:16 +02:00
Andy Allan
8360f275f9 Refactor to show the Issues link based on the calculated permissions 2018-10-10 16:42:01 +02:00
Andy Allan
dfb9e40820 Move issues and reports to authorization system 2018-10-10 16:34:44 +02:00
Andy Allan
901c29a820 Fix typo in method name 2018-10-10 11:55:00 +02:00
Andy Allan
fb2c1f6cfd Refactor site#welcome to use abilities instead of require_user 2018-10-10 11:49:45 +02:00
Andy Allan
f8f7ab1568 Change abilities based on upstream renamings 2018-10-10 11:41:16 +02:00
Andy Allan
420a7289a0 Merge branch 'authz' of https://github.com/rubyforgood/openstreetmap-website into rubyforgood-authz 2018-10-10 11:26:30 +02:00
Tom Hughes
4530f6e3e4 Make paragraph breaks more visible in changeset and note comments 
Fixes #2022
 2018-10-09 15:15:15 +01:00
ENT8R
0859748815
Fix Rubocop issue 2018-10-09 14:50:55 +02:00
ENT8R
3cdf4f3686
Fix an issue where the query did not work if a display name or an id was specified 2018-10-09 14:37:55 +02:00
ENT8R
083500f056 Merge branch 'master' into notes-search 2018-10-09 11:41:22 +02:00
J Guthrie
31c4461766 Converted to dot notation - fixes jshint 2018-10-07 00:52:11 +01:00
J Guthrie
e976f316b7 Convert degrees min-width to pixels min-width 2018-10-07 00:33:54 +01:00
Tom Hughes
cae83903d0 Rename CSS class matches for change in controller name 2018-10-04 22:32:10 +01:00
Tom Hughes
b13b63b65c Improve formatting 2018-10-03 22:39:27 +01:00
Tom Hughes
25f27a753f Merge remote-tracking branch 'upstream/pull/2010' 2018-10-03 22:39:17 +01:00
J Guthrie
cf896fa0a7 Updated min bounds algorithm 2018-10-03 22:07:20 +01:00
Tom Hughes
b8a8a88004 Merge remote-tracking branch 'upstream/pull/2014' 2018-10-03 18:59:33 +01:00
Andy Allan
3ec67ea2d3 Rename user_controller to users_controller 2018-10-03 15:31:10 +02:00
Andy Allan
5e407dfb34
Merge branch 'master' into messages 2018-10-03 14:04:12 +02:00
J Guthrie
9bf489a0b9 Changeset boundary is enlarged if it was on a single point 2018-10-02 23:56:42 +01:00
J Guthrie
aae0d3b7b5 Changeset border turns blue on hover 2018-10-02 23:41:24 +01:00
Xuyang Jia
d0e45c7c8e Fix any_relations always being false 
Closes #1976
 2018-09-22 17:46:00 +01:00
Tom Hughes
de29e9b3f5 Fix Style/NumericPredicate rubocop warnings 2018-09-22 17:34:58 +01:00
Tom Hughes
64146b4f36 Fix Style/SafeNavigation rubocop warnings 2018-09-22 17:21:06 +01:00
Tom Hughes
6c2093b29d Fix new rubocop warnings 2018-09-22 17:12:29 +01:00
Tom Hughes
ad3ca54e28 Remove Imperial from hosting credits 
Fixes #1944
 2018-09-22 16:57:53 +01:00
mmd-osm
df671aeccc Set img.button size to 20x20 for directions.png 2018-09-11 19:49:10 +02:00
Tom Hughes
f906373be2 Update translation keys for renaming of user#view to user#show 2018-09-11 16:33:46 +01:00
Tom Hughes
1a66467ef6 Avoid flickering welcome banner 
Make the welcome banner default to being hidden and then show
it (by adding a class) if there is no cookie.

Fixes #1951
 2018-09-10 21:21:43 +01:00
Tom Hughes
a7cdb0298d Limit map to the maximum zoom of the current base layer 
Fix maximum zoom levels for various layers and ensure that the
map can't be zoomed beyond the limit of the current base layer.

Fixes #1978
 2018-09-10 20:37:36 +01:00
Tom Hughes
297b0a0e16 Merge remote-tracking branch 'upstream/pull/1987' 2018-09-10 19:09:31 +01:00
Tom Hughes
276599d34f Merge remote-tracking branch 'upstream/pull/1986' 2018-09-10 19:01:28 +01:00
Tom Hughes
0e0c89b95c Merge remote-tracking branch 'upstream/pull/1985' 2018-09-10 18:58:27 +01:00
Tom Hughes
995a5f89c2 Merge remote-tracking branch 'upstream/pull/1984' 2018-09-10 18:53:13 +01:00
Tom Hughes
744fadccd9 Rename CSS class matches for changes in action names 2018-09-10 14:12:56 +01:00
Wil
a182820139 Resolve 96 Rubocop Lint/AmbiguousRegexpLiteral conflicts 2018-09-10 11:28:16 +08:00
Andy Allan
100babbe6c Just pass the object, rather than the id, to _path methods where possible 2018-09-10 11:09:30 +08:00
Andy Allan
4dd4831c0a Just pass the user object, rather than the display_name, to the user_path helper 2018-09-10 10:54:29 +08:00
Andy Allan
3f2ba044e5 Rename diary_entry#list to #index 2018-09-10 10:26:28 +08:00
Andy Allan
a3606e00b4 Rename user#list to user#index 2018-09-10 10:03:34 +08:00
Tom Hughes
5a2d2f97ce Update changeset browse view for renaming of changeset#list to changeset#index 2018-09-09 12:36:34 +01:00
Tom Hughes
ba05009de1 Update trace RSS for renaming of trace#view to trace#show 2018-09-09 11:50:05 +01:00
Tom Hughes
f03ed73755 Fix rubocop warnings 2018-09-05 19:33:54 +01:00
Tom Hughes
983e21db2e Merge remote-tracking branch 'upstream/pull/1974' 2018-09-05 19:06:16 +01:00
Tom Hughes
70cca71f38 Merge remote-tracking branch 'upstream/pull/1973' 2018-09-05 19:01:24 +01:00