]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Tue, 18 Nov 2014 17:58:45 +0000 (17:58 +0000)]
Update ohauth
Tom Hughes [Tue, 18 Nov 2014 17:57:21 +0000 (17:57 +0000)]
Update jQuery plugins
Tom Hughes [Tue, 18 Nov 2014 17:57:09 +0000 (17:57 +0000)]
Update html5shiv
Tom Hughes [Tue, 18 Nov 2014 17:56:42 +0000 (17:56 +0000)]
Update vendor URLs
Tom Hughes [Tue, 18 Nov 2014 17:41:45 +0000 (17:41 +0000)]
Update attribution for embedded maps
Fixes #838
Tom Hughes [Mon, 17 Nov 2014 19:09:22 +0000 (19:09 +0000)]
Update to rails 4.1.8
Siebrand Mazeland [Fri, 14 Nov 2014 12:56:13 +0000 (13:56 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 12 Nov 2014 09:44:21 +0000 (09:44 +0000)]
Stringify user ID
Tom Hughes [Sun, 9 Nov 2014 23:03:04 +0000 (23:03 +0000)]
Revert "Add SOTM advert"
This reverts commit
15a7276a9f50821a7728b4da3af16849284f251b .
Tom Hughes [Sun, 9 Nov 2014 22:41:12 +0000 (22:41 +0000)]
Update to rails 4.1.7
Tom Hughes [Sun, 9 Nov 2014 22:41:01 +0000 (22:41 +0000)]
Track users in piwik
Tom Hughes [Fri, 7 Nov 2014 19:17:34 +0000 (19:17 +0000)]
Handle unknown admin_level values
Tom Hughes [Fri, 7 Nov 2014 15:58:05 +0000 (15:58 +0000)]
Allow query mode to be turned off at low zoom
Fixes #830
Tom Hughes [Fri, 7 Nov 2014 15:19:30 +0000 (15:19 +0000)]
Look for locale specific names
Tom Hughes [Fri, 7 Nov 2014 15:00:22 +0000 (15:00 +0000)]
Don't do the admin boundary special case unless admin_level is set
Tom Hughes [Fri, 7 Nov 2014 08:40:18 +0000 (08:40 +0000)]
Merge branch 'overpass'
Paul Norman [Fri, 7 Nov 2014 05:41:15 +0000 (21:41 -0800)]
Recommend PostgreSQL 9.1+ in database.yml
Postgres 8.3 is EOL and the minimum version supported by PostgreSQL
is 9.0. The production servers run 9.1, and the extension setup is
easier with it too.
Paul Norman [Fri, 7 Nov 2014 05:17:30 +0000 (21:17 -0800)]
Link to Phusion Passenger docs for production
Phusion Passenger has documentation for common web servers, so we can
link to them, as most users will be using one of them in production.
Paul Norman [Thu, 6 Nov 2014 21:02:17 +0000 (13:02 -0800)]
Add KSJ2 tags to uninteresting list
The KSJ2 tags often appear on nodes with no interesting tags
as import cruft.
Tom Hughes [Wed, 5 Nov 2014 20:19:21 +0000 (20:19 +0000)]
Don't enable query mode when loading a query URL
Tom Hughes [Wed, 5 Nov 2014 20:34:45 +0000 (20:34 +0000)]
Add comments_feed action to various filters
Fixes #825
Tom Hughes [Wed, 5 Nov 2014 13:57:52 +0000 (13:57 +0000)]
Allow query mode to be disabled when the sidebar is open
Dan Stowell [Mon, 13 Oct 2014 20:17:12 +0000 (21:17 +0100)]
Leave overpass result links coloured blue
Closes #47.
Tom Hughes [Tue, 4 Nov 2014 09:55:26 +0000 (09:55 +0000)]
Sort enclosing features by size
Dan Karran [Tue, 28 Oct 2014 20:15:40 +0000 (20:15 +0000)]
Add some missing browse icons
Icons for highway=tertiary, highway=track, highway=path and barrier=wall.
Tom Hughes [Sat, 1 Nov 2014 17:20:26 +0000 (17:20 +0000)]
Don't centre on load if the location is already in view
Tom Hughes [Sat, 1 Nov 2014 16:11:12 +0000 (16:11 +0000)]
Use new overpass geometry output support to get geometeries
Tom Hughes [Sat, 1 Nov 2014 12:46:42 +0000 (12:46 +0000)]
Merge branch 'master' into overpass
Tom Hughes [Sat, 1 Nov 2014 11:43:21 +0000 (11:43 +0000)]
Merge branch 'comments'
Siebrand Mazeland [Mon, 27 Oct 2014 17:58:16 +0000 (18:58 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 26 Oct 2014 11:39:00 +0000 (11:39 +0000)]
Fixes for offline mode
John Firebaugh [Fri, 24 Oct 2014 16:26:09 +0000 (09:26 -0700)]
Update to iD v1.6.2
John Firebaugh [Thu, 23 Oct 2014 22:29:26 +0000 (15:29 -0700)]
Update to iD v1.6.1
Tom Hughes [Thu, 23 Oct 2014 20:40:13 +0000 (21:40 +0100)]
Move changeset comment feeds out of the API namespace
Tom Hughes [Sun, 19 Oct 2014 20:34:50 +0000 (21:34 +0100)]
Tidy up changeset comment tests and beef them up a bit
Tom Hughes [Sun, 19 Oct 2014 20:31:23 +0000 (21:31 +0100)]
Tidy up changeset comment code
Łukasz Gurdek [Sun, 7 Sep 2014 13:25:56 +0000 (14:25 +0100)]
Changeset discussions
Add support for commenting on changesets with RSS feeds and email
notification of comments to other commenters and people that have
chosen to subscribe to a changeset.
Siebrand Mazeland [Thu, 23 Oct 2014 19:37:57 +0000 (21:37 +0200)]
Localisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 20 Oct 2014 17:07:29 +0000 (19:07 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 20 Oct 2014 08:04:15 +0000 (09:04 +0100)]
Update Potlatch 2 to
2.3-648-g9cab056 build
Tom Hughes [Fri, 17 Oct 2014 16:21:37 +0000 (17:21 +0100)]
Merge remote-tracking branch 'osmlab/iD-1.6.0'
Tom Hughes [Thu, 16 Oct 2014 19:36:40 +0000 (20:36 +0100)]
Add some more model tests for notes and note comments
Tom Hughes [Wed, 15 Oct 2014 23:59:34 +0000 (00:59 +0100)]
Validate note comments for control characters
Tom Hughes [Wed, 15 Oct 2014 23:59:24 +0000 (00:59 +0100)]
Add missing event types to note comment fixtures
Tom Hughes [Tue, 14 Oct 2014 10:10:06 +0000 (11:10 +0100)]
Update Potlatch 2 to
2.3-645-g81e8bcb build
Tom Hughes [Mon, 13 Oct 2014 13:04:19 +0000 (14:04 +0100)]
Don't pass the hash when routing an empty search query
Fixes #793
Tom Hughes [Fri, 10 Oct 2014 11:31:42 +0000 (12:31 +0100)]
Update to CPK 7.0.11 and drop monkey patch
John Firebaugh [Mon, 6 Oct 2014 21:58:08 +0000 (14:58 -0700)]
Update to iD v1.6.0
John Firebaugh [Mon, 6 Oct 2014 21:47:36 +0000 (14:47 -0700)]
Forward the `comment` hash parameter to iD
See https://github.com/openstreetmap/iD/commit/
21da76cf8060832e36d341d9bd41dd1142810b08
Siebrand Mazeland [Mon, 6 Oct 2014 10:11:58 +0000 (12:11 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 2 Oct 2014 18:54:26 +0000 (19:54 +0100)]
Test that reserved usernames are not allowed
Tom Hughes [Thu, 11 Sep 2014 19:03:43 +0000 (20:03 +0100)]
Update to rails 4.1.6
Tom Hughes [Thu, 2 Oct 2014 12:36:46 +0000 (13:36 +0100)]
Ban usernames which match special URLs
Trac #5236
Paul Norman [Tue, 9 Sep 2014 00:12:10 +0000 (17:12 -0700)]
Explain how to load data for testing
This is a fairly common query, and not too complicated where the data only needs to be loaded.
Loading data then editing it is more complex, and not covered here.
Tom Hughes [Sun, 7 Sep 2014 12:48:28 +0000 (13:48 +0100)]
Move noscript message clear of the sidebar
Fixes #808
Tom Hughes [Thu, 4 Sep 2014 14:25:56 +0000 (15:25 +0100)]
Add SOTM advert
Paul Norman [Sat, 30 Aug 2014 08:32:35 +0000 (01:32 -0700)]
Add an imagery blacklist to capabilities
This blacklist is for imagery which is of an incompatible license or ToS
but is incorrectly used with some frequency.
This adds a <policy> element to the capabilities XML which contains the
blacklist information within it
Tom Hughes [Tue, 19 Aug 2014 09:55:01 +0000 (10:55 +0100)]
Move ICO favion into an IE conditional comment
Tom Hughes [Tue, 19 Aug 2014 08:26:34 +0000 (09:26 +0100)]
Update to rails 4.1.5
Siebrand Mazeland [Sun, 10 Aug 2014 09:46:50 +0000 (11:46 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 10 Aug 2014 07:55:06 +0000 (08:55 +0100)]
Addd some missing quotes
Siebrand Mazeland [Sat, 9 Aug 2014 14:21:12 +0000 (16:21 +0200)]
Localisation updates from https://translatewiki.net.
Martijn van Exel [Thu, 7 Aug 2014 21:38:32 +0000 (15:38 -0600)]
adding detail to configure.md
Tom Hughes [Wed, 6 Aug 2014 15:04:13 +0000 (16:04 +0100)]
Revert "Localisation updates from https://translatewiki.net."
This reverts commit
e25fbfa13af4b5b2ffa0b998b45d8706d38b2c88 .
Siebrand Mazeland [Wed, 6 Aug 2014 14:50:27 +0000 (16:50 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 6 Aug 2014 07:58:47 +0000 (08:58 +0100)]
Precompile expressInstall.swf
Tom Hughes [Wed, 6 Aug 2014 07:53:03 +0000 (08:53 +0100)]
Update Potlatch 2 to
2.3-632-g1a1f24a build
Tom Hughes [Tue, 5 Aug 2014 08:24:20 +0000 (09:24 +0100)]
Restore original limits for user lists in statistics
John Firebaugh [Tue, 29 Jul 2014 18:13:03 +0000 (11:13 -0700)]
Update to iD v1.5.4
Tom Hughes [Tue, 29 Jul 2014 09:14:08 +0000 (10:14 +0100)]
Don't preload the nodes as it seems to break the ordering
Fixes #795
Tom Hughes [Sat, 26 Jul 2014 09:34:57 +0000 (10:34 +0100)]
Revert "Fix off-by-one error in user notes list"
This reverts commit
706454ae35b644c619b9cd332b3c97133054a397 .
Tom Hughes [Fri, 25 Jul 2014 18:38:03 +0000 (19:38 +0100)]
Use autoprefixer to generate CSS prefixes
Tom Hughes [Fri, 25 Jul 2014 17:44:57 +0000 (18:44 +0100)]
Precompile iD locales
John Firebaugh [Fri, 25 Jul 2014 17:07:14 +0000 (10:07 -0700)]
Update to iD v1.5.3
Tom Hughes [Fri, 25 Jul 2014 15:49:40 +0000 (16:49 +0100)]
More modernisations for the statistics script
Tom Hughes [Fri, 25 Jul 2014 15:40:53 +0000 (16:40 +0100)]
Modernise statistics script to work with rails 4.1
Toby Murray [Thu, 24 Jul 2014 07:21:00 +0000 (02:21 -0500)]
Fix off-by-one error in user notes list
Florian M. Schäfer [Thu, 24 Jul 2014 21:09:27 +0000 (23:09 +0200)]
Let test_note_event pass in timezones other than +00:00
Sunah Suh [Fri, 18 Jul 2014 04:27:15 +0000 (23:27 -0500)]
Remove myopenid from openid providers
Tom Hughes [Wed, 23 Jul 2014 23:23:45 +0000 (00:23 +0100)]
Fix error resolving relation parents
It's not entirely clear why specifying the foreign key explicitly
fixes this - the value given is what it should default to - but
without this it finds the child relation instead when looking at
the parents of a relation.
Fixes #789
Tom Hughes [Tue, 22 Jul 2014 14:13:36 +0000 (15:13 +0100)]
Force the path to be treated as UTF-8
Tom Hughes [Mon, 21 Jul 2014 07:57:15 +0000 (08:57 +0100)]
Update bundle
Tom Hughes [Mon, 21 Jul 2014 07:53:44 +0000 (08:53 +0100)]
Merge branch 'rails41'
Florian M. Schäfer [Sun, 20 Jul 2014 05:35:36 +0000 (07:35 +0200)]
Added tests for wikidata links in the browse helper
Florian M. Schäfer [Sun, 20 Jul 2014 05:33:59 +0000 (07:33 +0200)]
Added wikidata links to the browse helper
Analogous to wikipedia tags this links any wikidata tag with its item
page on wikidata.
For now it's restricted to the plain wikidata=* tag (namespaces like
operator:wikidata=* and similar are not yet supported) and only accepts
the values with the format Q<number>.
John Firebaugh [Tue, 15 Jul 2014 23:53:21 +0000 (16:53 -0700)]
Update to iD v1.5.2
Shaun McDonald [Mon, 14 Jul 2014 11:49:48 +0000 (12:49 +0100)]
The rubygem is called bundler not bundle
Also I'm that needs to be installed with sudo as gems won't normally install into the home user directory without more setup
Tom Hughes [Fri, 11 Jul 2014 19:00:52 +0000 (20:00 +0100)]
Update "Metro Extracts" link
Fixes #780
John Firebaugh [Thu, 10 Jul 2014 17:13:01 +0000 (10:13 -0700)]
Update to iD v1.5.1
Aaron Lidman [Wed, 9 Jul 2014 00:07:33 +0000 (20:07 -0400)]
Update to iD v1.5.0
Tom Hughes [Fri, 4 Jul 2014 18:58:03 +0000 (19:58 +0100)]
Remove debug statement
Tom Hughes [Thu, 26 Jun 2014 20:16:31 +0000 (21:16 +0100)]
Update to rails 4.1.4
Tom Hughes [Wed, 28 May 2014 08:55:34 +0000 (09:55 +0100)]
Don't assume we know what ID the new block will have
Tom Hughes [Tue, 27 May 2014 23:44:26 +0000 (00:44 +0100)]
Update for API change in CPK 7.x
Tom Hughes [Sat, 24 May 2014 23:24:41 +0000 (00:24 +0100)]
Make sure all environment can see asset precompilation rules
Tom Hughes [Tue, 13 May 2014 18:25:06 +0000 (19:25 +0100)]
Make sure we restore I18n.locale when tests complete
Tom Hughes [Tue, 13 May 2014 18:21:01 +0000 (19:21 +0100)]
Sort tags alphabetically for consistent results
Tom Hughes [Thu, 24 Apr 2014 23:43:24 +0000 (00:43 +0100)]
Update postgres connection adaptor patches
Tom Hughes [Thu, 24 Apr 2014 23:20:05 +0000 (00:20 +0100)]
Rename Trace#public to Trace#visible_to_all
Tom Hughes [Thu, 24 Apr 2014 23:16:35 +0000 (00:16 +0100)]
Rename User#public to User#identifiable