]> git.openstreetmap.org Git - rails.git/log
rails.git
6 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 4 May 2017 05:57:14 +0000 (07:57 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Tue, 2 May 2017 06:08:50 +0000 (08:08 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoUse POST when editing GPX trace details
Tom Hughes [Mon, 1 May 2017 15:51:09 +0000 (16:51 +0100)]
Use POST when editing GPX trace details

Fixes #1533

6 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 27 Apr 2017 06:25:14 +0000 (08:25 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoRefactor remaining way_controller tests to use factories.
Andy Allan [Wed, 26 Apr 2017 07:01:48 +0000 (09:01 +0200)]
Refactor remaining way_controller tests to use factories.

6 years agoRefactor more way_controller tests to use factories.
Andy Allan [Wed, 26 Apr 2017 06:50:39 +0000 (08:50 +0200)]
Refactor more way_controller tests to use factories.

6 years agoAdd a way_with_nodes factory, and use it in the way_controller tests.
Andy Allan [Wed, 26 Apr 2017 06:34:01 +0000 (08:34 +0200)]
Add a way_with_nodes factory, and use it in the way_controller tests.

6 years agoRefactor deletion tests in way_controller_test to use factories.
Andy Allan [Wed, 26 Apr 2017 06:33:29 +0000 (08:33 +0200)]
Refactor deletion tests in way_controller_test to use factories.

6 years agoRefactor some way_controller tests to use factories.
Andy Allan [Tue, 25 Apr 2017 16:42:59 +0000 (18:42 +0200)]
Refactor some way_controller tests to use factories.

6 years agoRefactor some amf_controller tests to use factories.
Andy Allan [Tue, 25 Apr 2017 15:47:28 +0000 (17:47 +0200)]
Refactor some amf_controller tests to use factories.

6 years agoUse factories for all factory associations.
Andy Allan [Tue, 25 Apr 2017 14:52:29 +0000 (16:52 +0200)]
Use factories for all factory associations.

6 years agoCreate an old_way_node factory, and start using it for tests.
Andy Allan [Tue, 25 Apr 2017 14:24:21 +0000 (16:24 +0200)]
Create an old_way_node factory, and start using it for tests.

6 years agoCreate an old_way factory, and start using it for tests.
Andy Allan [Tue, 25 Apr 2017 13:53:52 +0000 (15:53 +0200)]
Create an old_way factory, and start using it for tests.

6 years agoCreate an old_relation_member factory, and start using it for tests.
Andy Allan [Tue, 25 Apr 2017 13:42:30 +0000 (15:42 +0200)]
Create an old_relation_member factory, and start using it for tests.

6 years agoCreate an old_relation factory, and start using it for tests.
Andy Allan [Tue, 25 Apr 2017 13:19:25 +0000 (15:19 +0200)]
Create an old_relation factory, and start using it for tests.

6 years agoMerge remote-tracking branch 'openstreetmap/pull/1527'
Tom Hughes [Mon, 24 Apr 2017 20:05:23 +0000 (21:05 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1527'

6 years agoMove list of containing relations to top of browse views
daganzdaanda [Mon, 24 Apr 2017 19:23:46 +0000 (20:23 +0100)]
Move list of containing relations to top of browse views

Moves the list of containing relations to above the list of
members for ways and relations - nodes have no equivalent list
so no change is needed there.

Fixes #794
Closes #1501

6 years agoConvert the node_controller update tests to use factories.
Andy Allan [Mon, 24 Apr 2017 18:42:08 +0000 (20:42 +0200)]
Convert the node_controller update tests to use factories.

6 years agoConvert the duplicate_tags node controller test to use factories.
Andy Allan [Mon, 24 Apr 2017 18:41:43 +0000 (20:41 +0200)]
Convert the duplicate_tags node controller test to use factories.

6 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 24 Apr 2017 17:59:18 +0000 (19:59 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoCredit the whole of UCL, rather than just the Bartlett / VR centre.
Matt Amos [Sat, 22 Apr 2017 10:47:12 +0000 (11:47 +0100)]
Credit the whole of UCL, rather than just the Bartlett / VR centre.

6 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 20 Apr 2017 05:41:04 +0000 (07:41 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 17 Apr 2017 07:41:24 +0000 (09:41 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoUpdate Potlatch 2 to 2.5-7-gbd74430 build
Tom Hughes [Thu, 13 Apr 2017 17:41:58 +0000 (18:41 +0100)]
Update Potlatch 2 to 2.5-7-gbd74430 build

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 10 Apr 2017 05:27:21 +0000 (07:27 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1510'
Tom Hughes [Sat, 8 Apr 2017 15:36:48 +0000 (16:36 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1510'

7 years agoFix indentation in email template
Herve Saint-Amand [Fri, 31 Mar 2017 20:16:29 +0000 (20:16 +0000)]
Fix indentation in email template

The plain text templates had nice indentation in the source however that
got reflected in the output, which was visibly and needlessly indented.

Closes #1512

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 6 Apr 2017 05:25:43 +0000 (07:25 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoUse node and relation_member factories for testing containing_relations and containin...
Andy Allan [Wed, 5 Apr 2017 10:33:33 +0000 (11:33 +0100)]
Use node and relation_member factories for testing containing_relations and containing_relation_members

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 3 Apr 2017 05:38:26 +0000 (07:38 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoConvert more node fixtures to factories
Andy Allan [Fri, 31 Mar 2017 09:51:18 +0000 (10:51 +0100)]
Convert more node fixtures to factories

7 years agoAdd the closed trait to changeset factories.
Andy Allan [Fri, 31 Mar 2017 09:47:28 +0000 (10:47 +0100)]
Add the closed trait to changeset factories.

7 years agoAdd factories for relations, relation_members, ways and way_nodes
Andy Allan [Fri, 31 Mar 2017 09:40:49 +0000 (10:40 +0100)]
Add factories for relations, relation_members, ways and way_nodes

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1508'
Tom Hughes [Thu, 30 Mar 2017 14:45:37 +0000 (15:45 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1508'

7 years agoUpdate mapzen directions credit link
Andy Allan [Thu, 30 Mar 2017 14:18:16 +0000 (15:18 +0100)]
Update mapzen directions credit link

Rather than pointing at a redirect, point at the target of the
redirect. Refs #1388

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1507'
Tom Hughes [Thu, 30 Mar 2017 14:18:14 +0000 (15:18 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1507'

7 years agoFix tests that referred to node lat and lons
Andy Allan [Thu, 30 Mar 2017 14:13:22 +0000 (15:13 +0100)]
Fix tests that referred to node lat and lons

7 years agoFormat latitudes and longitudes as %7f in XML output
Andy Allan [Thu, 30 Mar 2017 13:30:54 +0000 (14:30 +0100)]
Format latitudes and longitudes as %7f in XML output

This matches the double formatting in XML from cgimap. Fixes #341.

7 years agoUse node factories for browse_controller tests.
Andy Allan [Thu, 30 Mar 2017 12:57:30 +0000 (13:57 +0100)]
Use node factories for browse_controller tests.

7 years agoFor deleted nodes created via factories, make sure the most recent old_node is also...
Andy Allan [Thu, 30 Mar 2017 12:57:07 +0000 (13:57 +0100)]
For deleted nodes created via factories, make sure the most recent old_node is also deleted

7 years agoUse factories for nodes in browse_helper tests.
Andy Allan [Thu, 30 Mar 2017 12:19:15 +0000 (13:19 +0100)]
Use factories for nodes in browse_helper tests.

7 years agoAdd a with_history trait for node factories, to automatically create corresponding...
Andy Allan [Thu, 30 Mar 2017 08:31:22 +0000 (09:31 +0100)]
Add a with_history trait for node factories, to automatically create corresponding old_nodes

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 30 Mar 2017 05:57:50 +0000 (07:57 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 27 Mar 2017 06:27:45 +0000 (08:27 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoFix typo
John Daly [Sun, 26 Mar 2017 20:27:53 +0000 (21:27 +0100)]
Fix typo

Closes #1502

7 years agoUpdate Potlatch 2 to 2.5 build
Tom Hughes [Fri, 24 Mar 2017 19:31:44 +0000 (19:31 +0000)]
Update Potlatch 2 to 2.5 build

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 23 Mar 2017 07:44:53 +0000 (08:44 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoAdd explicit tests for lat/lon methods on node models
Tom Hughes [Wed, 22 Mar 2017 20:43:39 +0000 (20:43 +0000)]
Add explicit tests for lat/lon methods on node models

7 years agoUse changeset factory for association in node factory
Tom Hughes [Wed, 22 Mar 2017 20:31:25 +0000 (20:31 +0000)]
Use changeset factory for association in node factory

7 years agoSet canonical port based on protocol
Tom Hughes [Wed, 22 Mar 2017 19:28:57 +0000 (19:28 +0000)]
Set canonical port based on protocol

7 years agoRemove various osm.org email addresses from example configuration
Tom Hughes [Wed, 22 Mar 2017 19:25:47 +0000 (19:25 +0000)]
Remove various osm.org email addresses from example configuration

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1496'
Tom Hughes [Wed, 22 Mar 2017 19:19:59 +0000 (19:19 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1496'

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1495'
Tom Hughes [Wed, 22 Mar 2017 19:11:04 +0000 (19:11 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1495'

7 years agoMake the publisher URL configurable, with no default
Tom Hughes [Wed, 22 Mar 2017 18:42:58 +0000 (18:42 +0000)]
Make the publisher URL configurable, with no default

7 years agoAdd server_protocol configuration option
Tom Hughes [Wed, 22 Mar 2017 18:22:24 +0000 (18:22 +0000)]
Add server_protocol configuration option

7 years agoUse node and old_node factories for redaction model tests.
Andy Allan [Wed, 22 Mar 2017 18:19:16 +0000 (18:19 +0000)]
Use node and old_node factories for redaction model tests.

7 years agoUse canonical-rails gem to generate canonical URLs
Tom Hughes [Wed, 22 Mar 2017 18:16:53 +0000 (18:16 +0000)]
Use canonical-rails gem to generate canonical URLs

7 years agoCreate a node factory, and use it for most node model tests
Andy Allan [Wed, 22 Mar 2017 17:50:10 +0000 (17:50 +0000)]
Create a node factory, and use it for most node model tests

7 years agoSet server_url in the test environment
Tom Hughes [Wed, 22 Mar 2017 17:24:28 +0000 (17:24 +0000)]
Set server_url in the test environment

7 years agoComment out server_url in the default configuration
Tom Hughes [Wed, 22 Mar 2017 17:19:08 +0000 (17:19 +0000)]
Comment out server_url in the default configuration

7 years agoAdd a canonical URL to the head
Tom Hughes [Wed, 22 Mar 2017 17:14:55 +0000 (17:14 +0000)]
Add a canonical URL to the head

7 years agoUse old_node factory for OldNode model tests.
Andy Allan [Wed, 22 Mar 2017 17:10:48 +0000 (17:10 +0000)]
Use old_node factory for OldNode model tests.

The valid/invalid tests were simplified, since there is little to be
gained from inserting (invalid) nodes into the database and comparing
the node with another copy of itself.

7 years agoRework the changeset helper tests to use factories.
Andy Allan [Wed, 22 Mar 2017 11:42:29 +0000 (11:42 +0000)]
Rework the changeset helper tests to use factories.

7 years agoUse changeset factory for factory associations
Andy Allan [Wed, 22 Mar 2017 11:09:52 +0000 (11:09 +0000)]
Use changeset factory for factory associations

One test needed updating since it assumed the comments were being
created on a particular changeset.

7 years agoCreate a changeset factory, and use it for model tests.
Andy Allan [Wed, 22 Mar 2017 10:47:24 +0000 (10:47 +0000)]
Create a changeset factory, and use it for model tests.

7 years agoRemove the api_fixtures call from changeset model tests, since they do not need the...
Andy Allan [Wed, 22 Mar 2017 10:40:13 +0000 (10:40 +0000)]
Remove the api_fixtures call from changeset model tests, since they do not need the fixtures.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 20 Mar 2017 06:38:24 +0000 (07:38 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1492'
Tom Hughes [Thu, 16 Mar 2017 19:02:35 +0000 (19:02 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1492'

7 years agoRemove the link between the redaction owner and the user doing the redaction in tests.
Andy Allan [Thu, 16 Mar 2017 10:21:25 +0000 (10:21 +0000)]
Remove the link between the redaction owner and the user doing the redaction in tests.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 16 Mar 2017 07:18:33 +0000 (08:18 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoUse redactions factory for old_way controller tests
Andy Allan [Wed, 15 Mar 2017 18:04:58 +0000 (18:04 +0000)]
Use redactions factory for old_way controller tests

7 years agoAdjust rubocop threshold
Tom Hughes [Wed, 15 Mar 2017 17:57:46 +0000 (17:57 +0000)]
Adjust rubocop threshold

7 years agoUse redactions factory for old_node controller tests.
Andy Allan [Wed, 15 Mar 2017 17:50:57 +0000 (17:50 +0000)]
Use redactions factory for old_node controller tests.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1491'
Tom Hughes [Wed, 15 Mar 2017 17:37:13 +0000 (17:37 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1491'

7 years agoUse redaction factory for old_relation controller tests.
Andy Allan [Wed, 15 Mar 2017 17:13:47 +0000 (17:13 +0000)]
Use redaction factory for old_relation controller tests.

7 years agoFix typos in assertion messages.
Andy Allan [Wed, 15 Mar 2017 17:06:29 +0000 (17:06 +0000)]
Fix typos in assertion messages.

7 years agoUse redactions factory in redaction controller test.
Andy Allan [Wed, 15 Mar 2017 17:01:41 +0000 (17:01 +0000)]
Use redactions factory in redaction controller test.

7 years agoCreate a redactions factory and use for model tests.
Andy Allan [Wed, 15 Mar 2017 16:24:39 +0000 (16:24 +0000)]
Create a redactions factory and use for model tests.

7 years agoRefactor the oauth integration test to avoid using user fixtures.
Andy Allan [Wed, 15 Mar 2017 16:13:04 +0000 (16:13 +0000)]
Refactor the oauth integration test to avoid using user fixtures.

7 years agoUse user factory for user_terms_seen integration test.
Andy Allan [Wed, 15 Mar 2017 15:53:47 +0000 (15:53 +0000)]
Use user factory for user_terms_seen integration test.

7 years agoUse user factories for some changeset_controller tests.
Andy Allan [Wed, 15 Mar 2017 15:41:42 +0000 (15:41 +0000)]
Use user factories for some changeset_controller tests.

Others are tightly interwoven with the fixtures and will be tackled seperately.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1488'
Tom Hughes [Wed, 15 Mar 2017 14:22:59 +0000 (14:22 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1488'

7 years agoUse a pending user for testing password resets.
Andy Allan [Wed, 15 Mar 2017 14:22:04 +0000 (14:22 +0000)]
Use a pending user for testing password resets.

7 years agoUse users factory for user_controller tests.
Andy Allan [Wed, 15 Mar 2017 11:56:36 +0000 (11:56 +0000)]
Use users factory for user_controller tests.

7 years agoThrow an exception if adding a note comment fails
Tom Hughes [Mon, 13 Mar 2017 14:49:16 +0000 (14:49 +0000)]
Throw an exception if adding a note comment fails

7 years agoMake search use HTTPS automatically
Christian Stadelmann [Sun, 22 Mar 2015 19:26:33 +0000 (20:26 +0100)]
Make search use HTTPS automatically

Currently users end up having a HTTP search function even if they
install it to their browsers from the HTTPS site. This is a unexpected
reduction in privacy.

Since search requests are private data they should be sent via HTTPS.

Closes #936

7 years agoBuild pending users via factory
Andy Allan [Mon, 13 Mar 2017 10:20:06 +0000 (10:20 +0000)]
Build pending users via factory

7 years agoReturn maximum size of bounding box for note retrieval
Simon Poole [Mon, 13 Mar 2017 07:47:01 +0000 (08:47 +0100)]
Return maximum size of bounding box for note retrieval

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 13 Mar 2017 07:21:19 +0000 (08:21 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoImprove styling of flash messages on the front page
Tom Hughes [Fri, 10 Mar 2017 16:46:29 +0000 (16:46 +0000)]
Improve styling of flash messages on the front page

7 years agoShow offline/readonly messages as normal flash messages
Tom Hughes [Fri, 10 Mar 2017 16:30:04 +0000 (16:30 +0000)]
Show offline/readonly messages as normal flash messages

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1484'
Tom Hughes [Fri, 10 Mar 2017 15:58:57 +0000 (15:58 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1484'

7 years agoAdd some whitespace
Tom Hughes [Fri, 10 Mar 2017 15:34:34 +0000 (15:34 +0000)]
Add some whitespace

7 years agoUse user factories for user_login integration tests.
Andy Allan [Fri, 10 Mar 2017 14:44:22 +0000 (14:44 +0000)]
Use user factories for user_login integration tests.

The display_name logins were reworked to use downcase since the
factories supply users with an already-title-cased display_name.

The tests were also renamed to align better with the purpose of the
test rather than the name of the fixture used.

7 years agoUse user factories for page_locale integration tests.
Andy Allan [Fri, 10 Mar 2017 14:53:19 +0000 (14:53 +0000)]
Use user factories for page_locale integration tests.

7 years agoUse user factories for user_block integration tests.
Andy Allan [Fri, 10 Mar 2017 14:48:29 +0000 (14:48 +0000)]
Use user factories for user_block integration tests.

7 years agoUse user factories for user_roles integration tests.
Andy Allan [Fri, 10 Mar 2017 11:02:40 +0000 (11:02 +0000)]
Use user factories for user_roles integration tests.

7 years agoUse user factory for user_creation test.
Andy Allan [Fri, 10 Mar 2017 10:57:46 +0000 (10:57 +0000)]
Use user factory for user_creation test.

7 years agoUse user factory for application_helper tests.
Andy Allan [Fri, 10 Mar 2017 10:53:00 +0000 (10:53 +0000)]
Use user factory for application_helper tests.

7 years agoUse user factory for note_helper tests.
Andy Allan [Fri, 10 Mar 2017 10:33:28 +0000 (10:33 +0000)]
Use user factory for note_helper tests.