]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Thu, 6 Oct 2016 08:15:47 +0000 (09:15 +0100)]
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.
Andy Allan [Thu, 6 Oct 2016 08:04:06 +0000 (09:04 +0100)]
Update site_controller_test to use note and note_comment factories.
Andy Allan [Thu, 6 Oct 2016 08:03:31 +0000 (09:03 +0100)]
Update browse_controller_test to use note and note_comment factories.
Andy Allan [Thu, 6 Oct 2016 07:59:24 +0000 (08:59 +0100)]
Fix bugs->notes in comment
Andy Allan [Thu, 6 Oct 2016 07:56:45 +0000 (08:56 +0100)]
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.
Andy Allan [Thu, 6 Oct 2016 07:52:17 +0000 (08:52 +0100)]
Add factories for notes and note_comments
Tom Hughes [Fri, 30 Sep 2016 13:21:20 +0000 (14:21 +0100)]
Update leaflet to 1.0.1
Tom Hughes [Fri, 30 Sep 2016 10:15:18 +0000 (11:15 +0100)]
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
Tom Hughes [Fri, 30 Sep 2016 08:03:24 +0000 (09:03 +0100)]
Remove z-index override from leaflet controls on small screens
Fixes #1305
Tom Hughes [Tue, 27 Sep 2016 17:15:17 +0000 (18:15 +0100)]
Patch leaflet-locationfilter for leaflet 1.x support
https://github.com/kajic/leaflet-locationfilter/issues/22
https://github.com/kajic/leaflet-locationfilter/pull/23
Tom Hughes [Tue, 27 Sep 2016 17:14:32 +0000 (18:14 +0100)]
Update leaflet to 1.0.0
Niklas Laxström [Thu, 29 Sep 2016 06:03:12 +0000 (08:03 +0200)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Wed, 28 Sep 2016 15:18:32 +0000 (11:18 -0400)]
Extend donation drive banner end date to 2016-oct-31
Niklas Laxström [Tue, 27 Sep 2016 12:28:28 +0000 (14:28 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 26 Sep 2016 11:40:01 +0000 (12:40 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1298'
Tom Hughes [Mon, 26 Sep 2016 11:38:54 +0000 (12:38 +0100)]
Fix rubocop warnings
Tom Hughes [Mon, 26 Sep 2016 11:33:37 +0000 (12:33 +0100)]
Centre loading icon
Simon Poole [Mon, 26 Sep 2016 11:16:31 +0000 (13:16 +0200)]
Add links to new approved OSMF privacy policy and some rewording.
Sarah Hoffmann [Mon, 26 Sep 2016 10:08:42 +0000 (12:08 +0200)]
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.
Bryan Housel [Mon, 26 Sep 2016 02:58:25 +0000 (22:58 -0400)]
Remove SOTM 2016 banner, add Donation Drive 2016 Banner
Niklas Laxström [Thu, 22 Sep 2016 05:57:05 +0000 (07:57 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 21 Sep 2016 19:04:15 +0000 (20:04 +0100)]
Add thunderforest API key to embedded maps
Fixes #1293
Tom Hughes [Thu, 15 Sep 2016 21:41:07 +0000 (22:41 +0100)]
Fix some rubocop warnings
Tom Hughes [Thu, 15 Sep 2016 21:26:48 +0000 (22:26 +0100)]
Update to rails 4.2.7.1
Tom Hughes [Thu, 15 Sep 2016 18:21:21 +0000 (19:21 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1285'
Tom Hughes [Thu, 15 Sep 2016 18:21:00 +0000 (19:21 +0100)]
Fix new rubocop warnings
Tom Hughes [Thu, 15 Sep 2016 18:02:18 +0000 (19:02 +0100)]
Rework R2 support for changes in sprockets
Tom Hughes [Wed, 14 Sep 2016 20:43:33 +0000 (21:43 +0100)]
Update bundle
Andy Allan [Thu, 15 Sep 2016 10:06:37 +0000 (11:06 +0100)]
Add additional list items to ensure they are not selected
The other list tests already have assetions showing the different
lengths of lists.
Niklas Laxström [Thu, 15 Sep 2016 06:47:43 +0000 (08:47 +0200)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Wed, 14 Sep 2016 19:03:41 +0000 (15:03 -0400)]
Prioritize next upcoming event in banner rotation
(closes #1284)
Andy Allan [Wed, 14 Sep 2016 15:23:47 +0000 (16:23 +0100)]
Remove unneccessary fixture requirement.
Andy Allan [Wed, 14 Sep 2016 11:41:58 +0000 (12:41 +0100)]
Remove diary_entry and diary_comment fixtures, and refactor tests.
Note that you might need to empty the tables in your local test
database, since the removed fixtures may still linger there.
Wille Marcel [Tue, 13 Sep 2016 13:49:22 +0000 (14:49 +0100)]
Add banner for SotM Latam 2016
Niklas Laxström [Tue, 13 Sep 2016 06:12:49 +0000 (08:12 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 8 Sep 2016 18:26:07 +0000 (19:26 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1279'
Tom Hughes [Thu, 8 Sep 2016 17:20:21 +0000 (18:20 +0100)]
Add thunderforest API key to example configuration
Tom Hughes [Thu, 8 Sep 2016 16:35:37 +0000 (17:35 +0100)]
Propagate API keys to minimaps in layer switcher
Tom Hughes [Thu, 8 Sep 2016 16:28:41 +0000 (17:28 +0100)]
Hide thunderforest layers when no API key is available
Tom Hughes [Thu, 8 Sep 2016 15:16:45 +0000 (16:16 +0100)]
Use an API key for thunderforest tile layers
Andy Allan [Thu, 8 Sep 2016 10:44:24 +0000 (11:44 +0100)]
Refactor tests to use factories instead of fixtures
Andy Allan [Thu, 8 Sep 2016 10:40:03 +0000 (11:40 +0100)]
Change the display_name of suspended user fixuture
The original name is reserved, which means the user was invalid,
and this causes problems when building objects using it via
associations.
Andy Allan [Thu, 8 Sep 2016 09:01:11 +0000 (10:01 +0100)]
Test DiaryComment body validation
Replaces unnecessary test.
Niklas Laxström [Thu, 8 Sep 2016 08:36:22 +0000 (10:36 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Thu, 8 Sep 2016 08:06:46 +0000 (09:06 +0100)]
Build a diary entry more succinctly
Andy Allan [Thu, 8 Sep 2016 08:06:26 +0000 (09:06 +0100)]
Assert there are no diary comments before creating one.
Andy Allan [Thu, 8 Sep 2016 07:58:18 +0000 (08:58 +0100)]
Update name of test
Andy Allan [Wed, 7 Sep 2016 15:26:27 +0000 (16:26 +0100)]
Rework DiaryEntry and DiaryComment model tests to use factories.
Since the database also contains fixtures from other tests, some
counts are dropped and instead tested for inclusion in the results.
Andy Allan [Wed, 7 Sep 2016 14:28:28 +0000 (15:28 +0100)]
Add FactoryGirl
Andy Allan [Wed, 7 Sep 2016 10:08:20 +0000 (11:08 +0100)]
Update offense counts in rubocop_todo.yml
Andy Allan [Wed, 7 Sep 2016 10:07:56 +0000 (11:07 +0100)]
Add xml builder files to rubocop.
Andy Allan [Wed, 7 Sep 2016 10:07:42 +0000 (11:07 +0100)]
Rubocop autofixes.
Andy Allan [Wed, 7 Sep 2016 10:06:27 +0000 (11:06 +0100)]
Add outer variable shadowing to rubocop_todo.yml
Andy Allan [Wed, 7 Sep 2016 10:02:20 +0000 (11:02 +0100)]
Use .present? instead of double negative to check if terms_agreed timestamp is set.
Andy Allan [Wed, 7 Sep 2016 09:59:00 +0000 (10:59 +0100)]
User.consider_pd is boolean, so no need for double negation.
Tom Hughes [Mon, 5 Sep 2016 07:17:03 +0000 (08:17 +0100)]
Update schema
Niklas Laxström [Mon, 5 Sep 2016 05:42:09 +0000 (07:42 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 23 Aug 2016 18:23:58 +0000 (19:23 +0100)]
Set banner expiry correctly
Niklas Laxström [Mon, 22 Aug 2016 05:59:05 +0000 (07:59 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 19 Aug 2016 11:50:44 +0000 (12:50 +0100)]
Fix date for Gravatar migration
Tom Hughes [Fri, 19 Aug 2016 11:31:45 +0000 (12:31 +0100)]
Improve code readability
Tom Hughes [Fri, 19 Aug 2016 11:27:54 +0000 (12:27 +0100)]
Improve message when Gravater is disabled
Tom Hughes [Fri, 19 Aug 2016 11:26:51 +0000 (12:26 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1036'
Simon Poole [Fri, 19 Aug 2016 07:23:31 +0000 (09:23 +0200)]
Fix rubocop warnings
Simon Poole [Fri, 19 Aug 2016 06:59:40 +0000 (08:59 +0200)]
Merge message when Gravatar status has changed with email confirmation
Merge message when Gravatar status has changed with email confirmation and make messages more verbose and friendly.
Niklas Laxström [Thu, 18 Aug 2016 06:20:08 +0000 (08:20 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 17 Aug 2016 09:04:57 +0000 (10:04 +0100)]
Set all cookies on the root path
Tom Hughes [Wed, 17 Aug 2016 09:02:50 +0000 (10:02 +0100)]
Make banner cookies expire after one year
This avoids having lots of cookies stick around forever and
we shouldn't ever have a banner up for that long.
Tom Hughes [Wed, 17 Aug 2016 07:24:28 +0000 (08:24 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1270'
Niklas Laxström [Wed, 17 Aug 2016 06:11:39 +0000 (08:11 +0200)]
Localisation updates from https://translatewiki.net.
Paul Norman [Wed, 17 Aug 2016 00:16:43 +0000 (17:16 -0700)]
Remove references to EWG meetings
Simon Poole [Fri, 26 Feb 2016 10:41:28 +0000 (11:41 +0100)]
Add stupid script to bulk check the gravatar status
Simon Poole [Thu, 25 Feb 2016 23:53:04 +0000 (00:53 +0100)]
Add tests for change of gravatar use depending on email
Simon Poole [Thu, 25 Feb 2016 15:32:14 +0000 (16:32 +0100)]
Support returning a HTTP status code for the http stubs for testing
Simon Poole [Tue, 18 Aug 2015 20:45:16 +0000 (22:45 +0200)]
Remove default enabling of gravatar, check on initial confirmation of e-mail address and on any changes afterward if
a gravatar exists and enable then if the user hasn't uploaded a picture.
Tom Hughes [Tue, 16 Aug 2016 18:27:40 +0000 (19:27 +0100)]
Add test for formatting of multi-value wikidata links
Tom Hughes [Tue, 16 Aug 2016 18:27:14 +0000 (19:27 +0100)]
Fix rubocop warnings
Tom Hughes [Tue, 16 Aug 2016 18:11:35 +0000 (19:11 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/788'
Simon Legner [Mon, 15 Aug 2016 19:58:07 +0000 (20:58 +0100)]
Pan to first Nominatim search result
Fixes #919
Closes #1041
Tom Hughes [Mon, 15 Aug 2016 19:26:51 +0000 (20:26 +0100)]
Add site.key.table.entry.toilets to translations
Tom Hughes [Mon, 15 Aug 2016 19:20:37 +0000 (20:20 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1004'
Tom Hughes [Mon, 15 Aug 2016 11:32:00 +0000 (12:32 +0100)]
Fix html.dir for pl locale
Niklas Laxström [Mon, 15 Aug 2016 06:35:31 +0000 (08:35 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 14 Aug 2016 17:30:13 +0000 (18:30 +0100)]
Reorder auth_success handlers
Only treat auth_success as a possible login attempt if we're not
in the middle of validating a new user, or a change to a user.
Also validate the uniqueness of external auth credentials at the
rails level rather than just at the database level, and make sure
any errors are properly reported.
Fixes #1265
Paul Norman [Sat, 13 Aug 2016 20:56:20 +0000 (13:56 -0700)]
Blacklist all Google imagery with one regex
This expression catches 100% of Google imagery seen in imagery_used
tags with no false positives.
It won't stop someone who tries to load "https://www.google.com/maps" as
imagery, but that will fail to get imagery anyway.
Bilkow [Sat, 13 Aug 2016 05:36:53 +0000 (02:36 -0300)]
INSTALL.md: Added inline code markdown.
Added inline code markdown in MacOSX install instructions, making it look like command line code.
Niklas Laxström [Thu, 11 Aug 2016 07:20:25 +0000 (09:20 +0200)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 8 Aug 2016 06:36:24 +0000 (08:36 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 5 Aug 2016 17:35:27 +0000 (18:35 +0100)]
Correct icon mappings for non OSRM routers
Patrick Niklaus [Sun, 12 Jun 2016 22:23:41 +0000 (00:23 +0200)]
Add support for OSRM 5.0 API and new instruction types
Add support for the new API in OSRM 5.x including new icon sprites
for the new instruction types.
Niklas Laxström [Thu, 4 Aug 2016 06:24:26 +0000 (08:24 +0200)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 1 Aug 2016 06:36:35 +0000 (08:36 +0200)]
Localisation updates from https://translatewiki.net.
Eugene Alvin Villar [Sun, 31 Jul 2016 09:08:30 +0000 (10:08 +0100)]
Add State of the Map Asia 2016
Niklas Laxström [Thu, 28 Jul 2016 06:25:59 +0000 (08:25 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 27 Jul 2016 19:51:32 +0000 (20:51 +0100)]
Link all objects into libpgosm.so
Tom Hughes [Wed, 27 Jul 2016 19:44:16 +0000 (20:44 +0100)]
Allow multiple versions of DB functions to be built
Allows the pg_config location to be configured, along with
the target directory for the built code.
Tom Hughes [Tue, 26 Jul 2016 17:36:56 +0000 (18:36 +0100)]
Revert "Don't pass the locale to the Mapzen routing engine"
This reverts commit
38180c56c9be9d99406c9088b60f5912c2648a04 .
Niklas Laxström [Mon, 25 Jul 2016 06:22:25 +0000 (08:22 +0200)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 21 Jul 2016 06:24:12 +0000 (08:24 +0200)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 18 Jul 2016 07:14:04 +0000 (09:14 +0200)]
Localisation updates from https://translatewiki.net.