]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sun, 24 Apr 2016 17:42:47 +0000 (18:42 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1208'
Andy Allan [Fri, 22 Apr 2016 16:24:32 +0000 (17:24 +0100)]
Remove database readme
This duplicates parts of INSTALL.md but with outdated information.
Andy Allan [Fri, 22 Apr 2016 16:24:17 +0000 (17:24 +0100)]
Remove 9 year old warning
Andy Allan [Fri, 22 Apr 2016 15:44:09 +0000 (16:44 +0100)]
Remove old config files.
We use passenger (configured via chef) and these old files will just
cause confusion.
Niklas Laxström [Thu, 21 Apr 2016 05:12:10 +0000 (07:12 +0200)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 18 Apr 2016 05:15:21 +0000 (07:15 +0200)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 14 Apr 2016 06:09:57 +0000 (08:09 +0200)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 11 Apr 2016 05:17:47 +0000 (07:17 +0200)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 7 Apr 2016 06:09:32 +0000 (08:09 +0200)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 4 Apr 2016 05:25:08 +0000 (07:25 +0200)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 31 Mar 2016 06:01:22 +0000 (08:01 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 28 Mar 2016 21:45:20 +0000 (22:45 +0100)]
Make vagrant provision script stop on error
Tom Hughes [Mon, 28 Mar 2016 21:32:24 +0000 (22:32 +0100)]
Update bundle
Niklas Laxström [Mon, 28 Mar 2016 08:19:23 +0000 (10:19 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 24 Mar 2016 08:36:32 +0000 (08:36 +0000)]
Allow redcarpet to add nofollow to links
This, using a new feature in redcarpet, allows us to avoid having
to subclass the renderer and implement links ourselves, which in
turn means that redcarpet's link sanitisation works.
Niklas Laxström [Thu, 24 Mar 2016 06:25:57 +0000 (07:25 +0100)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 21 Mar 2016 06:18:44 +0000 (07:18 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 20 Mar 2016 19:41:15 +0000 (19:41 +0000)]
Increase overpass API timeout
Tom Hughes [Sun, 20 Mar 2016 19:29:50 +0000 (19:29 +0000)]
Handle overpass errors reported as remarks
Not all overpass errors are reported as HTTP errors - some are
reported as HTTP success with a remark in the response.
Fixes #1178
Tom Hughes [Sun, 20 Mar 2016 19:01:12 +0000 (19:01 +0000)]
Update bundle
Tom Hughes [Sun, 20 Mar 2016 18:58:50 +0000 (18:58 +0000)]
Make support email address configurable
Tom Hughes [Sun, 20 Mar 2016 18:47:35 +0000 (18:47 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/954'
Alexander Meshcheryakov [Sat, 21 Nov 2015 13:23:54 +0000 (16:23 +0300)]
Make list items highligh colour darker
The list highlight colour is currently very subtle and can be
had to spot so make it a little darker.
Closes #1090
Bryan Housel [Fri, 18 Mar 2016 19:41:09 +0000 (15:41 -0400)]
Update to iD v1.9.2
Markus Heidelberg [Thu, 17 Mar 2016 08:29:07 +0000 (09:29 +0100)]
Correctly sort the Copyright item in the compact menu
In the default menu it had been moved left by commit
bfd11bf79 but
the compact drop-down menu had not been adapted accordingly.
Closes #1185
Niklas Laxström [Thu, 17 Mar 2016 07:56:43 +0000 (08:56 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 15 Mar 2016 10:03:18 +0000 (10:03 +0000)]
Don't pass the locale to the Mapzen routing engine
It only supports en-US currently, and passing anything else now
makes it error instead of falling back to en-US.
Tom Hughes [Mon, 14 Mar 2016 22:11:23 +0000 (22:11 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/954'
Simon Legner [Tue, 14 Apr 2015 21:32:58 +0000 (23:32 +0200)]
Notes: show first comment as marker tooltip
Simon Legner [Mon, 14 Mar 2016 21:16:36 +0000 (22:16 +0100)]
Wrap user name in `bdi` to provide a separate RTL context
Fixes #1179
Closes #1183
Tom Hughes [Mon, 14 Mar 2016 21:18:26 +0000 (21:18 +0000)]
Test titles in changeset feed
Simon Legner [Sun, 13 Mar 2016 20:22:42 +0000 (21:22 +0100)]
Add title to changeset feeds
Fixes #1051
Closes #1180
Simon Legner [Mon, 14 Mar 2016 20:42:40 +0000 (21:42 +0100)]
Only the standard layer can be exported
Fixes #1141
Closes #1182
Tom Hughes [Mon, 14 Mar 2016 20:57:41 +0000 (20:57 +0000)]
We require PostgreSQL 9.1 for CREATE EXTENSION
Simon Legner [Mon, 14 Mar 2016 17:27:29 +0000 (18:27 +0100)]
Fix error and inconsistencies INSTALL.md
Niklas Laxström [Mon, 14 Mar 2016 07:20:06 +0000 (08:20 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 9 Mar 2016 22:27:40 +0000 (22:27 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1120'
Florian Schäfer [Fri, 15 Jan 2016 21:05:46 +0000 (22:05 +0100)]
Make "Report a problem" link in embeddable map translateable
Tom Hughes [Wed, 9 Mar 2016 19:26:31 +0000 (19:26 +0000)]
Enebale I18n for embedded maps
Florian Schäfer [Fri, 15 Jan 2016 20:56:41 +0000 (21:56 +0100)]
Open new tab/window for "report a problem" link
This avoids closing whatever site the user was looking at when they
spotted he problem, and avoid problems when the embedded map is part
of an iframe as the problem report page denies embedding.
Tom Hughes [Wed, 9 Mar 2016 19:05:16 +0000 (19:05 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1122'
Simon Legner [Wed, 9 Mar 2016 18:46:03 +0000 (18:46 +0000)]
Show ref of object when no name is present
Tom Hughes [Wed, 9 Mar 2016 18:40:41 +0000 (18:40 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1174'
Tom Hughes [Wed, 9 Mar 2016 13:47:05 +0000 (13:47 +0000)]
Fix tests that made assumptions about tag ordering
Siebrand Mazeland [Wed, 9 Mar 2016 12:44:53 +0000 (13:44 +0100)]
Localisation updates from https://translatewiki.net.
Simon Legner [Tue, 8 Mar 2016 20:39:55 +0000 (21:39 +0100)]
Consistent blue marker colour for sharing location
Before, when adding a marker, it was coloured blue. After sharing the marker,
it was coloured red.
Tom Hughes [Tue, 8 Mar 2016 14:12:03 +0000 (14:12 +0000)]
Use rake test:db to do initial test run
This makes sure the database is initialised by loading the schema
dumped after migrating the development database.
Fixes #878
Closes #1173
Tom Hughes [Mon, 7 Mar 2016 22:38:40 +0000 (22:38 +0000)]
Update to rails 4.2.6
Tom Hughes [Mon, 7 Mar 2016 12:20:55 +0000 (12:20 +0000)]
Improve styling of "signup blocked" page
Tom Hughes [Sun, 6 Mar 2016 21:37:47 +0000 (21:37 +0000)]
Ignore bounds on elements with geometry
Tom Hughes [Sun, 6 Mar 2016 20:42:04 +0000 (20:42 +0000)]
Fix query tool to get correct bounds for enclosing ways
The bounding box returned by overpass for geom output is only
the bounds for the clipped geometry, so fetch the geometry and
the bounding box separately and merge them client side.
Fixes #1156
Tom Hughes [Fri, 4 Mar 2016 20:28:07 +0000 (20:28 +0000)]
Correct URL of Mapzen metro extracts
Tom Hughes [Fri, 4 Mar 2016 16:47:36 +0000 (16:47 +0000)]
Compile traffico font assets
Tom Hughes [Fri, 4 Mar 2016 10:30:16 +0000 (10:30 +0000)]
Remove debug statement
Tom Hughes [Fri, 4 Mar 2016 10:29:58 +0000 (10:29 +0000)]
Only compile those iD assets that we actually need
Tom Hughes [Thu, 3 Mar 2016 22:25:58 +0000 (22:25 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1172' into next
Bryan Housel [Thu, 3 Mar 2016 21:28:53 +0000 (16:28 -0500)]
Update to iD v1.9.1
Bryan Housel [Wed, 2 Mar 2016 21:17:44 +0000 (16:17 -0500)]
Add traffico icons to vendor/assets/iD and asset pipeline precompile list
Niklas Laxström [Thu, 3 Mar 2016 07:29:44 +0000 (08:29 +0100)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Tue, 1 Mar 2016 22:17:36 +0000 (17:17 -0500)]
Update to iD v1.9.0
Tom Hughes [Mon, 29 Feb 2016 22:19:18 +0000 (22:19 +0000)]
Update rails to 4.2.5.2
Niklas Laxström [Mon, 29 Feb 2016 16:24:23 +0000 (17:24 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 29 Feb 2016 14:26:50 +0000 (14:26 +0000)]
Change "blocks received" to "active blocks"
Fixes #1168
Tom Hughes [Mon, 29 Feb 2016 14:26:20 +0000 (14:26 +0000)]
Make capitalisation of user menu entries consistent
Tom Hughes [Fri, 26 Feb 2016 16:30:32 +0000 (16:30 +0000)]
Treeat user as logged in after a password reset
Fixes #1160
Tom Hughes [Fri, 26 Feb 2016 15:32:11 +0000 (15:32 +0000)]
Preserve username and "remember me" when login fails
Fixes #1159
Niklas Laxström [Thu, 25 Feb 2016 08:24:08 +0000 (09:24 +0100)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 22 Feb 2016 07:48:32 +0000 (08:48 +0100)]
Localisation updates from https://translatewiki.net.
Siebrand Mazeland [Fri, 19 Feb 2016 14:23:26 +0000 (15:23 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 15 Feb 2016 21:09:59 +0000 (21:09 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1154'
Aditya Prakash [Mon, 15 Feb 2016 17:05:56 +0000 (22:35 +0530)]
Create new translation string for deleted user
Aditya Prakash [Mon, 15 Feb 2016 12:58:33 +0000 (18:28 +0530)]
Do not hyperlink profiles of deleted users
Niklas Laxström [Mon, 15 Feb 2016 06:18:10 +0000 (07:18 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 11 Feb 2016 10:15:19 +0000 (10:15 +0000)]
Avoid using Rails.application.assets as it no longer set in production
Tom Hughes [Thu, 11 Feb 2016 07:12:41 +0000 (07:12 +0000)]
Update rubocopy config after bug fixes
Tom Hughes [Thu, 11 Feb 2016 07:10:42 +0000 (07:10 +0000)]
Remove sprockets-rails version restriction now konacha is fixed
Niklas Laxström [Thu, 11 Feb 2016 06:36:36 +0000 (07:36 +0100)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 8 Feb 2016 10:49:47 +0000 (11:49 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 7 Feb 2016 14:32:03 +0000 (14:32 +0000)]
Update Potlatch 2 to
2.4-21-g233799c build
Tom Hughes [Fri, 5 Feb 2016 12:28:16 +0000 (12:28 +0000)]
Fix new rubocop warnings
Tom Hughes [Fri, 5 Feb 2016 12:20:40 +0000 (12:20 +0000)]
Update bundle
Niklas Laxström [Mon, 1 Feb 2016 08:31:31 +0000 (09:31 +0100)]
Localisation updates from https://translatewiki.net.
Siebrand Mazeland [Thu, 28 Jan 2016 15:52:17 +0000 (16:52 +0100)]
Localisation updates from https://translatewiki.net.
Siebrand Mazeland [Wed, 27 Jan 2016 09:35:36 +0000 (10:35 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 25 Jan 2016 21:26:54 +0000 (21:26 +0000)]
Update to tails 4.2.5.1
Tom Hughes [Tue, 19 Jan 2016 00:20:27 +0000 (00:20 +0000)]
Validate characters in changeset comments
Fixes #1135
Closes #1139
Tom Hughes [Tue, 19 Jan 2016 00:19:09 +0000 (00:19 +0000)]
Fix rubocop warnings
Tom Hughes [Tue, 19 Jan 2016 00:10:31 +0000 (00:10 +0000)]
Update bundle
Bryan Housel [Mon, 18 Jan 2016 15:38:19 +0000 (10:38 -0500)]
Update to iD v1.8.5
Nik Nyby [Wed, 13 Jan 2016 01:51:51 +0000 (20:51 -0500)]
Use ruby 2.1.8 on travis
Tom Hughes [Mon, 11 Jan 2016 19:11:50 +0000 (19:11 +0000)]
Add routing URLs to example config
Tom Hughes [Mon, 11 Jan 2016 19:03:47 +0000 (19:03 +0000)]
Move routing API endpoint addresses to config file
Tom Hughes [Sun, 10 Jan 2016 10:14:58 +0000 (10:14 +0000)]
Precompile login.js
Fixes #1128
Tom Hughes [Thu, 7 Jan 2016 18:41:34 +0000 (18:41 +0000)]
Add some tests for the locale library
Tom Hughes [Thu, 7 Jan 2016 09:10:19 +0000 (09:10 +0000)]
Discard and locale tags that fail to parse
Bryan Housel [Wed, 6 Jan 2016 22:51:49 +0000 (17:51 -0500)]
Update to iD v1.8.4
Tom Hughes [Wed, 6 Jan 2016 18:43:25 +0000 (18:43 +0000)]
Rework locale selection
Implement our own matching algorithm rather than trying to
patch the http_accept_language one and make sure everything is
using it in a consistent way.
Fixes #1125
Tom Hughes [Thu, 31 Dec 2015 07:40:44 +0000 (07:40 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1117'
Victor Grousset [Thu, 31 Dec 2015 00:22:11 +0000 (01:22 +0100)]
Vagrant: Fix locale setup problem
Because dozens of red locale errors during provisioning are scary
Victor Grousset [Wed, 30 Dec 2015 23:31:44 +0000 (00:31 +0100)]
Update vagrant provision script with current install commands
From INSTALL.md