]> git.openstreetmap.org Git - rails.git/log
rails.git
9 years agoMerge pull request #31 from zerebubuth/routing-ui-tweaks-2
Richard Fairhurst [Mon, 26 Jan 2015 18:50:41 +0000 (18:50 +0000)]
Merge pull request #31 from zerebubuth/routing-ui-tweaks-2

Make directions endpoints own the value and not care which input box the...

9 years agoMake directions endpoints own the value and not care which input box they get it...
Matt Amos [Mon, 26 Jan 2015 18:47:34 +0000 (18:47 +0000)]
Make directions endpoints own the value and not care which input box they get it from.

9 years agoMerge pull request #30 from zerebubuth/routing-ui-tweaks-2
Richard Fairhurst [Mon, 26 Jan 2015 18:04:56 +0000 (18:04 +0000)]
Merge pull request #30 from zerebubuth/routing-ui-tweaks-2

Use CSS rather than HTML attributes for styling.

9 years agoUse CSS rather than HTML attributes for styling.
Matt Amos [Mon, 26 Jan 2015 18:02:00 +0000 (18:02 +0000)]
Use CSS rather than HTML attributes for styling.

9 years agoMerge pull request #29 from zerebubuth/routing-ui-tweaks-2
Richard Fairhurst [Mon, 26 Jan 2015 17:55:19 +0000 (17:55 +0000)]
Merge pull request #29 from zerebubuth/routing-ui-tweaks-2

Revert some of the selection styling changes which cause bizarre styling...

9 years agoRevert some of the selection styling changes which cause bizarre styling regressions...
Matt Amos [Mon, 26 Jan 2015 17:53:24 +0000 (17:53 +0000)]
Revert some of the selection styling changes which cause bizarre styling regressions to the 80s on FF.

9 years agoMerge pull request #28 from zerebubuth/routing-ui-tweaks-2
Richard Fairhurst [Mon, 26 Jan 2015 17:26:46 +0000 (17:26 +0000)]
Merge pull request #28 from zerebubuth/routing-ui-tweaks-2

Routing UI tweaks, part deux

9 years agoUse larger 'spinner' when waiting for route request. Replace HTML in content to avoid...
Matt Amos [Mon, 26 Jan 2015 17:18:32 +0000 (17:18 +0000)]
Use larger 'spinner' when waiting for route request. Replace HTML in content to avoid resize.

9 years agoFix vertical alignment of text within select input on Firefox.
Matt Amos [Mon, 26 Jan 2015 16:57:34 +0000 (16:57 +0000)]
Fix vertical alignment of text within select input on Firefox.

9 years agoHide route steps sidebar when user presses close button.
Matt Amos [Mon, 26 Jan 2015 15:39:53 +0000 (15:39 +0000)]
Hide route steps sidebar when user presses close button.

9 years agoGeocode pre-filled values when the user presses 'Go'.
Matt Amos [Mon, 26 Jan 2015 15:39:21 +0000 (15:39 +0000)]
Geocode pre-filled values when the user presses 'Go'.

9 years agoMake close button on route dialogue return to index.
Matt Amos [Mon, 26 Jan 2015 15:02:55 +0000 (15:02 +0000)]
Make close button on route dialogue return to index.

9 years agoPre-fill directions 'from' field with search query, if any.
Matt Amos [Mon, 26 Jan 2015 14:52:18 +0000 (14:52 +0000)]
Pre-fill directions 'from' field with search query, if any.

9 years agoMerge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2
Matt Amos [Mon, 26 Jan 2015 13:14:58 +0000 (13:14 +0000)]
Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2

Conflicts:
config/locales/de.yml

9 years agoMerge pull request #27 from danstowell/jsrouting-topclosebox
Richard Fairhurst [Sun, 25 Jan 2015 16:18:50 +0000 (16:18 +0000)]
Merge pull request #27 from danstowell/jsrouting-topclosebox

Use 'close-box' appearance (less confusing) for exit-from-directions

9 years agoUse 'close-box' appearance (less confusing) for exit-from-directions
Dan Stowell [Sat, 24 Jan 2015 13:27:17 +0000 (13:27 +0000)]
Use 'close-box' appearance (less confusing) for exit-from-directions

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 19 Jan 2015 08:35:56 +0000 (09:35 +0100)]
Localisation updates from https://translatewiki.net.

