rails.git
5 years agoFix some rubocop rails style issues
Tom Hughes [Wed, 25 Feb 2015 18:49:21 +0000 (18:49 +0000)]
Fix some rubocop rails style issues

5 years agoForce coordinates into bounds when using the query tool
Tom Hughes [Wed, 25 Feb 2015 11:16:10 +0000 (11:16 +0000)]
Force coordinates into bounds when using the query tool

5 years agoConvert OpenID authentication to generic third party authentication
Tom Hughes [Sun, 22 Feb 2015 12:20:04 +0000 (12:20 +0000)]
Convert OpenID authentication to generic third party authentication

5 years agoRework OpenID tests for new flows using OmniAuth mocking
Tom Hughes [Sat, 21 Feb 2015 16:41:52 +0000 (16:41 +0000)]
Rework OpenID tests for new flows using OmniAuth mocking

5 years agoConvert OpenID authentication to use OmniAuth
Tom Hughes [Sat, 21 Feb 2015 12:41:42 +0000 (12:41 +0000)]
Convert OpenID authentication to use OmniAuth

5 years agoSet fixture class when using gpx_files
Tom Hughes [Wed, 25 Feb 2015 01:06:55 +0000 (01:06 +0000)]
Set fixture class when using gpx_files

5 years agoAdd rails cops to rubocop todo
Tom Hughes [Wed, 25 Feb 2015 00:32:12 +0000 (00:32 +0000)]
Add rails cops to rubocop todo

5 years agoFix more rubocop style issues
Tom Hughes [Tue, 24 Feb 2015 20:45:55 +0000 (20:45 +0000)]
Fix more rubocop style issues

5 years agoAdd JSHint to travis configuration
Tom Hughes [Tue, 24 Feb 2015 19:45:43 +0000 (19:45 +0000)]
Add JSHint to travis configuration

5 years agoFix remaining JSHint issues
Tom Hughes [Tue, 24 Feb 2015 19:45:10 +0000 (19:45 +0000)]
Fix remaining JSHint issues

5 years agoFix path for icons in the leaflet images directory
Tom Hughes [Tue, 24 Feb 2015 17:04:25 +0000 (17:04 +0000)]
Fix path for icons in the leaflet images directory

Fixes #910

5 years agoRestore templating to embed.js
Tom Hughes [Tue, 24 Feb 2015 12:42:18 +0000 (12:42 +0000)]
Restore templating to embed.js

The embed.js file is special because it is used standalone without the
rest of our javascript environment. Closes #909.

5 years agoFix some more JSHint issues
Tom Hughes [Tue, 24 Feb 2015 00:30:25 +0000 (00:30 +0000)]
Fix some more JSHint issues

5 years agoMove some javascript functions out of global scope
Tom Hughes [Tue, 24 Feb 2015 00:19:08 +0000 (00:19 +0000)]
Move some javascript functions out of global scope

5 years agoMore fixes to fixture loading in tests
Tom Hughes [Mon, 23 Feb 2015 22:34:04 +0000 (22:34 +0000)]
More fixes to fixture loading in tests

5 years agoFix some JSHint complaints
Tom Hughes [Mon, 23 Feb 2015 20:47:38 +0000 (20:47 +0000)]
Fix some JSHint complaints

5 years agoAdd JSHint support
Tom Hughes [Mon, 23 Feb 2015 21:42:54 +0000 (21:42 +0000)]
Add JSHint support

5 years agoEliminate templating from most javascript
Tom Hughes [Mon, 23 Feb 2015 21:18:39 +0000 (21:18 +0000)]
Eliminate templating from most javascript

5 years agoMove querystring.js to vendor tree
Tom Hughes [Mon, 23 Feb 2015 21:44:51 +0000 (21:44 +0000)]
Move querystring.js to vendor tree

5 years agoLoad extra fixtures need for user controller tests
Tom Hughes [Sun, 22 Feb 2015 21:54:22 +0000 (21:54 +0000)]
Load extra fixtures need for user controller tests

5 years agoLoad user_roles fixtures so we know who is an administrator
Tom Hughes [Sun, 22 Feb 2015 19:44:31 +0000 (19:44 +0000)]
Load user_roles fixtures so we know who is an administrator

5 years agoLoad language fixtures before running the language tests
Tom Hughes [Sun, 22 Feb 2015 19:26:53 +0000 (19:26 +0000)]
Load language fixtures before running the language tests

5 years agoMove memcached for caching if enabled regardless of environment
Tom Hughes [Sun, 22 Feb 2015 19:10:15 +0000 (19:10 +0000)]
Move memcached for caching if enabled regardless of environment

