]> git.openstreetmap.org Git - rails.git/log
rails.git
10 years agoFixed export filter
Aaron Lidman [Tue, 19 Nov 2013 02:44:48 +0000 (18:44 -0800)]
Fixed export filter

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

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

10 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

10 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

10 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

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

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

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

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

10 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

10 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

10 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

10 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

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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

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

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

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

10 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

10 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

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

IE8, *sigh*

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

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

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

10 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).

10 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)

10 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

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

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

10 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

10 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

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

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

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

10 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

10 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

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

10 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

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

10 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

10 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

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

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

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

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

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

10 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

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

10 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

10 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

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

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

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

10 years agoFix editing notes outside of view, closes #57
Aaron Lidman [Wed, 13 Nov 2013 00:58:03 +0000 (16:58 -0800)]
Fix editing notes outside of view, closes #57

10 years agoAdd halo to currently selected note
Aaron Lidman [Wed, 13 Nov 2013 00:50:23 +0000 (16:50 -0800)]
Add halo to currently selected note

10 years agoInclude changeset ID in list
John Firebaugh [Tue, 12 Nov 2013 23:44:17 +0000 (15:44 -0800)]
Include changeset ID in list

10 years agoRender correct template
John Firebaugh [Tue, 12 Nov 2013 23:39:25 +0000 (15:39 -0800)]
Render correct template

10 years agoFix indentation and semicolon usage
John Firebaugh [Tue, 12 Nov 2013 23:29:29 +0000 (15:29 -0800)]
Fix indentation and semicolon usage

10 years agoAdd zoom to note
Aaron Lidman [Tue, 12 Nov 2013 23:12:32 +0000 (15:12 -0800)]
Add zoom to note

10 years agoFix lego translations
John Firebaugh [Tue, 12 Nov 2013 22:46:47 +0000 (14:46 -0800)]
Fix lego translations

10 years agoRefactor browse templates
John Firebaugh [Tue, 12 Nov 2013 21:05:27 +0000 (13:05 -0800)]
Refactor browse templates

10 years agoRationalize browse translation keys
John Firebaugh [Tue, 12 Nov 2013 20:51:33 +0000 (12:51 -0800)]
Rationalize browse translation keys

10 years agoRemove unused translations
John Firebaugh [Tue, 12 Nov 2013 20:30:24 +0000 (12:30 -0800)]
Remove unused translations

10 years agoStyle tweaks
John Firebaugh [Tue, 12 Nov 2013 20:17:32 +0000 (12:17 -0800)]
Style tweaks

10 years agoFix translations
John Firebaugh [Tue, 12 Nov 2013 20:17:22 +0000 (12:17 -0800)]
Fix translations

10 years agoStyle browse 404 page and simplify wording, closes #53
Aaron Lidman [Tue, 12 Nov 2013 19:36:09 +0000 (11:36 -0800)]
Style browse 404 page and simplify wording, closes #53

10 years agoLoading indicator for notes
Aaron Lidman [Tue, 12 Nov 2013 19:20:23 +0000 (11:20 -0800)]
Loading indicator for notes

10 years agoMoved note description to the sidebar header
Aaron Lidman [Tue, 12 Nov 2013 18:09:46 +0000 (10:09 -0800)]
Moved note description to the sidebar header

10 years agoImprove browse design
John Firebaugh [Tue, 12 Nov 2013 01:57:38 +0000 (17:57 -0800)]
Improve browse design

10 years agoRemove unused
John Firebaugh [Tue, 12 Nov 2013 02:18:28 +0000 (18:18 -0800)]
Remove unused

10 years agoAdd marker halo animation styles
Eden Halperin [Tue, 12 Nov 2013 16:12:28 +0000 (11:12 -0500)]
Add marker halo animation styles

10 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 12 Nov 2013 13:59:27 +0000 (13:59 +0000)]
Localisation updates from http://translatewiki.net.

10 years agoAdd note creation to the sidebar
Aaron Lidman [Tue, 12 Nov 2013 03:06:07 +0000 (19:06 -0800)]
Add note creation to the sidebar

10 years agoAdd note selection to the sidebar
Aaron Lidman [Tue, 12 Nov 2013 00:37:23 +0000 (16:37 -0800)]
Add note selection to the sidebar

10 years agoTweak default link color
John Firebaugh [Mon, 11 Nov 2013 23:39:43 +0000 (15:39 -0800)]
Tweak default link color

10 years agoRemove margin from overlay sidebar
John Firebaugh [Mon, 11 Nov 2013 23:36:55 +0000 (15:36 -0800)]
Remove margin from overlay sidebar

10 years agoFix small screen header on interior pages
John Firebaugh [Mon, 11 Nov 2013 22:56:33 +0000 (14:56 -0800)]
Fix small screen header on interior pages

10 years agopreserve visual center of map on sidebar transitions
John Firebaugh [Sat, 9 Nov 2013 00:49:46 +0000 (16:49 -0800)]
preserve visual center of map on sidebar transitions

10 years agoUse our own hash implementation
John Firebaugh [Mon, 11 Nov 2013 18:27:37 +0000 (10:27 -0800)]
Use our own hash implementation

We need more flexibility than L.Hash provides.

10 years agoRefactor to map.updateLayers
John Firebaugh [Mon, 11 Nov 2013 18:19:09 +0000 (10:19 -0800)]
Refactor to map.updateLayers

10 years agoMerge map.js.erb and leaflet.extend.js.erb
John Firebaugh [Mon, 11 Nov 2013 18:04:10 +0000 (10:04 -0800)]
Merge map.js.erb and leaflet.extend.js.erb

10 years agoAdd notes sidebar interaction
Aaron Lidman [Mon, 11 Nov 2013 22:28:54 +0000 (14:28 -0800)]
Add notes sidebar interaction

10 years agoFix search
John Firebaugh [Mon, 11 Nov 2013 21:39:20 +0000 (13:39 -0800)]
Fix search

10 years agoMove search form to header on small screens
John Firebaugh [Mon, 11 Nov 2013 21:37:32 +0000 (13:37 -0800)]
Move search form to header on small screens

10 years agoFix note formatting issues
Aaron Lidman [Mon, 11 Nov 2013 07:23:40 +0000 (23:23 -0800)]
Fix note formatting issues

10 years agoRestructured notes page
Aaron Lidman [Sun, 10 Nov 2013 07:39:02 +0000 (23:39 -0800)]
Restructured notes page

10 years agoReplace Vary header with explicit xhr=1 param
John Firebaugh [Sat, 9 Nov 2013 01:11:54 +0000 (17:11 -0800)]
Replace Vary header with explicit xhr=1 param

IE10 doesn't respect the Vary header.

10 years agoUpdate title on pushState, closes #33
Aaron Lidman [Sat, 9 Nov 2013 00:10:08 +0000 (16:10 -0800)]
Update title on pushState, closes #33

10 years agoHide scrollbar
Aaron Lidman [Sat, 9 Nov 2013 00:04:15 +0000 (16:04 -0800)]
Hide scrollbar

Prevents the scrollbar from popping up during the transition from
sidebar -> search bar and back.