]>
git.openstreetmap.org Git - rails.git/log
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
Andy Allan [Wed, 6 Sep 2017 10:24:54 +0000 (11:24 +0100)]
Add a basic feature test for reporting diary entries.
Andy Allan [Wed, 6 Sep 2017 10:21:00 +0000 (11:21 +0100)]
Add minitest-rails-capybara
This allows us to write feature tests using capybara. These can be
easily changed to system tests when we upgrade to rails 5.1
Tom Hughes [Wed, 30 Aug 2017 20:09:32 +0000 (21:09 +0100)]
Merge remote-tracking branch 'upstream/pull/1614'
Andy Allan [Wed, 30 Aug 2017 10:40:54 +0000 (11:40 +0100)]
Rename xml processing methods with an update_ prefix
They behave differently from the other from_xml methods on other models.
Tom Hughes [Tue, 29 Aug 2017 19:28:06 +0000 (20:28 +0100)]
Enable retina tiles for Thunderforest layers
Fixes #1623
Bryan Housel [Sat, 26 Aug 2017 20:08:43 +0000 (16:08 -0400)]
Update to iD v2.4.1
Bryan Housel [Fri, 25 Aug 2017 20:24:19 +0000 (16:24 -0400)]
Add iD hashtags parameter
Bryan Housel [Fri, 25 Aug 2017 20:21:11 +0000 (16:21 -0400)]
Update to iD v2.4.0
Andy Allan [Fri, 18 Aug 2017 09:08:54 +0000 (10:08 +0100)]
Refactor the from_xml methods to act on existing trace objects.
Setting the new tags with the = operator takes care of removing the
old ones, and is the same approach as taken by the tagstring= method.
Fixes #1600
Andy Allan [Thu, 17 Aug 2017 18:03:50 +0000 (19:03 +0100)]
Add failing test demonstrating tag duplication when updating traces via the API.
Tom Hughes [Fri, 11 Aug 2017 16:45:57 +0000 (17:45 +0100)]
Make sure we show errors correctly when resetting a password
mmd-osm [Thu, 10 Aug 2017 18:49:50 +0000 (19:49 +0100)]
Discard empty ways from query result geometries
Fixes #1608
Tom Hughes [Wed, 9 Aug 2017 21:48:56 +0000 (22:48 +0100)]
Update to leaflet 1.2.0
Tom Hughes [Thu, 3 Aug 2017 18:08:54 +0000 (19:08 +0100)]
Fix rubocop warning
Tom Hughes [Thu, 3 Aug 2017 17:41:45 +0000 (18:41 +0100)]
Switch to using openstreetmap-deadlock_retry
Closes #1602
Tom Hughes [Wed, 2 Aug 2017 14:38:21 +0000 (15:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1604'
Andy Allan [Wed, 2 Aug 2017 14:34:17 +0000 (15:34 +0100)]
Add maintainers to README
It's nice to be explicit, so that new contributers know who is who.
While github shows "owner" and "member" labels these are for the
openstreetmap organisation as a whole, and can be misleading.
Tom Hughes [Wed, 2 Aug 2017 14:31:21 +0000 (15:31 +0100)]
Make sure the account form is POSTed
Fixes #1601
Andy Allan [Wed, 2 Aug 2017 14:15:25 +0000 (15:15 +0100)]
Merge pull request #1588 from Georeactor/master
Update gem, fix icons on RTL/Arabic pages
Tom Hughes [Wed, 2 Aug 2017 14:02:39 +0000 (15:02 +0100)]
Merge remote-tracking branch 'upstream/pull/1603'
Andy Allan [Wed, 2 Aug 2017 13:58:03 +0000 (14:58 +0100)]
Avoid passing the current_user.id when commenting
Doing so doesn't appear to be necessary, and it opens up a spoofing
hole if it's actually used.
Andy Allan [Wed, 2 Aug 2017 13:48:04 +0000 (14:48 +0100)]
Remove unused user save template.
This template isn't used, since all the controller methods redirect
to other views.
Andy Allan [Wed, 2 Aug 2017 11:21:51 +0000 (12:21 +0100)]
Use current_user instead of @user.
Andy Allan [Wed, 2 Aug 2017 11:12:57 +0000 (12:12 +0100)]
Merge branch 'master' into moderation