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
Andy Allan
162f04d789 Convert ACL fixture to a factory, and add some tests 
The fixture was unused, so I took the opportunity to put in a couple
of basic model tests.
 2016-10-26 09:15:56 +01:00
Tom Hughes
7725cd59b4 Keep layer labels on top of the tiles in the layer switcher 
Fixes #1334
 2016-10-21 15:23:37 +01:00
Tom Hughes
e17b89e89f Fix rubocop warnings 2016-10-20 22:35:51 +01:00
Karim Osman
23c79ba2a3 Replace WordPress logo with correct version 
See https://wordpress.org/about/logos/ for official source.

Closes #1329
 2016-10-18 19:02:51 +01:00
Marco Antonio Frias Butrón
1f9857e76c Patch classes on the locate control 
This patches the map on the user page in the same way as the main map.

Closes #1328
 2016-10-17 11:00:01 +01:00
Marco Antonio Frias Butrón
1ba7eccae6 Add cursor style on close icon 
Without this the close icon for the routing panel doesn't change the
pointer as it isn't a link and isn't in a close-wrap container.

Closes #1327
 2016-10-17 10:55:47 +01:00
Mikel Maron
be40536440 merge upstream/master and resolve conflicts from https://github.com/openstreetmap/openstreetmap-website/pull/1318 2016-10-12 10:52:05 -04:00
Andy Allan
41e05f0929 Remove unnecessary controller references from the redirect hashes. 
Rails redirect_to uses the current controller by default, so there
is no need to re-iterate this in the code when the redirect targets
the current controller.

The short-form is already used elsewhere, this just tidies up those
which were still using the long-form.
 2016-10-12 14:32:49 +01:00
Mikel Maron
3726d561ea last minor fixes 2016-10-11 20:42:10 -04:00
Mikel Maron
a32076abd6 fix rubocop warnings 2016-10-07 06:32:05 -04:00
Mikel Maron
bb22e23dfb css in right place; fix structure.sql 2016-10-06 21:47:29 -04:00
Mikel Maron
e055eaf690 tests passing 2016-10-06 21:33:47 -04:00
Mikel Maron
3c01d2e80d more idiomatic models for diary entry subscriptions 2016-10-06 20:31:10 -04:00
Andy Allan
3f698e1d15 Fix bugs->notes in comment 2016-10-06 08:59:24 +01:00
Mikel Maron
44b08cc35d not api endpoints, moved to button, fixed notifier message, fixed tests 2016-10-03 22:20:04 -04:00
Mikel Maron
443080d7b0 WIP diary comment subscriptions 2016-10-03 15:04:22 -04:00
Tom Hughes
6d9bddfa47 Patch classes on the locate control 
This replaces the patching of the vendored source that we had been
doing before and which we always forget to apply after updating it.

Fixes #1306
 2016-09-30 11:15:18 +01:00
Tom Hughes
a1ff77ec56 Remove z-index override from leaflet controls on small screens 
Fixes #1305
 2016-09-30 09:03:24 +01:00
Tom Hughes
f4a4632b45 Update leaflet to 1.0.0 2016-09-29 08:29:51 +01:00
Tom Hughes
d73128271f Fix rubocop warnings 2016-09-26 12:38:54 +01:00
Tom Hughes
ab8958bead Centre loading icon 2016-09-26 12:37:49 +01:00
Sarah Hoffmann
5efbc8a8b7 look for extra place tags in Nominatim search results 
Administrative boundaries at municipality level are generally
better described by the place node (as town, village etc.).
Nominatim exports the place type in extratags if it was able
to merge place nodes with admin boundaries. Use this preferably
to create the descriptive term.
 2016-09-26 13:00:10 +02:00
Bryan Housel
e104b53711 Remove SOTM 2016 banner, add Donation Drive 2016 Banner 2016-09-25 22:58:25 -04:00
Tom Hughes
d75c203ecf Add thunderforest API key to embedded maps 
Fixes #1293
 2016-09-21 20:05:00 +01:00
Tom Hughes
5f4dcd34ff Fix some rubocop warnings 2016-09-15 22:41:07 +01:00
Tom Hughes
d82f9d12ce Fix new rubocop warnings 2016-09-15 19:21:00 +01:00
Bryan Housel
1b1693b8fe Prioritize next upcoming event in banner rotation 
(closes #1284)
 2016-09-14 15:03:41 -04:00
Wille Marcel
e3357b27e6 Add banner for SotM Latam 2016 2016-09-13 14:49:40 +01:00
Tom Hughes
e0dd431e6c Propagate API keys to minimaps in layer switcher 2016-09-08 17:35:37 +01:00
Tom Hughes
322e7142ba Hide thunderforest layers when no API key is available 2016-09-08 17:28:54 +01:00
Tom Hughes
3eda7be919 Use an API key for thunderforest tile layers 2016-09-08 16:16:45 +01:00
Andy Allan
38e12759ea Rubocop autofixes. 2016-09-07 11:07:42 +01:00
Andy Allan
6cc4f4506b Use .present? instead of double negative to check if terms_agreed timestamp is set. 2016-09-07 11:02:20 +01:00
Andy Allan
924f9fa083 User.consider_pd is boolean, so no need for double negation. 2016-09-07 10:59:00 +01:00
Tom Hughes
9f817f8364 Set banner expiry correctly 2016-08-23 19:23:58 +01:00
Matt Amos
c3ad6aa292 More whitespace fixes. Attempting to get tests to pass. 2016-08-22 18:38:03 +01:00
Matt Amos
757a1aaa85 Made rubocop happy by formatting and minor syntax tweaks. 2016-08-22 17:24:10 +01:00
Frederik Ramm
f3519e9781 fix build on wily; fix some moderation branch language constants 2016-08-22 16:19:14 +01:00
Shrey
916f2c9036 Added helper + minor UI changes 
(cherry picked from commit 3a6550ff54eb08ec282d13ebf85dc3461cca2983)
 2016-08-22 16:18:15 +01:00
Shrey
81b6599830 Fixed related issues positioning 
(cherry picked from commit 156e678dc6dccdf36912ffa16264eb0967a4d5a6)
 2016-08-22 16:18:15 +01:00
Shrey
ed84930283 UI changes + Redirection after creating report fixed 
(cherry picked from commit 987fcf0ba5e7e914dc479e9dc7613400e72148a0)
 2016-08-22 16:18:15 +01:00
Shrey
eb79b15681 Fixed error 
(cherry picked from commit 99f8a765b8303115c8633fdc9e3c4edc77cbc32d)

Conflicts:
	app/controllers/issues_controller.rb
 2016-08-22 16:18:15 +01:00
Shrey
b598979374 Changed report button + Added disclaimer on report page + Added search filter 2016-08-22 16:18:15 +01:00
Shrey
69c1f6d186 Added sortable headers + search + reportable Notes 2016-08-22 16:18:15 +01:00
Shrey
206e1309a9 Added report icon + changes to admin UI + changes to report form + few other minor changes 2016-08-22 16:17:54 +01:00
Shrey
732e1ab03a Fixed link to DiaryComments 2016-08-22 16:17:54 +01:00
Shrey
4b4b67aa96 Added report strings for Changesets and Notes + minor controller changes 2016-08-22 16:17:54 +01:00
Shrey
b17f9a6157 Fixed an error + Added email notifications for moderators 2016-08-22 16:17:54 +01:00
Shrey
b68b29b43c Added support for reporting Changesets + Deleting issues from the CLI 2016-08-22 16:17:54 +01:00
Shrey
cf639202b8 Added a few more tests 2016-08-22 16:17:54 +01:00