]> git.openstreetmap.org Git - rails.git/log
rails.git
11 years agoThere are four methods, not three
Tom Hughes [Mon, 25 Nov 2013 21:13:40 +0000 (21:13 +0000)]
There are four methods, not three

11 years agoAdd test for redirect routes
Tom Hughes [Mon, 25 Nov 2013 21:10:56 +0000 (21:10 +0000)]
Add test for redirect routes

11 years agoAdd explanatory comment
John Firebaugh [Mon, 25 Nov 2013 21:12:04 +0000 (13:12 -0800)]
Add explanatory comment

11 years agoDocument/clarify OSM.Router use
John Firebaugh [Mon, 25 Nov 2013 21:08:24 +0000 (13:08 -0800)]
Document/clarify OSM.Router use

11 years agoRevert "Remove redundant code"
Tom Hughes [Mon, 25 Nov 2013 20:41:25 +0000 (20:41 +0000)]
Revert "Remove redundant code"

This reverts commit 28530085fb94e23b55cc6277dc6e15fdd3cc8a46.

11 years agoSort changesets by id rather than created_at, closes #87
Aaron Lidman [Mon, 25 Nov 2013 20:27:52 +0000 (12:27 -0800)]
Sort changesets by id rather than created_at, closes #87

11 years agoFix border-bottom for browse#note, closes #88
Aaron Lidman [Mon, 25 Nov 2013 20:04:22 +0000 (12:04 -0800)]
Fix border-bottom for browse#note, closes #88

11 years agoRemove unneessary return added accidentally
Tom Hughes [Mon, 25 Nov 2013 19:14:52 +0000 (19:14 +0000)]
Remove unneessary return added accidentally

11 years agoFix "in bounds" test in updateData
Tom Hughes [Mon, 25 Nov 2013 19:03:35 +0000 (19:03 +0000)]
Fix "in bounds" test in updateData

Only call getData if the new bounds are not contained within the
old bounds, and only update the bounds after a successful load so
that the don't change if we error out.

11 years agoRemove unused partials
Tom Hughes [Mon, 25 Nov 2013 00:51:53 +0000 (00:51 +0000)]
Remove unused partials

11 years agoEnable oauth for geocoder#search
Tom Hughes [Sun, 24 Nov 2013 17:05:02 +0000 (17:05 +0000)]
Enable oauth for geocoder#search

11 years agoBlock max_id for changeset feeds instead of page which is no longer used
Tom Hughes [Sun, 24 Nov 2013 17:02:38 +0000 (17:02 +0000)]
Block max_id for changeset feeds instead of page which is no longer used

11 years agoFormat browse page titles in a consistent way
Tom Hughes [Sun, 24 Nov 2013 16:55:56 +0000 (16:55 +0000)]
Format browse page titles in a consistent way

11 years agoDon't wait for a timeout when the browser doesn't support geolocation
Tom Hughes [Sun, 24 Nov 2013 16:45:45 +0000 (16:45 +0000)]
Don't wait for a timeout when the browser doesn't support geolocation

If the browser doesn't support geolocation then we might as well just
start manual edit mode straight away rather than waiting four seconds.

11 years agoDrop ejs as we aren't using it anymore
Tom Hughes [Sun, 24 Nov 2013 16:42:43 +0000 (16:42 +0000)]
Drop ejs as we aren't using it anymore

11 years agoRemove redundant code
Tom Hughes [Sun, 24 Nov 2013 16:38:53 +0000 (16:38 +0000)]
Remove redundant code

Attempts to view an object are now redirected to the browse pages
so we will never see a node/way/relation parameter here.

11 years agoMake sure all pages using the map layout call require_oauth
Tom Hughes [Sun, 24 Nov 2013 15:29:38 +0000 (15:29 +0000)]
Make sure all pages using the map layout call require_oauth

11 years agoRemove code to fixup authenticity tokens on page load
Tom Hughes [Sun, 24 Nov 2013 12:13:02 +0000 (12:13 +0000)]
Remove code to fixup authenticity tokens on page load

We don't cache anything with forms in now, so the code is no longer
needed and the comment was now misleading as extra code has been added
to the ready callback.

