]> git.openstreetmap.org Git - rails.git/log
rails.git
6 years agoFix some reporting links.
Andy Allan [Wed, 13 Dec 2017 16:35:14 +0000 (16:35 +0000)]
Fix some reporting links.

6 years agoRemove unused update method from issues_controller.
Andy Allan [Wed, 13 Dec 2017 16:28:15 +0000 (16:28 +0000)]
Remove unused update method from issues_controller.

6 years agoRevert en-GB.yml to master.
Andy Allan [Wed, 13 Dec 2017 16:21:26 +0000 (16:21 +0000)]
Revert en-GB.yml to master.

Only en.yml should be changed in pull requests, en-GB.yml is taken
care of through Translatewiki

6 years agoRemove new issue notifications for now
Andy Allan [Wed, 13 Dec 2017 16:19:58 +0000 (16:19 +0000)]
Remove new issue notifications for now

This can be re-implemented later.

6 years agoRemove a couple of unused style rules.
Andy Allan [Wed, 13 Dec 2017 16:15:40 +0000 (16:15 +0000)]
Remove a couple of unused style rules.

6 years agoStore the report category.
Andy Allan [Wed, 13 Dec 2017 16:02:55 +0000 (16:02 +0000)]
Store the report category.

6 years agoShow issues based on all the users roles
Andy Allan [Wed, 6 Dec 2017 18:56:27 +0000 (18:56 +0000)]
Show issues based on all the users roles

Previously you were prevented from seeing moderator issues if you
were also an administrator.

6 years agoRe-enable issue reassigning.
Andy Allan [Wed, 6 Dec 2017 18:01:51 +0000 (18:01 +0000)]
Re-enable issue reassigning.

6 years agoValidate the assigned role, and remove the :type activrecord enum
Andy Allan [Wed, 6 Dec 2017 17:00:35 +0000 (17:00 +0000)]
Validate the assigned role, and remove the :type activrecord enum

6 years agoRename 'issue_type' to 'assigned_role', set defaults in the model and test.
Andy Allan [Wed, 6 Dec 2017 16:28:13 +0000 (16:28 +0000)]
Rename 'issue_type' to 'assigned_role', set defaults in the model and test.

6 years agoRemove the hardcoded pixel width for columns.
Andy Allan [Wed, 6 Dec 2017 15:26:40 +0000 (15:26 +0000)]
Remove the hardcoded pixel width for columns.

6 years agoConvert issue search tests to system tests
Andy Allan [Wed, 29 Nov 2017 18:58:51 +0000 (18:58 +0000)]
Convert issue search tests to system tests

6 years agoRemove the test around missing report_type, since we're not currently requiring that.
Andy Allan [Wed, 29 Nov 2017 18:04:31 +0000 (18:04 +0000)]
Remove the test around missing report_type, since we're not currently requiring that.

6 years agoPut the expected value first in assert_equal
Andy Allan [Wed, 29 Nov 2017 18:02:26 +0000 (18:02 +0000)]
Put the expected value first in assert_equal

6 years agoMove controller tests for new reports into seperate file, and adapt to new form struc...
Andy Allan [Wed, 29 Nov 2017 17:59:42 +0000 (17:59 +0000)]
Move controller tests for new reports into seperate file, and adapt to new form structure.

6 years agoIndex page no longer redirects when there's no issues.
Andy Allan [Wed, 29 Nov 2017 17:37:29 +0000 (17:37 +0000)]
Index page no longer redirects when there's no issues.

6 years agoMove and amend the issue comment controller tests.
Andy Allan [Wed, 29 Nov 2017 17:28:37 +0000 (17:28 +0000)]
Move and amend the issue comment controller tests.

6 years agoRemove column sorting
Andy Allan [Wed, 29 Nov 2017 17:18:05 +0000 (17:18 +0000)]
Remove column sorting

It's not tested, not working, and so it can come later in a separate PR.

6 years agoRubocop fixes.
Andy Allan [Wed, 29 Nov 2017 16:48:01 +0000 (16:48 +0000)]
Rubocop fixes.

6 years agoRemove the reassign boolean display
Andy Allan [Wed, 29 Nov 2017 16:47:36 +0000 (16:47 +0000)]
Remove the reassign boolean display

6 years agoUse a simple user_id for tables with one owning user
Andy Allan [Wed, 29 Nov 2017 16:23:13 +0000 (16:23 +0000)]
Use a simple user_id for tables with one owning user

This is the standard way of naming in rails, and it avoids having
to tell rails which models are actually required.

6 years agoCombine migrations into one
Andy Allan [Wed, 29 Nov 2017 16:12:38 +0000 (16:12 +0000)]
Combine migrations into one

This makes it easier to review, rather than having a PR with migrations that
correct each other.