9 years agoOnly log at info level in production
Tom Hughes [Sun, 18 Jan 2015 19:43:21 +0000 (19:43 +0000)]
Only log at info level in production

9 years agoVagrant deploy works
Amir Wilf [Sun, 18 Jan 2015 12:14:53 +0000 (14:14 +0200)]
Vagrant deploy works

Creating extension btree_gist for test DB 'osm_test'

9 years agoMerge branch 'rails42'
Tom Hughes [Sat, 17 Jan 2015 11:09:13 +0000 (11:09 +0000)]
Merge branch 'rails42'

9 years agoUpdate old changesets to subscribe the creator
Tom Hughes [Sun, 11 Jan 2015 19:37:15 +0000 (19:37 +0000)]
Update old changesets to subscribe the creator

9 years agoRemove some (hopefully) redundant code
Tom Hughes [Sat, 10 Jan 2015 15:54:58 +0000 (15:54 +0000)]
Remove some (hopefully) redundant code

9 years agoDon't try and match xmlns as an attribute
Tom Hughes [Sat, 10 Jan 2015 15:36:44 +0000 (15:36 +0000)]
Don't try and match xmlns as an attribute

This doesn't seem to work with the new nokogiri based matching
in rails 4.2 probably because the attribute is removed by the
parser and used to set the namespace of the element.

9 years agoSet default formats in the database now that rails handles enums
Tom Hughes [Sat, 10 Jan 2015 15:34:03 +0000 (15:34 +0000)]
Set default formats in the database now that rails handles enums

Because rails now reads the defaults from the database correctly it
no longer works to set them conditionally in after_initialise as they
have already been set.

9 years agoUpdated for changes in rails HTML testing
Tom Hughes [Sat, 10 Jan 2015 12:40:41 +0000 (12:40 +0000)]
Updated for changes in rails HTML testing

9 years agoReplace deprecated reset method with restore method
Tom Hughes [Sat, 10 Jan 2015 12:37:52 +0000 (12:37 +0000)]
Replace deprecated reset method with restore method

9 years agoReplace deprecated deliver method with deliver_now
Tom Hughes [Sat, 10 Jan 2015 11:46:57 +0000 (11:46 +0000)]
Replace deprecated deliver method with deliver_now

9 years agoCleanup migrations
Tom Hughes [Sat, 10 Jan 2015 11:45:39 +0000 (11:45 +0000)]
Cleanup migrations

Cleanup our migrations, replacing as much of our custom code
and monkey patching with modern standard rails methods.

9 years agoUpdate to rails 4.2.0
Tom Hughes [Sat, 20 Dec 2014 15:08:16 +0000 (15:08 +0000)]
Update to rails 4.2.0

9 years agoFix invalid CSS selectors
Tom Hughes [Sat, 10 Jan 2015 17:38:32 +0000 (17:38 +0000)]
Fix invalid CSS selectors

9 years agoRestore removal of div and style elements when sanitizing HTML
Tom Hughes [Sat, 10 Jan 2015 17:37:15 +0000 (17:37 +0000)]
Restore removal of div and style elements when sanitizing HTML

9 years agoFix login tests to check whether logins succeed/fail as expected
Tom Hughes [Sat, 10 Jan 2015 17:04:58 +0000 (17:04 +0000)]
Fix login tests to check whether logins succeed/fail as expected

9 years agoUse correct URL
Tom Hughes [Sat, 10 Jan 2015 16:51:28 +0000 (16:51 +0000)]
Use correct URL

9 years agoFix broken translations
Tom Hughes [Sat, 10 Jan 2015 15:51:41 +0000 (15:51 +0000)]
Fix broken translations

9 years agoUse assert_dom_equal to compare HTML text
Tom Hughes [Sat, 10 Jan 2015 15:20:20 +0000 (15:20 +0000)]
Use assert_dom_equal to compare HTML text

9 years agoFix invalid CSS selectors
Tom Hughes [Sat, 10 Jan 2015 15:19:28 +0000 (15:19 +0000)]
Fix invalid CSS selectors

