]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Wed, 29 Nov 2017 12:18:39 +0000 (12:18 +0000)]
Merge branch 'master' into moderation
translatewiki.net [Mon, 27 Nov 2017 07:12:19 +0000 (08:12 +0100)]
Localisation updates from https://translatewiki.net.
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.
Tom Hughes [Fri, 24 Nov 2017 16:20:50 +0000 (16:20 +0000)]
Remove inline javascript from user settings page
Tom Hughes [Fri, 24 Nov 2017 08:38:51 +0000 (08:38 +0000)]
Allow iD to fetch gpx files from arbitrary locations
Tom Hughes [Fri, 24 Nov 2017 01:09:27 +0000 (01:09 +0000)]
Fix security policy for mapillary in iD
Tom Hughes [Fri, 24 Nov 2017 00:46:27 +0000 (00:46 +0000)]
Fix remote editing security policy
Tom Hughes [Fri, 24 Nov 2017 00:43:14 +0000 (00:43 +0000)]
Add security policy for remote control editing
Tom Hughes [Fri, 24 Nov 2017 00:10:38 +0000 (00:10 +0000)]
Allow iD to connect to nominatim
Tom Hughes [Thu, 23 Nov 2017 22:39:05 +0000 (22:39 +0000)]
Allow third party images in user content
Tom Hughes [Thu, 23 Nov 2017 22:22:01 +0000 (22:22 +0000)]
Allow images to be loaded from piwik
Tom Hughes [Thu, 23 Nov 2017 13:24:47 +0000 (13:24 +0000)]
Merge remote-tracking branch 'upstream/pull/1687'
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
translatewiki.net [Thu, 23 Nov 2017 06:48:25 +0000 (07:48 +0100)]
Localisation updates from https://translatewiki.net.
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.
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.
Andy Allan [Wed, 22 Nov 2017 14:42:16 +0000 (14:42 +0000)]
Merge branch 'pull/843' into titles
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
translatewiki.net [Mon, 20 Nov 2017 08:29:08 +0000 (09:29 +0100)]
Localisation updates from https://translatewiki.net.
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
Tom Hughes [Thu, 16 Nov 2017 10:17:22 +0000 (10:17 +0000)]
Add openstreetcam.org to security policy for iD
Tom Hughes [Thu, 16 Nov 2017 10:17:06 +0000 (10:17 +0000)]
Merge remote-tracking branch 'upstream/pull/1682'
translatewiki.net [Thu, 16 Nov 2017 10:10:07 +0000 (11:10 +0100)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Thu, 16 Nov 2017 05:50:21 +0000 (00:50 -0500)]
Update to iD v2.5.1
Tom Hughes [Wed, 15 Nov 2017 13:01:38 +0000 (13:01 +0000)]
Make system tests run by default
Tom Hughes [Sun, 29 Oct 2017 20:58:23 +0000 (20:58 +0000)]
Add framework for system tests
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
translatewiki.net [Mon, 13 Nov 2017 08:26:31 +0000 (09:26 +0100)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Fri, 10 Nov 2017 20:57:37 +0000 (15:57 -0500)]
Add iD disable_features parameter
Bryan Housel [Fri, 10 Nov 2017 20:55:11 +0000 (15:55 -0500)]
Update to iD v2.5.0
Simon Poole [Fri, 10 Nov 2017 10:13:03 +0000 (11:13 +0100)]
Remove link to wiki legal FAQ as confusing and unmaintained
Tom Hughes [Thu, 9 Nov 2017 14:29:17 +0000 (14:29 +0000)]
Disable keyboard controls for layer switcher maps
Fixes #1673
Tom Hughes [Thu, 9 Nov 2017 09:45:17 +0000 (09:45 +0000)]
Merge remote-tracking branch 'upstream/pull/1668'
translatewiki.net [Thu, 9 Nov 2017 07:24:10 +0000 (08:24 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Nov 2017 08:17:04 +0000 (09:17 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 3 Nov 2017 20:40:48 +0000 (20:40 +0000)]
Update site to use jQuery 3
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
translatewiki.net [Thu, 2 Nov 2017 07:26:40 +0000 (08:26 +0100)]
Localisation updates from https://translatewiki.net.
JamesKingdom [Wed, 1 Nov 2017 20:39:36 +0000 (20:39 +0000)]
Change wording for hosting partners
Tom Hughes [Wed, 1 Nov 2017 17:44:22 +0000 (17:44 +0000)]
Relax cookie security policy
translatewiki.net [Mon, 30 Oct 2017 08:19:18 +0000 (09:19 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 29 Oct 2017 19:43:02 +0000 (19:43 +0000)]
Fix rubocop warnings
Tom Hughes [Sun, 29 Oct 2017 19:35:26 +0000 (19:35 +0000)]
Update bundle
Tom Hughes [Sun, 29 Oct 2017 19:29:30 +0000 (19:29 +0000)]
Replace factory_girl with factory_bot
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.
Tom Hughes [Fri, 27 Oct 2017 18:21:19 +0000 (19:21 +0100)]
Update for ActionView::Template::Error change
translatewiki.net [Fri, 27 Oct 2017 03:06:42 +0000 (05:06 +0200)]
Localisation updates from https://translatewiki.net.
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.
Tom Hughes [Wed, 25 Oct 2017 07:16:33 +0000 (08:16 +0100)]
Merge remote-tracking branch 'upstream/pull/1652'
Tom Hughes [Tue, 24 Oct 2017 19:19:46 +0000 (20:19 +0100)]
Merge remote-tracking branch 'upstream/pull/1659'
Tom Hughes [Tue, 24 Oct 2017 18:41:46 +0000 (19:41 +0100)]
Merge remote-tracking branch 'upstream/pull/1658'
translatewiki.net [Mon, 23 Oct 2017 03:15:48 +0000 (05:15 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Sun, 22 Oct 2017 21:35:34 +0000 (22:35 +0100)]
Rubocop fixes
Andy Allan [Sun, 22 Oct 2017 21:18:26 +0000 (22:18 +0100)]
Add annotate gem and associated rake task. Annotate models.
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.
translatewiki.net [Thu, 19 Oct 2017 07:17:15 +0000 (09:17 +0200)]
Localisation updates from https://translatewiki.net.
Holger Jeromin [Wed, 18 Oct 2017 17:51:05 +0000 (19:51 +0200)]
Removes DOM difference in location button (main map)
Holger Jeromin [Wed, 18 Oct 2017 13:05:11 +0000 (15:05 +0200)]
Removes DOM difference in location button
Tom Hughes [Mon, 9 Oct 2017 20:08:53 +0000 (21:08 +0100)]
Add rails version number to migrations
Tom Hughes [Mon, 9 Oct 2017 20:03:46 +0000 (21:03 +0100)]
Update to rails 5.1.4
Tom Hughes [Mon, 16 Oct 2017 18:08:37 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/1651'
Tom Hughes [Mon, 16 Oct 2017 18:08:32 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/1580'
translatewiki.net [Mon, 16 Oct 2017 08:49:29 +0000 (10:49 +0200)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Mon, 16 Oct 2017 05:07:07 +0000 (01:07 -0400)]
Add banner for OSMF Membership Drive
translatewiki.net [Thu, 12 Oct 2017 06:51:51 +0000 (08:51 +0200)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Mon, 9 Oct 2017 22:08:24 +0000 (18:08 -0400)]
Update to iD v2.4.3
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
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.
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.
Tom Hughes [Mon, 9 Oct 2017 07:39:14 +0000 (08:39 +0100)]
Fix typo that means
fe0f4543c1 has never worked
Bryan Housel [Mon, 9 Oct 2017 02:32:32 +0000 (22:32 -0400)]
Update to iD v2.4.2
translatewiki.net [Mon, 9 Oct 2017 06:41:47 +0000 (08:41 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 5 Oct 2017 19:22:24 +0000 (20:22 +0100)]
Use Hash#dig to simplify code
Tom Hughes [Thu, 5 Oct 2017 18:31:52 +0000 (19:31 +0100)]
Repair bundle
Tom Hughes [Thu, 5 Oct 2017 18:18:38 +0000 (19:18 +0100)]
Fix rubocop warnings
Tom Hughes [Thu, 5 Oct 2017 07:32:51 +0000 (08:32 +0100)]
Update bundle
Niklas Laxström [Thu, 5 Oct 2017 06:02:25 +0000 (08:02 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 25 Sep 2017 21:52:03 +0000 (22:52 +0100)]
Drop geocoder.us from search engines
Fixes #1633
Ian Dees [Thu, 14 Sep 2017 19:43:22 +0000 (14:43 -0500)]
Add banner-sotmus2017.png
Ian Dees [Thu, 14 Sep 2017 19:42:05 +0000 (14:42 -0500)]
Delete banner-sotm-2017.png
Ian Dees [Thu, 14 Sep 2017 19:39:47 +0000 (14:39 -0500)]
Add SOTM US and remove SOTM.org
Tom Hughes [Thu, 14 Sep 2017 19:30:38 +0000 (20:30 +0100)]
Defer measuring of header elements to a timeout
Chrome 60 and later seem to fire the "ready" callback before the DOM is
fully ready causing us to measure the wrong sizes for the header elements
so we use a 0ms timeout to defer the measurement slightly as a workaround.
Fixes #1639
Andy Allan [Wed, 13 Sep 2017 15:20:22 +0000 (16:20 +0100)]
Remove some more of the structured-details stuff
Andy Allan [Wed, 13 Sep 2017 15:19:16 +0000 (16:19 +0100)]
Create an IssueCommentsController for managing IssueComments
Andy Allan [Wed, 13 Sep 2017 15:16:33 +0000 (16:16 +0100)]
Fix parameter spacing
Andy Allan [Wed, 13 Sep 2017 15:12:36 +0000 (16:12 +0100)]
Rework the 'issues not found' notice slightly.
Previously it would go into a redirect loop if there were no issues
in the database.
Andy Allan [Wed, 13 Sep 2017 15:02:15 +0000 (16:02 +0100)]
The link is to the list of issues, not of reports, and there's no need for it to be bold.
Andy Allan [Wed, 13 Sep 2017 14:01:36 +0000 (15:01 +0100)]
Ensure that issue comments have associated issues and users.
Andy Allan [Wed, 13 Sep 2017 13:58:13 +0000 (14:58 +0100)]
Add missing structure.sql changes from
948fd8c8faf1016d
Andy Allan [Wed, 13 Sep 2017 13:35:49 +0000 (14:35 +0100)]
Remove created_at / updated_at column definitions since these duplicate t.timestamps
Kshitiz Khanal [Mon, 4 Sep 2017 07:05:26 +0000 (12:50 +0545)]
Add banner for State of the Map Asia 2017
Closes #1630
Wille Marcel [Fri, 8 Sep 2017 01:14:33 +0000 (22:14 -0300)]
Add padding between the last diary post and the pagination links
Closes #1634
Tom Hughes [Fri, 8 Sep 2017 15:49:28 +0000 (16:49 +0100)]
Update secure_headers configuration for upstream changes
Tom Hughes [Fri, 8 Sep 2017 14:38:25 +0000 (15:38 +0100)]
Update travis configuration to work on trusty based builders
Switch to postgres 9.5 and link postgres functions to a directory
that is accessible to the postgres server.
Tom Hughes [Fri, 8 Sep 2017 14:08:47 +0000 (15:08 +0100)]
Update rails to 5.0.6
Andy Allan [Wed, 6 Sep 2017 17:17:54 +0000 (18:17 +0100)]
Ensure report details are not blank.
Andy Allan [Wed, 6 Sep 2017 17:06:21 +0000 (18:06 +0100)]
Refactor creating a new report to use a ReportsController
It's really a report that the user is creating, the issue is created indirectly. Similar
refactoring will be required for issue comments.
Andy Allan [Wed, 6 Sep 2017 16:57:54 +0000 (17:57 +0100)]
Use reports_count so that counter_cache works automatically.
Andy Allan [Wed, 6 Sep 2017 15:27:54 +0000 (16:27 +0100)]
Remove the border around the radio boxes
It looks strange.
Andy Allan [Wed, 6 Sep 2017 10:31:21 +0000 (11:31 +0100)]
Check that the flag is not show when not logged in