]> git.openstreetmap.org Git - rails.git/log
rails.git
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.

11 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

11 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

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

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

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

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

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

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

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

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

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

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

11 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

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

11 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

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

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

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

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

11 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

11 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

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

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

11 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

11 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

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

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

11 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

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

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

11 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

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

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

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

11 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

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

11 years agoRemove text shadow
John Firebaugh [Fri, 8 Nov 2013 22:53:35 +0000 (14:53 -0800)]
Remove text shadow

11 years agoConsistent padding
John Firebaugh [Fri, 8 Nov 2013 22:48:18 +0000 (14:48 -0800)]
Consistent padding

11 years agoHide welcome message on mobile
John Firebaugh [Fri, 8 Nov 2013 22:40:42 +0000 (14:40 -0800)]
Hide welcome message on mobile

11 years agoInclude layers in all geolinks except edit
John Firebaugh [Fri, 8 Nov 2013 21:51:44 +0000 (13:51 -0800)]
Include layers in all geolinks except edit

11 years agoFix order of initialization
John Firebaugh [Fri, 8 Nov 2013 21:42:06 +0000 (13:42 -0800)]
Fix order of initialization

initializeNotes needs to be called after L.OSM.note.

11 years agoIgnore hashchange-triggered popstate events here too
John Firebaugh [Fri, 8 Nov 2013 20:19:47 +0000 (12:19 -0800)]
Ignore hashchange-triggered popstate events here too

11 years agoFloat the close icon, closes #40
Aaron Lidman [Fri, 8 Nov 2013 20:01:20 +0000 (12:01 -0800)]
Float the close icon, closes #40

11 years agoFix browse overlay status messages
John Firebaugh [Fri, 8 Nov 2013 18:46:24 +0000 (10:46 -0800)]
Fix browse overlay status messages

11 years agoRedo mobile styles
John Firebaugh [Fri, 8 Nov 2013 01:04:44 +0000 (17:04 -0800)]
Redo mobile styles

11 years agoSimplify
John Firebaugh [Fri, 8 Nov 2013 00:37:14 +0000 (16:37 -0800)]
Simplify

11 years agoOverlay-style minimized sidebar
John Firebaugh [Thu, 7 Nov 2013 23:27:06 +0000 (15:27 -0800)]
Overlay-style minimized sidebar

11 years agoFix mobile menu and reduced sidebar height
Eden Halperin [Thu, 7 Nov 2013 23:15:19 +0000 (18:15 -0500)]
Fix mobile menu and reduced sidebar height

11 years agoReturn map-ui sidebars in mobile
Eden Halperin [Thu, 7 Nov 2013 21:57:53 +0000 (16:57 -0500)]
Return map-ui sidebars in mobile

11 years agoFixed changeset time inconsistencies
Aaron Lidman [Thu, 7 Nov 2013 20:18:52 +0000 (12:18 -0800)]
Fixed changeset time inconsistencies

11 years agoFix scale control margin
John Firebaugh [Thu, 7 Nov 2013 20:17:22 +0000 (12:17 -0800)]
Fix scale control margin