9 years agoDon't pass ActiveRecord objects to find and exists?
Tom Hughes [Sat, 10 Jan 2015 12:35:52 +0000 (12:35 +0000)]
Don't pass ActiveRecord objects to find and exists?

9 years agoFix invalid CSS selectors
Tom Hughes [Sat, 10 Jan 2015 12:33:36 +0000 (12:33 +0000)]
Fix invalid CSS selectors

9 years agoRemove unused performance test stub
Tom Hughes [Sat, 10 Jan 2015 11:48:35 +0000 (11:48 +0000)]
Remove unused performance test stub

9 years agoUpdate to rails 4.1.9
Tom Hughes [Thu, 8 Jan 2015 10:06:22 +0000 (10:06 +0000)]
Update to rails 4.1.9

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Fri, 2 Jan 2015 10:04:15 +0000 (11:04 +0100)]
Localisation updates from https://translatewiki.net.

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sat, 27 Dec 2014 16:05:10 +0000 (17:05 +0100)]
Localisation updates from https://translatewiki.net.

9 years agoUpdate Potlatch 2 to 2.3-650-gad99430 build
Tom Hughes [Sat, 20 Dec 2014 11:41:47 +0000 (11:41 +0000)]
Update Potlatch 2 to 2.3-650-gad99430 build

9 years agoDon't raise APIAlreadyDeletedError when deleting with if-unused
Bryan Housel [Tue, 16 Dec 2014 04:39:46 +0000 (23:39 -0500)]
Don't raise APIAlreadyDeletedError when deleting with if-unused
related: openstreetmap/iD#2475

9 years agoDon't render the offline page for XHR requests
Tom Hughes [Sun, 14 Dec 2014 00:28:26 +0000 (00:28 +0000)]
Don't render the offline page for XHR requests

9 years agoMake development mode work when the database is offline
Tom Hughes [Sun, 14 Dec 2014 00:27:48 +0000 (00:27 +0000)]
Make development mode work when the database is offline

9 years agoDisable the "add note" button in database offline mode
Tom Hughes [Sun, 14 Dec 2014 00:27:31 +0000 (00:27 +0000)]
Disable the "add note" button in database offline mode

9 years agoQuery mode doesn't need the database
Tom Hughes [Sun, 14 Dec 2014 00:18:46 +0000 (00:18 +0000)]
Query mode doesn't need the database

9 years agoUpdate bundle
Tom Hughes [Mon, 8 Dec 2014 08:02:00 +0000 (08:02 +0000)]
Update bundle

9 years agoRemove unnecessary local variable
Adam Conrad [Mon, 8 Dec 2014 00:04:21 +0000 (19:04 -0500)]
Remove unnecessary local variable

The local variable `app` was unused and therefore not needed
to be declared with initialization

9 years agoLosslessly compressed all images using optipng and advpng
David Gumberg [Mon, 8 Dec 2014 00:36:39 +0000 (16:36 -0800)]
Losslessly compressed all images using optipng and advpng

9 years agoMerge pull request #26 from karussell/patch-2
Richard Fairhurst [Sat, 6 Dec 2014 17:11:04 +0000 (17:11 +0000)]
Merge pull request #26 from karussell/patch-2

Using HTTPS for GraphHopper

9 years agoUsing HTTPS for GraphHopper
Peter [Sat, 6 Dec 2014 17:09:18 +0000 (18:09 +0100)]
Using HTTPS for GraphHopper

this avoids information leaking if used via https://openstreetmap.org and it should not be a problem when using via the HTTP variant

9 years agoFix typo
Sean Hussey [Wed, 3 Dec 2014 16:24:07 +0000 (11:24 -0500)]
Fix typo

9 years agoFix exception when message limit is hit
Tom Hughes [Tue, 2 Dec 2014 21:29:12 +0000 (21:29 +0000)]
Fix exception when message limit is hit

10 years agoPrefer a key=value match over a key only match for object descriptions
Tom Hughes [Mon, 24 Nov 2014 11:00:24 +0000 (11:00 +0000)]
Prefer a key=value match over a key only match for object descriptions