11 years agoCompromise on fonts to look better on Windows
John Firebaugh [Fri, 22 Nov 2013 20:58:09 +0000 (12:58 -0800)]
Compromise on fonts to look better on Windows

11 years agoTweak welcome text
John Firebaugh [Fri, 22 Nov 2013 20:29:45 +0000 (12:29 -0800)]
Tweak welcome text

11 years agoRestore prev/next changeset by user links
John Firebaugh [Fri, 22 Nov 2013 20:13:12 +0000 (12:13 -0800)]
Restore prev/next changeset by user links

11 years agoUse machine-readable lat/lon format
John Firebaugh [Thu, 21 Nov 2013 19:31:58 +0000 (11:31 -0800)]
Use machine-readable lat/lon format

11 years agoHide note overflow
Aaron Lidman [Wed, 20 Nov 2013 21:44:40 +0000 (13:44 -0800)]
Hide note overflow

Mostly for long links from craigslist notes.

11 years agoAdd coordinate detail to node pages
Aaron Lidman [Wed, 20 Nov 2013 21:31:05 +0000 (13:31 -0800)]
Add coordinate detail to node pages

11 years agoNominatim results zoom to the result location
Aaron Lidman [Wed, 20 Nov 2013 20:37:57 +0000 (12:37 -0800)]
Nominatim results zoom to the result location

11 years agoFixed individual note marker implementation, closes #78
Aaron Lidman [Wed, 20 Nov 2013 19:43:31 +0000 (11:43 -0800)]
Fixed individual note marker implementation, closes #78

- Removed forced noteLayer view, now respects current selection just
like an other browse page.
- Made marker replacement it’s own thing, seperate from noteLayer.
- Reduced opacity on noteLayer notes, it makes the selected note stand
out more

11 years agoSign Up -> Start Mapping
John Firebaugh [Tue, 19 Nov 2013 23:02:31 +0000 (15:02 -0800)]
Sign Up -> Start Mapping

11 years agoLogout -> Log Out
John Firebaugh [Tue, 19 Nov 2013 22:59:25 +0000 (14:59 -0800)]
Logout -> Log Out

11 years agoRefine changeset browse behavior
John Firebaugh [Tue, 19 Nov 2013 20:10:00 +0000 (12:10 -0800)]
Refine changeset browse behavior

The general history view shows changesets in the current view
and updates when you move the map. The view for an individual
user, nearby users, or friends zooms the map to the extent of
the results, and doesn't change when you move the map.

11 years agoImproved export warning, removed heading
Aaron Lidman [Tue, 19 Nov 2013 19:57:30 +0000 (11:57 -0800)]
Improved export warning, removed heading

11 years agoRevert padding; fixes header baseline
John Firebaugh [Tue, 19 Nov 2013 19:45:49 +0000 (11:45 -0800)]
Revert padding; fixes header baseline

11 years agoEliminate loading flash for welcome overlay
John Firebaugh [Tue, 19 Nov 2013 19:18:11 +0000 (11:18 -0800)]
Eliminate loading flash for welcome overlay

11 years agoFix test failures
John Firebaugh [Fri, 15 Nov 2013 23:36:54 +0000 (15:36 -0800)]
Fix test failures

11 years agoMerge branch 'master' into redesign
John Firebaugh [Tue, 19 Nov 2013 17:42:47 +0000 (09:42 -0800)]
Merge branch 'master' into redesign

