]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Mon, 16 Feb 2015 21:48:08 +0000 (21:48 +0000)]
Avoid mixed content warnings for the MapQuest logo
Tom Hughes [Mon, 16 Feb 2015 21:46:54 +0000 (21:46 +0000)]
Avoid mixed content warnings when routing queries Nominatim
Tom Hughes [Mon, 16 Feb 2015 08:30:29 +0000 (08:30 +0000)]
Merge remote-tracking branch 'systemed/routing'
Bryan Housel [Thu, 12 Feb 2015 11:37:53 +0000 (06:37 -0500)]
fix version in iD.js
Bryan Housel [Thu, 12 Feb 2015 10:57:12 +0000 (05:57 -0500)]
Update iD container to support iD 1.7.0
Bryan Housel [Thu, 12 Feb 2015 10:41:04 +0000 (05:41 -0500)]
Update to iD v1.7.0
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.
Tom Hughes [Wed, 11 Feb 2015 19:18:13 +0000 (19:18 +0000)]
Add asset wrappers for iD
nebulon42 [Sun, 8 Feb 2015 13:54:46 +0000 (14:54 +0100)]
update browse symbols changed in osm-carto 2.28.0
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
Dan Stowell [Sun, 8 Feb 2015 11:11:53 +0000 (11:11 +0000)]
jsrouting: don't close the smallscreen header until both geocodes entered
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
Tom Hughes [Sat, 7 Feb 2015 12:02:42 +0000 (12:02 +0000)]
Add basic tests for the directions controller
Keith O'Faoláin [Thu, 5 Feb 2015 22:48:56 +0000 (22:48 +0000)]
Updated about text
Changed hundreds to thousands
nebulon42 [Thu, 5 Feb 2015 21:05:28 +0000 (22:05 +0100)]
update browse symbols changed in osm-carto 2.27.0
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
Richard Fairhurst [Mon, 2 Feb 2015 01:32:48 +0000 (01:32 +0000)]
Use document.location.protocol for OSRM
Richard Fairhurst [Mon, 2 Feb 2015 01:31:08 +0000 (01:31 +0000)]
OSRM and Graphhopper support HTTPS
Tom Hughes [Sun, 1 Feb 2015 21:41:06 +0000 (21:41 +0000)]
Extend https support to all three routing engines
Richard Fairhurst [Sun, 1 Feb 2015 15:22:15 +0000 (15:22 +0000)]
Merge pull request #33 from tomhughes/routing
Routing tweaks
Tom Hughes [Sun, 1 Feb 2015 15:10:21 +0000 (15:10 +0000)]
Merge branch 'master' into routing
Tom Hughes [Sun, 1 Feb 2015 15:09:15 +0000 (15:09 +0000)]
Update to latest upstream polyline decoder
Tom Hughes [Sun, 1 Feb 2015 14:50:18 +0000 (14:50 +0000)]
There is no routing.js to compile
Tom Hughes [Sun, 1 Feb 2015 14:18:16 +0000 (14:18 +0000)]
Remove typo
Tom Hughes [Sun, 1 Feb 2015 14:10:15 +0000 (14:10 +0000)]
Set foreground colour for input fields
Tom Hughes [Sun, 1 Feb 2015 12:56:51 +0000 (12:56 +0000)]
Rename directions_engines to directions
Tom Hughes [Sun, 1 Feb 2015 12:54:56 +0000 (12:54 +0000)]
Remove unused images
Tom Hughes [Sun, 1 Feb 2015 12:50:17 +0000 (12:50 +0000)]
Clear old routes when the route panel is reopened
Tom Hughes [Sun, 1 Feb 2015 12:15:49 +0000 (12:15 +0000)]
Move routing "Go" button up alongside the dropdown
Tom Hughes [Sun, 1 Feb 2015 11:32:02 +0000 (11:32 +0000)]
Merge branch 'master' into routing
Tom Hughes [Sun, 1 Feb 2015 11:29:38 +0000 (11:29 +0000)]
Add some padding to select elements
Tom Hughes [Sun, 1 Feb 2015 10:50:50 +0000 (10:50 +0000)]
Drop redundant css extension from scss files
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.
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
Sarah Hoffmann [Sat, 31 Jan 2015 21:36:28 +0000 (22:36 +0100)]
update list of key-value pairs for nominatim
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
Tom Hughes [Mon, 26 Jan 2015 22:43:52 +0000 (22:43 +0000)]
Fix broken interpolation
Siebrand Mazeland [Mon, 26 Jan 2015 22:03:30 +0000 (23:03 +0100)]
Localisation updates from https://translatewiki.net.
Dan Stowell [Mon, 26 Jan 2015 20:48:01 +0000 (20:48 +0000)]
fix typo which prevented directions closebox from working
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...
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.
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.
Matt Amos [Mon, 26 Jan 2015 18:02:00 +0000 (18:02 +0000)]
Use CSS rather than HTML attributes for styling.
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...
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.
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
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.
Matt Amos [Mon, 26 Jan 2015 16:57:34 +0000 (16:57 +0000)]
Fix vertical alignment of text within select input on Firefox.
Matt Amos [Mon, 26 Jan 2015 15:39:53 +0000 (15:39 +0000)]
Hide route steps sidebar when user presses close button.
Matt Amos [Mon, 26 Jan 2015 15:39:21 +0000 (15:39 +0000)]
Geocode pre-filled values when the user presses 'Go'.
Matt Amos [Mon, 26 Jan 2015 15:02:55 +0000 (15:02 +0000)]
Make close button on route dialogue return to index.
Matt Amos [Mon, 26 Jan 2015 14:52:18 +0000 (14:52 +0000)]
Pre-fill directions 'from' field with search query, if any.
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
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
Dan Stowell [Sat, 24 Jan 2015 13:27:17 +0000 (13:27 +0000)]
Use 'close-box' appearance (less confusing) for exit-from-directions
Siebrand Mazeland [Mon, 19 Jan 2015 08:35:56 +0000 (09:35 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 18 Jan 2015 19:43:21 +0000 (19:43 +0000)]
Only log at info level in production
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'
Tom Hughes [Sat, 17 Jan 2015 11:09:13 +0000 (11:09 +0000)]
Merge branch 'rails42'
Tom Hughes [Sun, 11 Jan 2015 19:37:15 +0000 (19:37 +0000)]
Update old changesets to subscribe the creator
Tom Hughes [Sat, 10 Jan 2015 15:54:58 +0000 (15:54 +0000)]
Remove some (hopefully) redundant code
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.
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.
Tom Hughes [Sat, 10 Jan 2015 12:40:41 +0000 (12:40 +0000)]
Updated for changes in rails HTML testing
Tom Hughes [Sat, 10 Jan 2015 12:37:52 +0000 (12:37 +0000)]
Replace deprecated reset method with restore method
Tom Hughes [Sat, 10 Jan 2015 11:46:57 +0000 (11:46 +0000)]
Replace deprecated deliver method with deliver_now
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.
Tom Hughes [Sat, 20 Dec 2014 15:08:16 +0000 (15:08 +0000)]
Update to rails 4.2.0
Tom Hughes [Sat, 10 Jan 2015 17:38:32 +0000 (17:38 +0000)]
Fix invalid CSS selectors
Tom Hughes [Sat, 10 Jan 2015 17:37:15 +0000 (17:37 +0000)]
Restore removal of div and style elements when sanitizing HTML
Tom Hughes [Sat, 10 Jan 2015 17:04:58 +0000 (17:04 +0000)]
Fix login tests to check whether logins succeed/fail as expected
Tom Hughes [Sat, 10 Jan 2015 16:51:28 +0000 (16:51 +0000)]
Use correct URL
Tom Hughes [Sat, 10 Jan 2015 15:51:41 +0000 (15:51 +0000)]
Fix broken translations
Tom Hughes [Sat, 10 Jan 2015 15:20:20 +0000 (15:20 +0000)]
Use assert_dom_equal to compare HTML text
Tom Hughes [Sat, 10 Jan 2015 15:19:28 +0000 (15:19 +0000)]
Fix invalid CSS selectors
Tom Hughes [Sat, 10 Jan 2015 12:35:52 +0000 (12:35 +0000)]
Don't pass ActiveRecord objects to find and exists?
Tom Hughes [Sat, 10 Jan 2015 12:33:36 +0000 (12:33 +0000)]
Fix invalid CSS selectors
Tom Hughes [Sat, 10 Jan 2015 11:48:35 +0000 (11:48 +0000)]
Remove unused performance test stub
Tom Hughes [Thu, 8 Jan 2015 10:06:22 +0000 (10:06 +0000)]
Update to rails 4.1.9
Siebrand Mazeland [Fri, 2 Jan 2015 10:04:15 +0000 (11:04 +0100)]
Localisation updates from https://translatewiki.net.
Siebrand Mazeland [Sat, 27 Dec 2014 16:05:10 +0000 (17:05 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 20 Dec 2014 11:41:47 +0000 (11:41 +0000)]
Update Potlatch 2 to
2.3-650-gad99430 build
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
Tom Hughes [Sun, 14 Dec 2014 00:28:26 +0000 (00:28 +0000)]
Don't render the offline page for XHR requests
Tom Hughes [Sun, 14 Dec 2014 00:27:48 +0000 (00:27 +0000)]
Make development mode work when the database is offline
Tom Hughes [Sun, 14 Dec 2014 00:27:31 +0000 (00:27 +0000)]
Disable the "add note" button in database offline mode
Tom Hughes [Sun, 14 Dec 2014 00:18:46 +0000 (00:18 +0000)]
Query mode doesn't need the database
Tom Hughes [Mon, 8 Dec 2014 08:02:00 +0000 (08:02 +0000)]
Update bundle
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
David Gumberg [Mon, 8 Dec 2014 00:36:39 +0000 (16:36 -0800)]
Losslessly compressed all images using optipng and advpng
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
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
Sean Hussey [Wed, 3 Dec 2014 16:24:07 +0000 (11:24 -0500)]
Fix typo
Tom Hughes [Tue, 2 Dec 2014 21:29:12 +0000 (21:29 +0000)]
Fix exception when message limit is hit
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
Tom Hughes [Thu, 20 Nov 2014 21:18:00 +0000 (21:18 +0000)]
Include number of recent diary entries in spam scoring
Tom Hughes [Wed, 19 Nov 2014 00:21:58 +0000 (00:21 +0000)]
Make sure button_to buttons are separated by whitespace
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
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