]> git.openstreetmap.org Git - rails.git/log
rails.git
9 years agofix version in iD.js
Bryan Housel [Thu, 12 Feb 2015 11:37:53 +0000 (06:37 -0500)]
fix version in iD.js

9 years agoUpdate iD container to support iD 1.7.0
Bryan Housel [Thu, 12 Feb 2015 10:57:12 +0000 (05:57 -0500)]
Update iD container to support iD 1.7.0

9 years agoUpdate to iD v1.7.0
Bryan Housel [Thu, 12 Feb 2015 10:41:04 +0000 (05:41 -0500)]
Update to iD v1.7.0

9 years agoWrap flash messages in a div instead of a paragraph
Tom Hughes [Wed, 11 Feb 2015 21:26:22 +0000 (21:26 +0000)]
Wrap flash messages in a div instead of a paragraph

This allows more complex HTML in the message, closing #896.

9 years agoAdd asset wrappers for iD
Tom Hughes [Wed, 11 Feb 2015 19:18:13 +0000 (19:18 +0000)]
Add asset wrappers for iD

9 years agoupdate browse symbols changed in osm-carto 2.28.0
nebulon42 [Sun, 8 Feb 2015 13:54:46 +0000 (14:54 +0100)]
update browse symbols changed in osm-carto 2.28.0

9 years agoMerge pull request #36 from danstowell/jsrouting-closeheaderlater
Richard Fairhurst [Sun, 8 Feb 2015 12:59:59 +0000 (12:59 +0000)]
Merge pull request #36 from danstowell/jsrouting-closeheaderlater

jsrouting: don't close the smallscreen header until both geocodes entered

9 years agojsrouting: don't close the smallscreen header until both geocodes entered
Dan Stowell [Sun, 8 Feb 2015 11:11:53 +0000 (11:11 +0000)]
jsrouting: don't close the smallscreen header until both geocodes entered

9 years agoMerge pull request #35 from tomhughes/routing
Richard Fairhurst [Sat, 7 Feb 2015 12:34:38 +0000 (12:34 +0000)]
Merge pull request #35 from tomhughes/routing

Add basic tests for the directions controller

9 years agoAdd basic tests for the directions controller
Tom Hughes [Sat, 7 Feb 2015 12:02:42 +0000 (12:02 +0000)]
Add basic tests for the directions controller

9 years agoupdate browse symbols changed in osm-carto 2.27.0
nebulon42 [Thu, 5 Feb 2015 21:05:28 +0000 (22:05 +0100)]
update browse symbols changed in osm-carto 2.27.0

9 years agoMerge pull request #34 from tomhughes/routing
Richard Fairhurst [Mon, 2 Feb 2015 14:21:08 +0000 (14:21 +0000)]
Merge pull request #34 from tomhughes/routing

Extend https support to all three routing engines

9 years agoUse document.location.protocol for OSRM
Richard Fairhurst [Mon, 2 Feb 2015 01:32:48 +0000 (01:32 +0000)]
Use document.location.protocol for OSRM

9 years agoOSRM and Graphhopper support HTTPS
Richard Fairhurst [Mon, 2 Feb 2015 01:31:08 +0000 (01:31 +0000)]
OSRM and Graphhopper support HTTPS

9 years agoExtend https support to all three routing engines
Tom Hughes [Sun, 1 Feb 2015 21:41:06 +0000 (21:41 +0000)]
Extend https support to all three routing engines

9 years agoMerge pull request #33 from tomhughes/routing
Richard Fairhurst [Sun, 1 Feb 2015 15:22:15 +0000 (15:22 +0000)]
Merge pull request #33 from tomhughes/routing

Routing tweaks

9 years agoMerge branch 'master' into routing
Tom Hughes [Sun, 1 Feb 2015 15:10:21 +0000 (15:10 +0000)]
Merge branch 'master' into routing

9 years agoUpdate to latest upstream polyline decoder
Tom Hughes [Sun, 1 Feb 2015 15:09:15 +0000 (15:09 +0000)]
Update to latest upstream polyline decoder

9 years agoThere is no routing.js to compile
Tom Hughes [Sun, 1 Feb 2015 14:50:18 +0000 (14:50 +0000)]
There is no routing.js to compile

9 years agoRemove typo
Tom Hughes [Sun, 1 Feb 2015 14:18:16 +0000 (14:18 +0000)]
Remove typo

9 years agoSet foreground colour for input fields
Tom Hughes [Sun, 1 Feb 2015 14:10:15 +0000 (14:10 +0000)]
Set foreground colour for input fields

9 years agoRename directions_engines to directions
Tom Hughes [Sun, 1 Feb 2015 12:56:51 +0000 (12:56 +0000)]
Rename directions_engines to directions

9 years agoRemove unused images
Tom Hughes [Sun, 1 Feb 2015 12:54:56 +0000 (12:54 +0000)]
Remove unused images

9 years agoClear old routes when the route panel is reopened
Tom Hughes [Sun, 1 Feb 2015 12:50:17 +0000 (12:50 +0000)]
Clear old routes when the route panel is reopened

9 years agoMove routing "Go" button up alongside the dropdown
Tom Hughes [Sun, 1 Feb 2015 12:15:49 +0000 (12:15 +0000)]
Move routing "Go" button up alongside the dropdown

9 years agoMerge branch 'master' into routing
Tom Hughes [Sun, 1 Feb 2015 11:32:02 +0000 (11:32 +0000)]
Merge branch 'master' into routing

9 years agoAdd some padding to select elements
Tom Hughes [Sun, 1 Feb 2015 11:29:38 +0000 (11:29 +0000)]
Add some padding to select elements

9 years agoDrop redundant css extension from scss files
Tom Hughes [Sun, 1 Feb 2015 10:50:50 +0000 (10:50 +0000)]
Drop redundant css extension from scss files

9 years agoFix two issues with the remember_me_openid button
Thijs Alkemade [Sun, 1 Feb 2015 10:33:01 +0000 (10:33 +0000)]
Fix two issues with the remember_me_openid button

1. It didn't work, the code only checked the remember_me button, not
   the remember_me_openid button.

2. It did not have a unique id, making the label next to it not work
   for selecting the checkbox.

9 years agoDefault background for input fields to white
Tom Hughes [Sun, 1 Feb 2015 10:15:00 +0000 (10:15 +0000)]
Default background for input fields to white

Some browsers apparently default form fields to a background based
on the desktop theme, and don't inherit from body.

Fixes #883

9 years agoupdate list of key-value pairs for nominatim
Sarah Hoffmann [Sat, 31 Jan 2015 21:36:28 +0000 (22:36 +0100)]
update list of key-value pairs for nominatim

9 years agoMerge pull request #32 from danstowell/jsrouting
Richard Fairhurst [Mon, 26 Jan 2015 23:47:31 +0000 (23:47 +0000)]
Merge pull request #32 from danstowell/jsrouting

fix typo which prevented directions closebox from working

9 years agoFix broken interpolation
Tom Hughes [Mon, 26 Jan 2015 22:43:52 +0000 (22:43 +0000)]
Fix broken interpolation

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 26 Jan 2015 22:03:30 +0000 (23:03 +0100)]
Localisation updates from https://translatewiki.net.

9 years agofix typo which prevented directions closebox from working
Dan Stowell [Mon, 26 Jan 2015 20:48:01 +0000 (20:48 +0000)]
fix typo which prevented directions closebox from working

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

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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

10 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

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

10 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