10 years agoInclude number of recent diary entries in spam scoring
Tom Hughes [Thu, 20 Nov 2014 21:18:00 +0000 (21:18 +0000)]
Include number of recent diary entries in spam scoring

10 years agoMake sure button_to buttons are separated by whitespace
Tom Hughes [Wed, 19 Nov 2014 00:21:58 +0000 (00:21 +0000)]
Make sure button_to buttons are separated by whitespace

10 years agoDon't paginate redactions
Tom Hughes [Wed, 19 Nov 2014 00:11:51 +0000 (00:11 +0000)]
Don't paginate redactions

The index view doesn't render any pagination controls, and there
aren't enough redactions for pagination to be necessary yet.

Fixes #735

10 years agoUpdate ohauth
Tom Hughes [Tue, 18 Nov 2014 17:58:45 +0000 (17:58 +0000)]
Update ohauth

10 years agoUpdate jQuery plugins
Tom Hughes [Tue, 18 Nov 2014 17:57:21 +0000 (17:57 +0000)]
Update jQuery plugins

10 years agoUpdate html5shiv
Tom Hughes [Tue, 18 Nov 2014 17:57:09 +0000 (17:57 +0000)]
Update html5shiv

10 years agoUpdate vendor URLs
Tom Hughes [Tue, 18 Nov 2014 17:56:42 +0000 (17:56 +0000)]
Update vendor URLs

10 years agoUpdate attribution for embedded maps
Tom Hughes [Tue, 18 Nov 2014 17:41:45 +0000 (17:41 +0000)]
Update attribution for embedded maps

Fixes #838

10 years agoUpdate to rails 4.1.8
Tom Hughes [Mon, 17 Nov 2014 19:09:22 +0000 (19:09 +0000)]
Update to rails 4.1.8

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Fri, 14 Nov 2014 12:56:13 +0000 (13:56 +0100)]
Localisation updates from https://translatewiki.net.

10 years agoMerge pull request #25 from zerebubuth/routing-ui-tweaks
Richard Fairhurst [Wed, 12 Nov 2014 18:32:04 +0000 (18:32 +0000)]
Merge pull request #25 from zerebubuth/routing-ui-tweaks

Routing UI tweaks

10 years agoStringify user ID
Tom Hughes [Wed, 12 Nov 2014 09:44:21 +0000 (09:44 +0000)]
Stringify user ID

10 years agoConsolidated list highlight colours to one parameter.
Matt Amos [Mon, 10 Nov 2014 20:05:54 +0000 (20:05 +0000)]
Consolidated list highlight colours to one parameter.

10 years agoMade top & bottom spacing in directions list consistent.
Matt Amos [Mon, 10 Nov 2014 19:59:02 +0000 (19:59 +0000)]
Made top & bottom spacing in directions list consistent.

10 years agoAdded some vertical space in the routing text input boxes.
Matt Amos [Mon, 10 Nov 2014 19:36:43 +0000 (19:36 +0000)]
Added some vertical space in the routing text input boxes.

10 years agoUse buttons for switching to/from directions.
Matt Amos [Mon, 10 Nov 2014 19:17:21 +0000 (19:17 +0000)]
Use buttons for switching to/from directions.

Previously, used a small text link which wasn't very usable. Now
it uses larger buttons which are (hopefully) more usable. Also
this sorts out the weird right-hanging text boxes for the to/from
in the directions sidebar - now they look like proper text input
boxes.

However, the "back to search" button and the directions submit
buttons are weirdly large and I don't quite understand why.
Hopefully an easy fix for someone who knows the arcana of CSS
better than I.

10 years agoMerge remote-tracking branch 'upstream/master' into routing-merge
Matt Amos [Mon, 10 Nov 2014 16:14:06 +0000 (16:14 +0000)]
Merge remote-tracking branch 'upstream/master' into routing-merge

Conflicts:
app/assets/javascripts/index.js
config/locales/en.yml

10 years agoRevert "Add SOTM advert"
Tom Hughes [Sun, 9 Nov 2014 23:03:04 +0000 (23:03 +0000)]
Revert "Add SOTM advert"

This reverts commit 15a7276a9f50821a7728b4da3af16849284f251b.