6 years agoRemove the reassign column from issue_comments
Andy Allan [Wed, 29 Nov 2017 16:05:12 +0000 (16:05 +0000)]
Remove the reassign column from issue_comments

Reassigning is an effect of a controller action, not something that
should be stored in the database like this.

6 years agoAdjust for rails5 convention on migrations.
Andy Allan [Wed, 29 Nov 2017 16:03:27 +0000 (16:03 +0000)]
Adjust for rails5 convention on migrations.

6 years agoAnnotate models.
Andy Allan [Wed, 29 Nov 2017 12:34:04 +0000 (12:34 +0000)]
Annotate models.

6 years agoRefactor factories to use FactoryBot
Andy Allan [Wed, 29 Nov 2017 12:33:23 +0000 (12:33 +0000)]
Refactor factories to use FactoryBot

6 years agoRemove minitest-rails-capybara and convert feature tests to system tests
Andy Allan [Wed, 29 Nov 2017 12:33:03 +0000 (12:33 +0000)]
Remove minitest-rails-capybara and convert feature tests to system tests

6 years agoMerge branch 'master' into moderation
Andy Allan [Wed, 29 Nov 2017 12:18:39 +0000 (12:18 +0000)]
Merge branch 'master' into moderation

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 27 Nov 2017 07:12:19 +0000 (08:12 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoExtend form-action policies for Chrome
Tom Hughes [Sat, 25 Nov 2017 12:04:02 +0000 (12:04 +0000)]
Extend form-action policies for Chrome

It seems that unlike other browsers Chrome requires that if a form
submission redirects that the redirected URL also match the form-action
policy rather than just requiring the original URL to match.

7 years agoRemove inline javascript from user settings page
Tom Hughes [Fri, 24 Nov 2017 16:20:50 +0000 (16:20 +0000)]
Remove inline javascript from user settings page

7 years agoAllow iD to fetch gpx files from arbitrary locations
Tom Hughes [Fri, 24 Nov 2017 08:38:51 +0000 (08:38 +0000)]
Allow iD to fetch gpx files from arbitrary locations

7 years agoFix security policy for mapillary in iD
Tom Hughes [Fri, 24 Nov 2017 01:09:27 +0000 (01:09 +0000)]
Fix security policy for mapillary in iD

7 years agoFix remote editing security policy
Tom Hughes [Fri, 24 Nov 2017 00:46:27 +0000 (00:46 +0000)]
Fix remote editing security policy

7 years agoAdd security policy for remote control editing
Tom Hughes [Fri, 24 Nov 2017 00:43:14 +0000 (00:43 +0000)]
Add security policy for remote control editing

7 years agoAllow iD to connect to nominatim
Tom Hughes [Fri, 24 Nov 2017 00:10:38 +0000 (00:10 +0000)]
Allow iD to connect to nominatim

7 years agoAllow third party images in user content
Tom Hughes [Thu, 23 Nov 2017 22:39:05 +0000 (22:39 +0000)]
Allow third party images in user content

7 years agoAllow images to be loaded from piwik
Tom Hughes [Thu, 23 Nov 2017 22:22:01 +0000 (22:22 +0000)]
Allow images to be loaded from piwik

7 years agoMerge remote-tracking branch 'upstream/pull/1687'
Tom Hughes [Thu, 23 Nov 2017 13:24:47 +0000 (13:24 +0000)]
Merge remote-tracking branch 'upstream/pull/1687'

7 years agoUpdate CONTRIBUTING to remove reference to cruise and use link to Travis
Andy Allan [Thu, 23 Nov 2017 11:31:15 +0000 (11:31 +0000)]
Update CONTRIBUTING to remove reference to cruise and use link to Travis

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 23 Nov 2017 06:48:25 +0000 (07:48 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoAdd the OpenStreetMap Blog to the list of community links
Andy Allan [Wed, 22 Nov 2017 15:51:32 +0000 (15:51 +0000)]
Add the OpenStreetMap Blog to the list of community links

Although the content is currently duplicated into the blog aggregator,
it's still worth having an explicit link, and making it the first one,
since it contains entries of more significant interest to the community.

7 years agoPut specific page titles at the start
Andy Allan [Wed, 22 Nov 2017 14:57:26 +0000 (14:57 +0000)]
Put specific page titles at the start

The makes the shortened titles commonly shown on browser tabs more
useful.

7 years agoMerge branch 'pull/843' into titles
Andy Allan [Wed, 22 Nov 2017 14:42:16 +0000 (14:42 +0000)]
Merge branch 'pull/843' into titles

7 years agoMerge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p
Andy Allan [Wed, 22 Nov 2017 10:47:18 +0000 (10:47 +0000)]
Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p

Refs #139

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 20 Nov 2017 08:29:08 +0000 (09:29 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoMake context menu use from/to for directions
Tom Hughes [Sun, 19 Nov 2017 19:49:39 +0000 (19:49 +0000)]
Make context menu use from/to for directions

This ensures that the router will try to geocode the values rather
than assuming that they are latitude/longitude pairs.

Fixes #1684

7 years agoAdd openstreetcam.org to security policy for iD
Tom Hughes [Thu, 16 Nov 2017 10:17:22 +0000 (10:17 +0000)]
Add openstreetcam.org to security policy for iD

7 years agoMerge remote-tracking branch 'upstream/pull/1682'
Tom Hughes [Thu, 16 Nov 2017 10:17:06 +0000 (10:17 +0000)]
Merge remote-tracking branch 'upstream/pull/1682'

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 16 Nov 2017 10:10:07 +0000 (11:10 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoUpdate to iD v2.5.1
Bryan Housel [Thu, 16 Nov 2017 05:50:21 +0000 (00:50 -0500)]
Update to iD v2.5.1

7 years agoMake system tests run by default
Tom Hughes [Wed, 15 Nov 2017 13:01:38 +0000 (13:01 +0000)]
Make system tests run by default

7 years agoAdd framework for system tests
Tom Hughes [Sun, 29 Oct 2017 20:58:23 +0000 (20:58 +0000)]
Add framework for system tests

7 years agoMerge branch 'wheres_this' of https://github.com/pnorman/openstreetmap-website into...
Andy Allan [Wed, 15 Nov 2017 18:24:14 +0000 (18:24 +0000)]
Merge branch 'wheres_this' of https://github.com/pnorman/openstreetmap-website into pnorman-wheres_this

Fixes #412

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 13 Nov 2017 08:26:31 +0000 (09:26 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoAdd iD disable_features parameter
Bryan Housel [Fri, 10 Nov 2017 20:57:37 +0000 (15:57 -0500)]
Add iD disable_features parameter

7 years agoUpdate to iD v2.5.0
Bryan Housel [Fri, 10 Nov 2017 20:55:11 +0000 (15:55 -0500)]
Update to iD v2.5.0

7 years agoRemove link to wiki legal FAQ as confusing and unmaintained
Simon Poole [Fri, 10 Nov 2017 10:13:03 +0000 (11:13 +0100)]
Remove link to wiki legal FAQ as confusing and unmaintained

7 years agoDisable keyboard controls for layer switcher maps
Tom Hughes [Thu, 9 Nov 2017 14:29:17 +0000 (14:29 +0000)]
Disable keyboard controls for layer switcher maps

Fixes #1673

7 years agoMerge remote-tracking branch 'upstream/pull/1668'
Tom Hughes [Thu, 9 Nov 2017 09:45:17 +0000 (09:45 +0000)]
Merge remote-tracking branch 'upstream/pull/1668'

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 Nov 2017 07:24:10 +0000 (08:24 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Nov 2017 08:17:04 +0000 (09:17 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoUpdate site to use jQuery 3
Tom Hughes [Fri, 3 Nov 2017 20:40:48 +0000 (20:40 +0000)]
Update site to use jQuery 3

7 years agoWhen no cache store is set use cookie storage for sessions
Drew Dara-Abrams [Thu, 2 Nov 2017 00:07:29 +0000 (17:07 -0700)]
When no cache store is set use cookie storage for sessions

A change in the default configuration of development environments
in rails 5.1 means that caching is now disabled by default so in
that case fall back to using cookies instead.

Closes #1666

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Nov 2017 07:26:40 +0000 (08:26 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoChange wording for hosting partners
JamesKingdom [Wed, 1 Nov 2017 20:39:36 +0000 (20:39 +0000)]
Change wording for hosting partners

7 years agoRelax cookie security policy
Tom Hughes [Wed, 1 Nov 2017 17:44:22 +0000 (17:44 +0000)]
Relax cookie security policy

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 30 Oct 2017 08:19:18 +0000 (09:19 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoFix rubocop warnings
Tom Hughes [Sun, 29 Oct 2017 19:43:02 +0000 (19:43 +0000)]
Fix rubocop warnings

7 years agoUpdate bundle
Tom Hughes [Sun, 29 Oct 2017 19:35:26 +0000 (19:35 +0000)]
Update bundle

7 years agoReplace factory_girl with factory_bot
Tom Hughes [Sun, 29 Oct 2017 19:29:30 +0000 (19:29 +0000)]
Replace factory_girl with factory_bot

7 years agoAvoid using rinku's auto_link helper
Tom Hughes [Fri, 27 Oct 2017 18:45:32 +0000 (19:45 +0100)]
Avoid using rinku's auto_link helper

It's currently broken (https://github.com/vmg/rinku/issues/70) and
in case our own linkify has some additional customisations.

7 years agoUpdate for ActionView::Template::Error change
Tom Hughes [Fri, 27 Oct 2017 18:21:19 +0000 (19:21 +0100)]
Update for ActionView::Template::Error change

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 27 Oct 2017 03:06:42 +0000 (05:06 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoConvert session timeout to seconds when it is set
Tom Hughes [Wed, 25 Oct 2017 07:59:29 +0000 (08:59 +0100)]
Convert session timeout to seconds when it is set

This avoids problems if the rails Duration class changes
representation between different versions of rails.

7 years agoMerge remote-tracking branch 'upstream/pull/1652'
Tom Hughes [Wed, 25 Oct 2017 07:16:33 +0000 (08:16 +0100)]
Merge remote-tracking branch 'upstream/pull/1652'

7 years agoMerge remote-tracking branch 'upstream/pull/1659'
Tom Hughes [Tue, 24 Oct 2017 19:19:46 +0000 (20:19 +0100)]
Merge remote-tracking branch 'upstream/pull/1659'

7 years agoMerge remote-tracking branch 'upstream/pull/1658'
Tom Hughes [Tue, 24 Oct 2017 18:41:46 +0000 (19:41 +0100)]
Merge remote-tracking branch 'upstream/pull/1658'

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Oct 2017 03:15:48 +0000 (05:15 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoRubocop fixes
Andy Allan [Sun, 22 Oct 2017 21:35:34 +0000 (22:35 +0100)]
Rubocop fixes

7 years agoAdd annotate gem and associated rake task. Annotate models.
Andy Allan [Sun, 22 Oct 2017 21:18:26 +0000 (22:18 +0100)]
Add annotate gem and associated rake task. Annotate models.

7 years agoAvoid using or comparing explicit model ids
Andy Allan [Sun, 22 Oct 2017 20:58:09 +0000 (21:58 +0100)]
Avoid using or comparing explicit model ids

The code is easier to read using higher-level concepts.

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Oct 2017 07:17:15 +0000 (09:17 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoRemoves DOM difference in location button (main map)
Holger Jeromin [Wed, 18 Oct 2017 17:51:05 +0000 (19:51 +0200)]
Removes DOM difference in location button (main map)

7 years agoRemoves DOM difference in location button
Holger Jeromin [Wed, 18 Oct 2017 13:05:11 +0000 (15:05 +0200)]
Removes DOM difference in location button

7 years agoAdd rails version number to migrations
Tom Hughes [Mon, 9 Oct 2017 20:08:53 +0000 (21:08 +0100)]
Add rails version number to migrations

7 years agoUpdate to rails 5.1.4
Tom Hughes [Mon, 9 Oct 2017 20:03:46 +0000 (21:03 +0100)]
Update to rails 5.1.4

7 years agoMerge remote-tracking branch 'upstream/pull/1651'
Tom Hughes [Mon, 16 Oct 2017 18:08:37 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/1651'

7 years agoMerge remote-tracking branch 'upstream/pull/1580'
Tom Hughes [Mon, 16 Oct 2017 18:08:32 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/1580'

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 Oct 2017 08:49:29 +0000 (10:49 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoAdd banner for OSMF Membership Drive
Bryan Housel [Mon, 16 Oct 2017 05:07:07 +0000 (01:07 -0400)]
Add banner for OSMF Membership Drive

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Oct 2017 06:51:51 +0000 (08:51 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoUpdate to iD v2.4.3
Bryan Housel [Mon, 9 Oct 2017 22:08:24 +0000 (18:08 -0400)]
Update to iD v2.4.3

7 years agoUse send_data for GPX traces intead of monkey patching send_file
Tom Hughes [Mon, 9 Oct 2017 19:38:08 +0000 (20:38 +0100)]
Use send_data for GPX traces intead of monkey patching send_file

7 years agoImprove user_image_url test
Tom Hughes [Mon, 9 Oct 2017 18:10:32 +0000 (19:10 +0100)]
Improve user_image_url test

Use a user that actually has an image and updated the expect
output to match that.

7 years agoRemove reference to large screen stylesheet
Tom Hughes [Mon, 9 Oct 2017 12:47:48 +0000 (13:47 +0100)]
Remove reference to large screen stylesheet

The separate large screen stylesheet was removed in 4dceacdeb but
we are still referencing it on Internet Explorer.

7 years agoFix typo that means fe0f4543c1 has never worked
Tom Hughes [Mon, 9 Oct 2017 07:39:14 +0000 (08:39 +0100)]
Fix typo that means fe0f4543c1 has never worked

7 years agoUpdate to iD v2.4.2
Bryan Housel [Mon, 9 Oct 2017 02:32:32 +0000 (22:32 -0400)]
Update to iD v2.4.2

7 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Oct 2017 06:41:47 +0000 (08:41 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoUse Hash#dig to simplify code
Tom Hughes [Thu, 5 Oct 2017 19:22:24 +0000 (20:22 +0100)]
Use Hash#dig to simplify code