Conflicts:
vendor/assets/leaflet/leaflet.hash.js
vendor/assets/leaflet/leaflet.js

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 19 Nov 2013 06:57:29 +0000 (06:57 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoImproved export filter tool
Aaron Lidman [Tue, 19 Nov 2013 03:11:01 +0000 (19:11 -0800)]
Improved export filter tool

11 years agoFixed export filter
Aaron Lidman [Tue, 19 Nov 2013 02:44:48 +0000 (18:44 -0800)]
Fixed export filter

11 years agoShorten intro text
John Firebaugh [Tue, 19 Nov 2013 02:04:05 +0000 (18:04 -0800)]
Shorten intro text

11 years agoImprovements to changeset bbox styling
Aaron Lidman [Tue, 19 Nov 2013 01:29:55 +0000 (17:29 -0800)]
Improvements to changeset bbox styling

11 years agoWrap bounds of changeset request, closes #72
Aaron Lidman [Tue, 19 Nov 2013 00:41:25 +0000 (16:41 -0800)]
Wrap bounds of changeset request, closes #72

11 years agoIncrease sidebar width, back to 350px
Aaron Lidman [Tue, 19 Nov 2013 00:24:52 +0000 (16:24 -0800)]
Increase sidebar width, back to 350px

11 years agoReorder changeset detail lists
Aaron Lidman [Tue, 19 Nov 2013 00:24:25 +0000 (16:24 -0800)]
Reorder changeset detail lists

Nodes, ways, relations -> Ways, relations, nodes

11 years agoBetter spaced changeset lists
Aaron Lidman [Tue, 19 Nov 2013 00:02:48 +0000 (16:02 -0800)]
Better spaced changeset lists

11 years agoImprove changeset detail display
Aaron Lidman [Mon, 18 Nov 2013 23:23:48 +0000 (15:23 -0800)]
Improve changeset detail display

11 years agoFix new note wrapping
Aaron Lidman [Mon, 18 Nov 2013 19:43:48 +0000 (11:43 -0800)]
Fix new note wrapping

11 years agoAdjust header sizing
Aaron Lidman [Mon, 18 Nov 2013 19:26:43 +0000 (11:26 -0800)]
Adjust header sizing

11 years agoFix welcome page redirect, closed #70
Aaron Lidman [Mon, 18 Nov 2013 17:56:03 +0000 (09:56 -0800)]
Fix welcome page redirect, closed #70

11 years agoUpdate to latest leaflet-locationfilter plugin
Tom Hughes [Mon, 18 Nov 2013 17:41:33 +0000 (17:41 +0000)]
Update to latest leaflet-locationfilter plugin

11 years agoUpdate to latest leaflet-osm plugin
Tom Hughes [Mon, 18 Nov 2013 17:38:06 +0000 (17:38 +0000)]
Update to latest leaflet-osm plugin

11 years agoUpdate to latest Leaflet-hash plugin
Tom Hughes [Mon, 18 Nov 2013 17:36:09 +0000 (17:36 +0000)]
Update to latest Leaflet-hash plugin

11 years agoUpdate to Leaflet 0.7
Tom Hughes [Mon, 18 Nov 2013 17:34:22 +0000 (17:34 +0000)]
Update to Leaflet 0.7

11 years agoRemove the _osm_username cookie and session validation logic
Tom Hughes [Sun, 17 Nov 2013 21:52:04 +0000 (21:52 +0000)]
Remove the _osm_username cookie and session validation logic

This was a temporary hack to workaround issues with sessions getting
mixed up at the time of the rails 3.1 upgrade, but logs indicate that
whatever the original problem was it is no longer occurring.

11 years agoMerge branch 'master' into redesign
John Firebaugh [Sat, 16 Nov 2013 00:47:49 +0000 (16:47 -0800)]
Merge branch 'master' into redesign

Conflicts:
app/controllers/browse_controller.rb
app/views/layouts/_head.html.erb
config/environments/production.rb
config/routes.rb

11 years agoReplace searching.gif with loader from iD
Aaron Lidman [Sat, 16 Nov 2013 00:11:44 +0000 (16:11 -0800)]
Replace searching.gif with loader from iD

11 years agoDon't render the user menu for users without ids, closed #68
Aaron Lidman [Fri, 15 Nov 2013 23:48:11 +0000 (15:48 -0800)]
Don't render the user menu for users without ids, closed #68

11 years agoRevert user page to full width for now
John Firebaugh [Fri, 15 Nov 2013 23:28:25 +0000 (15:28 -0800)]
Revert user page to full width for now

11 years agoImproved noteLayer and dataLayer availability, closes #65
Aaron Lidman [Fri, 15 Nov 2013 23:06:36 +0000 (15:06 -0800)]
Improved noteLayer and dataLayer availability, closes #65

11 years agoAdjustments to about page and welcome copy
John Firebaugh [Fri, 15 Nov 2013 23:04:46 +0000 (15:04 -0800)]
Adjustments to about page and welcome copy

11 years agoHide control tooltips on #map-ui expansion, closes #55
Aaron Lidman [Fri, 15 Nov 2013 19:26:36 +0000 (11:26 -0800)]
Hide control tooltips on #map-ui expansion, closes #55

11 years agoHide welcome section on help page if not logged in
Aaron Lidman [Fri, 15 Nov 2013 19:13:16 +0000 (11:13 -0800)]
Hide welcome section on help page if not logged in

closes #67

11 years agoMake the link from site#help to site#welcome use a relative URL
Tom Hughes [Fri, 15 Nov 2013 19:01:33 +0000 (19:01 +0000)]
Make the link from site#help to site#welcome use a relative URL

11 years agoUse <h1> for the title of site#welcome to match other pages
Tom Hughes [Fri, 15 Nov 2013 18:51:09 +0000 (18:51 +0000)]
Use <h1> for the title of site#welcome to match other pages

11 years agoUse html5shiv for IE8 compatibility
John Firebaugh [Fri, 15 Nov 2013 18:37:27 +0000 (10:37 -0800)]
Use html5shiv for IE8 compatibility

11 years agoRevert "Eliminate HTML5 elements"
John Firebaugh [Fri, 15 Nov 2013 18:32:14 +0000 (10:32 -0800)]
Revert "Eliminate HTML5 elements"

This led to a huge mess of conflicting CSS rule priorities.

This reverts commit 9fc8bc93684cbcd334c9290240262cf98202cd1e.

11 years agoObey the hash
Aaron Lidman [Fri, 15 Nov 2013 02:16:23 +0000 (18:16 -0800)]
Obey the hash

11 years agoUpdate to iD v1.3.2
John Firebaugh [Fri, 15 Nov 2013 02:07:33 +0000 (18:07 -0800)]
Update to iD v1.3.2

11 years agoNo hash on browse pages, closes #35
Aaron Lidman [Fri, 15 Nov 2013 01:41:12 +0000 (17:41 -0800)]
No hash on browse pages, closes #35

11 years agoEliminate HTML5 elements
John Firebaugh [Thu, 14 Nov 2013 23:38:28 +0000 (15:38 -0800)]
Eliminate HTML5 elements

IE8, *sigh*

11 years agoFixed border consistency
Aaron Lidman [Thu, 14 Nov 2013 20:40:50 +0000 (12:40 -0800)]
Fixed border consistency

11 years agoExpose more router functions
John Firebaugh [Thu, 14 Nov 2013 20:26:58 +0000 (12:26 -0800)]
Expose more router functions

11 years agoSimplify
John Firebaugh [Thu, 14 Nov 2013 20:22:20 +0000 (12:22 -0800)]
Simplify

11 years agoDrop pngfix.js
John Firebaugh [Thu, 14 Nov 2013 18:33:32 +0000 (10:33 -0800)]
Drop pngfix.js

Don't need to support IE 6 anymore (<0.2% of users).

11 years agoAdd X-UA-Compatible meta tag
John Firebaugh [Thu, 14 Nov 2013 18:17:27 +0000 (10:17 -0800)]
Add X-UA-Compatible meta tag

Rails 4 removed the `BestStandardsSupport` middleware, because
supposedly a HTML5 doctype accomplishes the same thing. But not
quite -- without X-UA-Compatible, the UI for changing compatibility
mode is still visible, and users can get themselves into a bad state
(see https://github.com/openstreetmap/openstreetmap-website/pull/498#issuecomment-28483550)

11 years agoFixed note creation halo to update on dragging
Aaron Lidman [Thu, 14 Nov 2013 17:57:48 +0000 (09:57 -0800)]
Fixed note creation halo to update on dragging

11 years agoFix #map-ui tooltip styling
Aaron Lidman [Thu, 14 Nov 2013 17:28:38 +0000 (09:28 -0800)]
Fix #map-ui tooltip styling

11 years agoFix disabled overlay layers translations
Aaron Lidman [Thu, 14 Nov 2013 17:12:39 +0000 (09:12 -0800)]
Fix disabled overlay layers translations

11 years agoDisable overlay layers at minZoom and add tooltips
Aaron Lidman [Thu, 14 Nov 2013 01:30:07 +0000 (17:30 -0800)]
Disable overlay layers at minZoom and add tooltips

11 years agoDon't set state if it doesn't exist
John Firebaugh [Thu, 14 Nov 2013 00:01:54 +0000 (16:01 -0800)]
Don't set state if it doesn't exist

11 years agoBorder between history entries
John Firebaugh [Wed, 13 Nov 2013 23:59:46 +0000 (15:59 -0800)]
Border between history entries

11 years agoFix history sidebar
John Firebaugh [Wed, 13 Nov 2013 23:45:07 +0000 (15:45 -0800)]
Fix history sidebar

11 years agoFix note commenting
John Firebaugh [Wed, 13 Nov 2013 23:22:36 +0000 (15:22 -0800)]
Fix note commenting

11 years agoLayout tweaks to terms page
John Firebaugh [Wed, 13 Nov 2013 22:54:21 +0000 (14:54 -0800)]
Layout tweaks to terms page

Fixes #527

11 years agoRemove "Loading..." from browse for now
John Firebaugh [Wed, 13 Nov 2013 21:50:36 +0000 (13:50 -0800)]
Remove "Loading..." from browse for now

11 years agoChange halo color for notes
Aaron Lidman [Wed, 13 Nov 2013 21:32:24 +0000 (13:32 -0800)]
Change halo color for notes

11 years agoDifferent feature highlight color for browse pages
Aaron Lidman [Wed, 13 Nov 2013 21:17:38 +0000 (13:17 -0800)]
Different feature highlight color for browse pages

11 years agoRemove unused, fix global leak
John Firebaugh [Wed, 13 Nov 2013 21:01:07 +0000 (13:01 -0800)]
Remove unused, fix global leak

11 years agoDon't show search in expando header on interior pages
John Firebaugh [Wed, 13 Nov 2013 20:55:02 +0000 (12:55 -0800)]
Don't show search in expando header on interior pages

11 years agoDon't add note when disabled
John Firebaugh [Wed, 13 Nov 2013 20:40:36 +0000 (12:40 -0800)]
Don't add note when disabled

11 years agoDarken grey
John Firebaugh [Wed, 13 Nov 2013 20:37:56 +0000 (12:37 -0800)]
Darken grey

11 years agoFix minimap labels on IE9
John Firebaugh [Wed, 13 Nov 2013 20:27:57 +0000 (12:27 -0800)]
Fix minimap labels on IE9

11 years agoMoved note description out of the sidebar header
Aaron Lidman [Wed, 13 Nov 2013 20:23:58 +0000 (12:23 -0800)]
Moved note description out of the sidebar header

Some indentation too.

11 years agoShow XHR responseText on error
John Firebaugh [Wed, 13 Nov 2013 19:59:52 +0000 (11:59 -0800)]
Show XHR responseText on error

11 years agoAdd cascade font-weights
Aaron Lidman [Wed, 13 Nov 2013 20:00:39 +0000 (12:00 -0800)]
Add cascade font-weights

11 years agoRevert to named font-weights, closes #58
Aaron Lidman [Wed, 13 Nov 2013 19:54:37 +0000 (11:54 -0800)]
Revert to named font-weights, closes #58

11 years agoPrevent empty search
Aaron Lidman [Wed, 13 Nov 2013 18:45:20 +0000 (10:45 -0800)]
Prevent empty search

11 years agoZoom in to note if zoom < 15
Aaron Lidman [Wed, 13 Nov 2013 18:33:16 +0000 (10:33 -0800)]
Zoom in to note if zoom < 15

11 years agoAdd close button to 404 page
Aaron Lidman [Wed, 13 Nov 2013 02:03:02 +0000 (18:03 -0800)]
Add close button to 404 page

11 years agoFix inconsistent headers
Aaron Lidman [Wed, 13 Nov 2013 01:51:48 +0000 (17:51 -0800)]
Fix inconsistent headers

11 years agoAdd sidebar loading indicator
John Firebaugh [Wed, 13 Nov 2013 00:58:34 +0000 (16:58 -0800)]
Add sidebar loading indicator

11 years agoPatch Leaflet bug
John Firebaugh [Wed, 13 Nov 2013 00:51:24 +0000 (16:51 -0800)]
Patch Leaflet bug

This has already been fixed for the next release.