10 years agoUpdate to rails 4.1.7
Tom Hughes [Sun, 9 Nov 2014 22:41:12 +0000 (22:41 +0000)]
Update to rails 4.1.7

10 years agoTrack users in piwik
Tom Hughes [Sun, 9 Nov 2014 22:41:01 +0000 (22:41 +0000)]
Track users in piwik

10 years agoHandle unknown admin_level values
Tom Hughes [Fri, 7 Nov 2014 19:17:34 +0000 (19:17 +0000)]
Handle unknown admin_level values

10 years agoAllow query mode to be turned off at low zoom
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

10 years agoLook for locale specific names
Tom Hughes [Fri, 7 Nov 2014 15:19:30 +0000 (15:19 +0000)]
Look for locale specific names

10 years agoDon't do the admin boundary special case unless admin_level is set
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

10 years agoMerge branch 'overpass'
Tom Hughes [Fri, 7 Nov 2014 08:40:18 +0000 (08:40 +0000)]
Merge branch 'overpass'

10 years agoRecommend PostgreSQL 9.1+ in database.yml
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.

10 years agoLink to Phusion Passenger docs for production
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.

10 years agoAdd KSJ2 tags to uninteresting list
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.

10 years agoDon't enable query mode when loading a query URL
Tom Hughes [Wed, 5 Nov 2014 20:19:21 +0000 (20:19 +0000)]
Don't enable query mode when loading a query URL

10 years agoAdd comments_feed action to various filters
Tom Hughes [Wed, 5 Nov 2014 20:34:45 +0000 (20:34 +0000)]
Add comments_feed action to various filters

Fixes #825

10 years agoAllow query mode to be disabled when the sidebar is open
Tom Hughes [Wed, 5 Nov 2014 13:57:52 +0000 (13:57 +0000)]
Allow query mode to be disabled when the sidebar is open

10 years agoLeave overpass result links coloured blue
Dan Stowell [Mon, 13 Oct 2014 20:17:12 +0000 (21:17 +0100)]
Leave overpass result links coloured blue

Closes #47.

10 years agoSort enclosing features by size
Tom Hughes [Tue, 4 Nov 2014 09:55:26 +0000 (09:55 +0000)]
Sort enclosing features by size

10 years agoAdd some missing browse icons
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.

10 years agoMerge pull request #24 from zerebubuth/routing-merge
Richard Fairhurst [Mon, 3 Nov 2014 11:33:08 +0000 (11:33 +0000)]
Merge pull request #24 from zerebubuth/routing-merge

Routing merge

10 years agoMerge remote-tracking branch 'upstream/master' into routing
Matt Amos [Mon, 3 Nov 2014 11:08:13 +0000 (11:08 +0000)]
Merge remote-tracking branch 'upstream/master' into routing

Conflicts:
app/assets/javascripts/index.js
app/assets/javascripts/leaflet.map.js.erb
config/environments/production.rb
config/locales/de.yml

10 years agoDon't centre on load if the location is already in view
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

10 years agoUse new overpass geometry output support to get geometeries
Tom Hughes [Sat, 1 Nov 2014 16:11:12 +0000 (16:11 +0000)]
Use new overpass geometry output support to get geometeries

10 years agoMerge branch 'master' into overpass
Tom Hughes [Sat, 1 Nov 2014 12:46:42 +0000 (12:46 +0000)]
Merge branch 'master' into overpass

10 years agoMerge branch 'comments'
Tom Hughes [Sat, 1 Nov 2014 11:43:21 +0000 (11:43 +0000)]
Merge branch 'comments'

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 27 Oct 2014 17:58:16 +0000 (18:58 +0100)]
Localisation updates from https://translatewiki.net.

10 years agoFixes for offline mode
Tom Hughes [Sun, 26 Oct 2014 11:39:00 +0000 (11:39 +0000)]
Fixes for offline mode

10 years agoUpdate to iD v1.6.2
John Firebaugh [Fri, 24 Oct 2014 16:26:09 +0000 (09:26 -0700)]
Update to iD v1.6.2

10 years agoUpdate to iD v1.6.1
John Firebaugh [Thu, 23 Oct 2014 22:29:26 +0000 (15:29 -0700)]
Update to iD v1.6.1