5 years agoDrop iconv which is deprecated and only needed for ruby 1.8 support
Tom Hughes [Sun, 22 Feb 2015 15:59:29 +0000 (15:59 +0000)]
Drop iconv which is deprecated and only needed for ruby 1.8 support

5 years agoAdd travis configuration
Tom Hughes [Sun, 22 Feb 2015 15:21:44 +0000 (15:21 +0000)]
Add travis configuration

5 years agoInstall rubocop in the test environment
Tom Hughes [Sun, 22 Feb 2015 15:44:34 +0000 (15:44 +0000)]
Install rubocop in the test environment

5 years agoChange OpenID fields to be text fields
Tom Hughes [Sun, 22 Feb 2015 13:33:26 +0000 (13:33 +0000)]
Change OpenID fields to be text fields

Although technically a URL is required in practive a domain is
often enough, but browsers will reject that in a URL field.

5 years agoFix some more rubocop style issues
Tom Hughes [Fri, 20 Feb 2015 20:01:27 +0000 (20:01 +0000)]
Fix some more rubocop style issues

5 years agoStandardise on "hash rocket" style for hashes
Tom Hughes [Fri, 20 Feb 2015 19:53:13 +0000 (19:53 +0000)]
Standardise on "hash rocket" style for hashes

5 years agoStandardise on double quoted strings
Tom Hughes [Fri, 20 Feb 2015 19:42:44 +0000 (19:42 +0000)]
Standardise on double quoted strings

5 years agoFix rubocop style issues
Tom Hughes [Tue, 17 Feb 2015 22:33:21 +0000 (22:33 +0000)]
Fix rubocop style issues

5 years agoFix rubocop lint issues
Tom Hughes [Mon, 16 Feb 2015 22:44:30 +0000 (22:44 +0000)]
Fix rubocop lint issues

5 years agoFix most auto-correctable rubocop issues
Tom Hughes [Mon, 16 Feb 2015 19:02:59 +0000 (19:02 +0000)]
Fix most auto-correctable rubocop issues

5 years agoCleanup trailing whitespace
Tom Hughes [Mon, 16 Feb 2015 18:52:25 +0000 (18:52 +0000)]
Cleanup trailing whitespace

5 years agoAdd rubocop config with impressively large todo list
Tom Hughes [Mon, 16 Feb 2015 18:46:20 +0000 (18:46 +0000)]
Add rubocop config with impressively large todo list

5 years agoFixed a typo
Minh Nguyễn [Fri, 20 Feb 2015 07:44:06 +0000 (23:44 -0800)]
Fixed a typo

Admininstration → Administration

5 years agoRename new en-gb locale to en-GB
Tom Hughes [Thu, 19 Feb 2015 16:14:58 +0000 (16:14 +0000)]
Rename new en-gb locale to en-GB

5 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Thu, 19 Feb 2015 12:19:56 +0000 (13:19 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoAvoid deprecation warning in migration
Tom Hughes [Mon, 16 Feb 2015 22:53:52 +0000 (22:53 +0000)]
Avoid deprecation warning in migration

5 years agoUpdate example configuration
Tom Hughes [Mon, 16 Feb 2015 22:14:05 +0000 (22:14 +0000)]
Update example configuration

5 years agoAvoid mixed content warnings for the MapQuest logo
Tom Hughes [Mon, 16 Feb 2015 21:48:08 +0000 (21:48 +0000)]
Avoid mixed content warnings for the MapQuest logo

5 years agoAvoid mixed content warnings when routing queries Nominatim
Tom Hughes [Mon, 16 Feb 2015 21:46:54 +0000 (21:46 +0000)]
Avoid mixed content warnings when routing queries Nominatim

5 years agoMerge remote-tracking branch 'systemed/routing'
Tom Hughes [Mon, 16 Feb 2015 08:30:29 +0000 (08:30 +0000)]
Merge remote-tracking branch 'systemed/routing'

5 years agofix version in iD.js
Bryan Housel [Thu, 12 Feb 2015 11:37:53 +0000 (06:37 -0500)]
fix version in iD.js

5 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

5 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

5 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.

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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

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

5 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

5 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

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

5 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

5 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

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

5 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

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

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

5 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

5 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

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

5 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

5 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

5 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.

5 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

5 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

5 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

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

5 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.

5 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

5 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...

5 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.

5 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.

5 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.

5 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...

5 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.

5 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

5 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.

5 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.

5 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.

5 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'.

5 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.

5 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.

5 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

5 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

5 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

5 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.

5 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

5 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'

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

5 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

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