]> git.openstreetmap.org Git - rails.git/log
rails.git
9 years agoLoad user_roles for permissions
Tom Hughes [Mon, 2 Mar 2015 00:08:46 +0000 (00:08 +0000)]
Load user_roles for permissions

9 years agoRemove unused code
Tom Hughes [Mon, 2 Mar 2015 00:06:02 +0000 (00:06 +0000)]
Remove unused code

9 years agoTesting, testing, testing...
Tom Hughes [Sun, 1 Mar 2015 23:05:18 +0000 (23:05 +0000)]
Testing, testing, testing...

9 years agoUse Faraday in place of Net::HTTP so we can mock responses
Tom Hughes [Sun, 1 Mar 2015 19:22:46 +0000 (19:22 +0000)]
Use Faraday in place of Net::HTTP so we can mock responses

9 years agoFix rubocop warnings
Tom Hughes [Sun, 1 Mar 2015 17:23:17 +0000 (17:23 +0000)]
Fix rubocop warnings

9 years agoThe test train rolls ever onwards...
Tom Hughes [Sun, 1 Mar 2015 17:04:39 +0000 (17:04 +0000)]
The test train rolls ever onwards...

9 years agoRemove unused method
Tom Hughes [Sun, 1 Mar 2015 16:17:08 +0000 (16:17 +0000)]
Remove unused method

9 years agoFix some tests
Tom Hughes [Sun, 1 Mar 2015 14:07:25 +0000 (14:07 +0000)]
Fix some tests

9 years agoMoar tests!
Tom Hughes [Sun, 1 Mar 2015 12:59:53 +0000 (12:59 +0000)]
Moar tests!

9 years agoDrop the old output_compression plugin
Tom Hughes [Sun, 1 Mar 2015 10:48:10 +0000 (10:48 +0000)]
Drop the old output_compression plugin

The production servers all have mod_deflate enabled anyway, which
almost certainly does a better job of compression than this.

9 years agoMore test coverage improvements
Tom Hughes [Sun, 1 Mar 2015 00:44:32 +0000 (00:44 +0000)]
More test coverage improvements

9 years agoMake sure we give iD uncompressed XML for a trace
Tom Hughes [Sat, 28 Feb 2015 15:53:32 +0000 (15:53 +0000)]
Make sure we give iD uncompressed XML for a trace

See #745

9 years agoReset locale after tests which change it finish
Tom Hughes [Sat, 28 Feb 2015 07:38:12 +0000 (07:38 +0000)]
Reset locale after tests which change it finish

9 years agoLoad user_blocks as an API fixture
Tom Hughes [Sat, 28 Feb 2015 01:00:30 +0000 (01:00 +0000)]
Load user_blocks as an API fixture

9 years agoMore work on test coverage
Tom Hughes [Sat, 28 Feb 2015 00:45:56 +0000 (00:45 +0000)]
More work on test coverage

9 years agoFix typo
Tom Hughes [Fri, 27 Feb 2015 17:02:34 +0000 (17:02 +0000)]
Fix typo

Fixed #916

9 years agoFix OSRM directions issues
Tom Hughes [Fri, 27 Feb 2015 17:00:28 +0000 (17:00 +0000)]
Fix OSRM directions issues

Don't rely on trailing spaces in translation strings as they
aren't reliably preserved, and make "exit" translatable.

Fixes #915

9 years agoEnable bundle caching in travis
Tom Hughes [Fri, 27 Feb 2015 10:28:21 +0000 (10:28 +0000)]
Enable bundle caching in travis

9 years agoFix validation failures for trace tags
Tom Hughes [Fri, 27 Feb 2015 10:04:40 +0000 (10:04 +0000)]
Fix validation failures for trace tags

Fixes #914

9 years agoFix rubocop warnings
Tom Hughes [Fri, 27 Feb 2015 07:08:55 +0000 (07:08 +0000)]
Fix rubocop warnings

9 years agoImprove test coverage
Tom Hughes [Fri, 27 Feb 2015 00:40:37 +0000 (00:40 +0000)]
Improve test coverage

9 years agoAdd Coveralls support
Tom Hughes [Thu, 26 Feb 2015 18:56:56 +0000 (18:56 +0000)]
Add Coveralls support

9 years agoCancel any outstanding route when starting a new one
Tom Hughes [Thu, 26 Feb 2015 18:39:31 +0000 (18:39 +0000)]
Cancel any outstanding route when starting a new one

Fixes #913

9 years agoSet an explicit image when dragging from the routing panel
Tom Hughes [Thu, 26 Feb 2015 14:06:25 +0000 (14:06 +0000)]
Set an explicit image when dragging from the routing panel

This may help with #912 but at the very least it gives us a full size
image consistent with dragging marker that is already on the map.

9 years agoGraphHopper directions updates
Peter Karich [Thu, 26 Feb 2015 12:21:25 +0000 (13:21 +0100)]
GraphHopper directions updates

Add support for roundabouts in directions, update the URL for the
documenation and explicitly excludes elevation data (which requires
a custom polyline decoder) from the results.

9 years agoRemove empty locales from iD
Tom Hughes [Thu, 26 Feb 2015 08:58:43 +0000 (08:58 +0000)]
Remove empty locales from iD

https://github.com/openstreetmap/iD/issues/2528

9 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

9 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

9 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

9 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

9 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

9 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

9 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

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

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

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

9 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

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

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

9 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

9 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

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

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

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

9 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

9 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

9 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

9 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

9 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

9 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

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

9 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

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

9 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

9 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

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

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

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

9 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

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

9 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

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

Admininstration → Administration

9 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

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

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

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

9 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

9 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

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

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