]>
git.openstreetmap.org Git - rails.git/log
Peter Barth [Mon, 22 Jan 2018 20:40:39 +0000 (21:40 +0100)]
cleanup banners: remove past conferences from 2017
Peter Barth [Mon, 22 Jan 2018 20:40:27 +0000 (21:40 +0100)]
add banner for this year's FOSSGIS conference
Tom Hughes [Mon, 22 Jan 2018 14:36:16 +0000 (14:36 +0000)]
Fix new rubocop warnings
Tom Hughes [Mon, 22 Jan 2018 14:17:52 +0000 (14:17 +0000)]
Update bundle
translatewiki.net [Mon, 22 Jan 2018 14:19:10 +0000 (15:19 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Mon, 22 Jan 2018 11:56:39 +0000 (11:56 +0000)]
Fully internationalise the issues and reports interfaces.
Bryan Housel [Sun, 21 Jan 2018 15:52:31 +0000 (10:52 -0500)]
Update to iD v2.6.0
Andy Allan [Sun, 21 Jan 2018 11:20:19 +0000 (11:20 +0000)]
Merge branch 'master' into moderation
Andy Allan [Sun, 21 Jan 2018 11:18:24 +0000 (11:18 +0000)]
Reopen issues if necessary when creating a report.
Tom Hughes [Thu, 18 Jan 2018 17:38:42 +0000 (17:38 +0000)]
Use no-r2 comment to block RTL gem from changing sprites
Fixes #1717
Tom Hughes [Thu, 18 Jan 2018 17:32:33 +0000 (17:32 +0000)]
Update leaflet to 1.3.1
translatewiki.net [Thu, 18 Jan 2018 07:47:01 +0000 (08:47 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 17 Jan 2018 12:32:58 +0000 (12:32 +0000)]
Update Potlatch 2 to
2.5-21-gec1befed build
Tom Hughes [Mon, 15 Jan 2018 10:25:21 +0000 (10:25 +0000)]
Update the Leaflet.contextmenu plugin to 1.5.0
Tom Hughes [Mon, 15 Jan 2018 10:23:22 +0000 (10:23 +0000)]
Update leaflet to 1.3.0
translatewiki.net [Mon, 15 Jan 2018 07:08:50 +0000 (08:08 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 13 Jan 2018 15:57:31 +0000 (15:57 +0000)]
Allow cross domain flash access from http sites
Tom Hughes [Sat, 13 Jan 2018 10:41:26 +0000 (10:41 +0000)]
Enable cross origin requests for diary RSS feeds
Fixes #1714
Tom Hughes [Sat, 13 Jan 2018 10:35:42 +0000 (10:35 +0000)]
Merge remote-tracking branch 'upstream/pull/1707'
Tom Hughes [Thu, 11 Jan 2018 19:44:20 +0000 (19:44 +0000)]
Allow apache to control the HSTS setting
Tom Hughes [Thu, 11 Jan 2018 19:19:36 +0000 (19:19 +0000)]
Allow apache to control the HSTS setting
translatewiki.net [Thu, 11 Jan 2018 07:10:41 +0000 (08:10 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 8 Jan 2018 20:30:51 +0000 (20:30 +0000)]
Fix jshint warning
Tom Hughes [Mon, 8 Jan 2018 20:18:21 +0000 (20:18 +0000)]
Convert various URLs to https
Tom Hughes [Mon, 8 Jan 2018 10:49:36 +0000 (10:49 +0000)]
Use https for nominatim
Tom Hughes [Thu, 4 Jan 2018 22:34:22 +0000 (22:34 +0000)]
Monkey patch OAuth to allow http signatures on https requests
translatewiki.net [Mon, 8 Jan 2018 08:18:17 +0000 (09:18 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 4 Jan 2018 09:23:00 +0000 (10:23 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 2 Jan 2018 18:45:20 +0000 (18:45 +0000)]
Remove dependencies on mapzen services
translatewiki.net [Mon, 1 Jan 2018 14:41:07 +0000 (15:41 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 Dec 2017 14:23:29 +0000 (15:23 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 21 Dec 2017 07:44:26 +0000 (08:44 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 19 Dec 2017 17:43:53 +0000 (17:43 +0000)]
Fix tests that only worked if object 400 didn't exist
mmd-osm [Tue, 19 Dec 2017 17:31:34 +0000 (17:31 +0000)]
Revoking administrator role on current user should fail
Fixes #1697
Closes #1701
mmd-osm [Mon, 18 Dec 2017 21:13:41 +0000 (21:13 +0000)]
Added explanation about discussions on open changesets
Closes #1705
translatewiki.net [Mon, 18 Dec 2017 16:56:33 +0000 (17:56 +0100)]
Localisation updates from https://translatewiki.net.
J Guthrie [Fri, 1 Dec 2017 01:38:23 +0000 (01:38 +0000)]
Added 'Reverse Directions' link
Added a text link that reverses the directions of the planned route
mmd-osm [Sat, 16 Dec 2017 16:55:56 +0000 (17:55 +0100)]
Fix rubocop issue
Guillaume RISCHARD [Sat, 16 Dec 2017 15:15:52 +0000 (16:15 +0100)]
Remove support for soon discontinued josm remote https endpoint
mmd-osm [Sat, 16 Dec 2017 13:06:21 +0000 (14:06 +0100)]
Remove extra blank line
mmd-osm [Sat, 16 Dec 2017 12:51:02 +0000 (13:51 +0100)]
Fix for failing test cases
mmd-osm [Sat, 16 Dec 2017 12:32:04 +0000 (13:32 +0100)]
Allow (un)subscribing discussions also when changeset still open
Fixes #1627
Tom Hughes [Thu, 14 Dec 2017 16:03:48 +0000 (16:03 +0000)]
Move advice on what to enter in a note to guide text
translatewiki.net [Thu, 14 Dec 2017 07:41:46 +0000 (08:41 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 13 Dec 2017 16:50:22 +0000 (16:50 +0000)]
Revert whitespace changes.
Andy Allan [Wed, 13 Dec 2017 16:43:09 +0000 (16:43 +0000)]
Simplify permissions check.
Andy Allan [Wed, 13 Dec 2017 16:35:14 +0000 (16:35 +0000)]
Fix some reporting links.
Andy Allan [Wed, 13 Dec 2017 16:28:15 +0000 (16:28 +0000)]
Remove unused update method from issues_controller.
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
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.
Andy Allan [Wed, 13 Dec 2017 16:15:40 +0000 (16:15 +0000)]
Remove a couple of unused style rules.
Andy Allan [Wed, 13 Dec 2017 16:02:55 +0000 (16:02 +0000)]
Store the report category.
translatewiki.net [Mon, 11 Dec 2017 07:10:41 +0000 (08:10 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 9 Dec 2017 10:52:19 +0000 (10:52 +0000)]
Don't add system tests if the user specified which tests to run
Martijn van Exel [Thu, 7 Dec 2017 17:25:25 +0000 (10:25 -0700)]
A couple more tweaks to Mac install docs
* The URL for the homebrew site has changed.
* Added phantomjs (test dependency)
Closes #1700
Martijn van Exel [Thu, 7 Dec 2017 09:26:36 +0000 (09:26 +0000)]
Add explicit install instructions for libxml2 on MacOS
Closes #1698
translatewiki.net [Thu, 7 Dec 2017 08:12:58 +0000 (09:12 +0100)]
Localisation updates from https://translatewiki.net.
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.
Andy Allan [Wed, 6 Dec 2017 18:01:51 +0000 (18:01 +0000)]
Re-enable issue reassigning.
Andy Allan [Wed, 6 Dec 2017 17:00:35 +0000 (17:00 +0000)]
Validate the assigned role, and remove the :type activrecord enum
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.
Andy Allan [Wed, 6 Dec 2017 15:26:40 +0000 (15:26 +0000)]
Remove the hardcoded pixel width for columns.
Guillaume RISCHARD [Wed, 6 Dec 2017 13:19:40 +0000 (13:19 +0000)]
Enable image compression utils for image_optim
Closes #1696
Tom Hughes [Mon, 4 Dec 2017 21:19:38 +0000 (21:19 +0000)]
Use a memory cache for sessions when memcache is not configured
Fixes #1695
translatewiki.net [Mon, 4 Dec 2017 08:51:04 +0000 (09:51 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 4 Dec 2017 07:54:19 +0000 (07:54 +0000)]
Make changeset#query preload users, tags and comments
Tom Hughes [Fri, 1 Dec 2017 19:21:42 +0000 (19:21 +0000)]
Make the AMF getway_old call parse times as UTC
Although it's not entirely clear how to interpret a timestamp from
a client the production servers have effectively been parsing them
as UTC because they run in the UTC time zone all year.
Using Time.zone to do the parse forces it to happen in the rails time
zone rather than the system time zone, which defaults to UTC as well.
Fixes #1688
translatewiki.net [Thu, 30 Nov 2017 07:49:14 +0000 (08:49 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 29 Nov 2017 23:07:19 +0000 (23:07 +0000)]
Use decoded strings when parsing XML responses from geocoders
Fixes #1690
Tom Hughes [Wed, 29 Nov 2017 20:35:17 +0000 (20:35 +0000)]
Update rack-test and patch test issues
Andy Allan [Wed, 29 Nov 2017 18:58:51 +0000 (18:58 +0000)]
Convert issue search tests to system tests
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.
Andy Allan [Wed, 29 Nov 2017 18:02:26 +0000 (18:02 +0000)]
Put the expected value first in assert_equal
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.
Andy Allan [Wed, 29 Nov 2017 17:37:29 +0000 (17:37 +0000)]
Index page no longer redirects when there's no issues.
Andy Allan [Wed, 29 Nov 2017 17:28:37 +0000 (17:28 +0000)]
Move and amend the issue comment controller tests.
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.
Andy Allan [Wed, 29 Nov 2017 16:48:01 +0000 (16:48 +0000)]
Rubocop fixes.
Andy Allan [Wed, 29 Nov 2017 16:47:36 +0000 (16:47 +0000)]
Remove the reassign boolean display
Tom Hughes [Wed, 29 Nov 2017 16:24:12 +0000 (16:24 +0000)]
Update bundle
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.
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.
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.
Andy Allan [Wed, 29 Nov 2017 16:03:27 +0000 (16:03 +0000)]
Adjust for rails5 convention on migrations.
Andy Allan [Wed, 29 Nov 2017 12:34:04 +0000 (12:34 +0000)]
Annotate models.
Andy Allan [Wed, 29 Nov 2017 12:33:23 +0000 (12:33 +0000)]
Refactor factories to use FactoryBot
Andy Allan [Wed, 29 Nov 2017 12:33:03 +0000 (12:33 +0000)]
Remove minitest-rails-capybara and convert feature tests to system tests
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