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
Tom Hughes
ab0f79bbab
Remove reference to standard layer in "no key" message
...
Fixes #1319
2016-10-12 15:06:03 +01: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
3a14abde1b
Update structure.sql
2016-10-11 21:22:00 -04:00
Mikel Maron
99afab6d61
adding back trailing newlines
2016-10-11 20:45:44 -04:00
Mikel Maron
6a57901071
adding back trailing newlines
2016-10-11 20:44:58 -04:00
Mikel Maron
3726d561ea
last minor fixes
2016-10-11 20:42:10 -04:00
Mikel Maron
5cd00ddfd1
rubocop clean up
2016-10-11 15:44:37 -04:00
Mikel Maron
43ef60b6d5
break out author subscriptions to its own migration
2016-10-10 21:18:03 -04:00
Tom Hughes
c2e12ed77d
Add a note_with_comments factory
2016-10-10 15:08:11 +01:00
Tom Hughes
61eac42a82
Makr author/author_ip tests more consistent
2016-10-10 13:54:58 +01:00
Tom Hughes
3123822bba
Merge remote-tracking branch 'openstreetmap/pull/1312'
2016-10-10 13:48:09 +01:00
Mikel Maron
6b7ebf6dc4
clean up comments
2016-10-07 09:04:44 -04:00
Mikel Maron
8272a53ab9
fix rubocop warnings
2016-10-07 06:36:14 -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
41c9bc2326
Remove the note and note_comments fixtures
...
You may need to run "DELETE FROM notes" and "DELETE FROM note_comments"
on your local test database.
2016-10-06 09:17:58 +01:00
Andy Allan
c302174b0c
Update notes_controller_test to use note and note_comment factories
...
I've ported across the naming for each note from the old fixture names.
This helps in the mega-tests where multiple notes are tested at the
same time.
The number or results have changed in some tests, since there's little
point in creating e.g. 5 note comments when 2 is enough to test the
functionality.
2016-10-06 09:15:47 +01:00
Andy Allan
886dc00ad4
Update site_controller_test to use note and note_comment factories.
2016-10-06 09:04:06 +01:00
Andy Allan
5037e016cd
Update browse_controller_test to use note and note_comment factories.
2016-10-06 09:03:31 +01:00
Andy Allan
3f698e1d15
Fix bugs->notes in comment
2016-10-06 08:59:24 +01:00
Andy Allan
e4d3c7fb8e
Update note model tests to use factories.
...
The NoteTest.test_visible? has changed slightly, so that the second
test of .visible? is using a closed note, which is a more useful test
than the original.
2016-10-06 08:56:45 +01:00
Andy Allan
2e1ccafdce
Add factories for notes and note_comments
2016-10-06 08:52:17 +01:00
Niklas Laxström
1abe333429
Localisation updates from https://translatewiki.net .
2016-10-06 08:14:08 +02:00
Andy Allan
bfe760a4b0
Replace friends fixture with a factory
2016-10-05 13:18:45 +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
05ad0a4f7d
Update leaflet to 1.0.1
2016-09-30 14:21:20 +01: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
1084d073ac
Patch leaflet-locationfilter for leaflet 1.x support
...
https://github.com/kajic/leaflet-locationfilter/issues/22
https://github.com/kajic/leaflet-locationfilter/pull/23
2016-09-29 08:29:51 +01:00
Tom Hughes
f4a4632b45
Update leaflet to 1.0.0
2016-09-29 08:29:51 +01:00
Niklas Laxström
e5d81734f2
Localisation updates from https://translatewiki.net .
2016-09-29 08:03:12 +02:00
Bryan Housel
84d602c334
Extend donation drive banner end date to 2016-oct-31
2016-09-28 11:18:32 -04:00
Niklas Laxström
20eac5feb5
Localisation updates from https://translatewiki.net .
2016-09-27 14:28:28 +02:00
Tom Hughes
4b5cb04d41
Merge remote-tracking branch 'openstreetmap/pull/1298'
2016-09-26 12:40:01 +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
Simon Poole
8a71bb1ce2
Add links to new approved OSMF privacy policy and some rewording.
2016-09-26 13:16:31 +02: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
Niklas Laxström
0e43524b8f
Localisation updates from https://translatewiki.net .
2016-09-22 07:57:05 +02: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
fd9bf6b0ab
Update to rails 4.2.7.1
2016-09-15 22:26:48 +01:00
Tom Hughes
19a9298855
Merge remote-tracking branch 'openstreetmap/pull/1285'
2016-09-15 19:21:21 +01:00
Tom Hughes
d82f9d12ce
Fix new rubocop warnings
2016-09-15 19:21:00 +01:00
Tom Hughes
0674fc58b8
Rework R2 support for changes in sprockets
2016-09-15 19:07:09 +01:00
