cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6308 commits 4 branches 1 tag 499 MiB
Commit graph

6308 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
f3895c8fab Update to latest Leaflet-hash plugin 2013-11-18 17:43:46 +00:00
Tom Hughes
214ff28cd9 Update to Leaflet 0.7 2013-11-18 17:43:46 +00:00
Tom Hughes
41e45bad51 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.
 2013-11-17 21:52:39 +00:00
John Firebaugh
2b4f8e92c9 Merge branch 'master' into redesign 
Conflicts:
	app/controllers/browse_controller.rb
	app/views/layouts/_head.html.erb
	config/environments/production.rb
	config/routes.rb
 2013-11-15 16:47:49 -08:00
Aaron Lidman
5ddab68c11 Replace searching.gif with loader from iD 2013-11-15 16:11:44 -08:00
Aaron Lidman
74be05018b Don't render the user menu for users without ids, closed #68 2013-11-15 15:48:43 -08:00
John Firebaugh
245a79061a Revert user page to full width for now 2013-11-15 15:28:35 -08:00
Aaron Lidman
e62bac06ed Improved noteLayer and dataLayer availability, closes #65 2013-11-15 15:06:44 -08:00
John Firebaugh
dc82421f56 Adjustments to about page and welcome copy 2013-11-15 15:04:46 -08:00
Aaron Lidman
d3e99bc8bd Hide control tooltips on #map-ui expansion, closes #55 2013-11-15 11:26:36 -08:00
Aaron Lidman
5e06cabb74 Hide welcome section on help page if not logged in 
closes #67
 2013-11-15 11:13:22 -08:00
Tom Hughes
f3d793c7e8 Make the link from site#help to site#welcome use a relative URL 2013-11-15 19:01:33 +00:00
Tom Hughes
338dfa0db0 Use <h1> for the title of site#welcome to match other pages 2013-11-15 18:51:09 +00:00
John Firebaugh
b92cb5b772 Use html5shiv for IE8 compatibility 2013-11-15 10:46:56 -08:00
John Firebaugh
d920d94f69 Revert "Eliminate HTML5 elements" 
This led to a huge mess of conflicting CSS rule priorities.

This reverts commit 9fc8bc9368.
 2013-11-15 10:37:10 -08:00
Aaron Lidman
518a51712c Obey the hash 2013-11-14 18:16:23 -08:00
John Firebaugh
ad368d189f Update to iD v1.3.2 2013-11-14 18:07:45 -08:00
Aaron Lidman
fec9dc84c0 No hash on browse pages, closes #35 2013-11-14 17:41:20 -08:00
John Firebaugh
e9c6e57bcc Eliminate HTML5 elements 
IE8, *sigh*
 2013-11-14 15:39:44 -08:00
Aaron Lidman
111dec6853 Fixed border consistency 2013-11-14 12:42:02 -08:00
John Firebaugh
c9600ea323 Expose more router functions 2013-11-14 12:26:58 -08:00
John Firebaugh
22408c3e5b Simplify 2013-11-14 12:22:20 -08:00
John Firebaugh
a62141ce7f Drop pngfix.js 
Don't need to support IE 6 anymore (<0.2% of users).
 2013-11-14 19:32:24 +00:00
John Firebaugh
1688c361d4 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)
 2013-11-14 10:17:27 -08:00
Aaron Lidman
2ce7060757 Fixed note creation halo to update on dragging 2013-11-14 09:57:48 -08:00
Aaron Lidman
eda8b00fec Fix #map-ui tooltip styling 2013-11-14 09:28:38 -08:00
Aaron Lidman
fd8f35309d Fix disabled overlay layers translations 2013-11-14 09:12:39 -08:00
Aaron Lidman
439ad373ec Disable overlay layers at minZoom and add tooltips 2013-11-13 17:30:15 -08:00
John Firebaugh
f24309ad3e Don't set state if it doesn't exist 2013-11-13 16:01:54 -08:00
John Firebaugh
be56eb5bad Border between history entries 2013-11-13 15:59:46 -08:00
John Firebaugh
7b10012f90 Fix history sidebar 2013-11-13 15:45:07 -08:00
John Firebaugh
c878b5b8d4 Fix note commenting 2013-11-13 15:22:36 -08:00
John Firebaugh
51bb085614 Layout tweaks to terms page 
Fixes #527
 2013-11-13 14:54:21 -08:00
John Firebaugh
4863a94906 Remove "Loading..." from browse for now 2013-11-13 13:50:36 -08:00
Aaron Lidman
e336fc31c7 Change halo color for notes 2013-11-13 13:32:24 -08:00
Aaron Lidman
6ba9f8ba29 Different feature highlight color for browse pages 2013-11-13 13:17:45 -08:00
John Firebaugh
d380ce79aa Remove unused, fix global leak 2013-11-13 13:01:07 -08:00
John Firebaugh
2bf9144702 Don't show search in expando header on interior pages 2013-11-13 12:55:02 -08:00
John Firebaugh
a661ee1693 Don't add note when disabled 2013-11-13 12:40:36 -08:00
John Firebaugh
8f4edc234a Darken grey 2013-11-13 12:37:56 -08:00
John Firebaugh
88ef278548 Fix minimap labels on IE9 2013-11-13 12:28:07 -08:00
Aaron Lidman
1769971cde Moved note description out of the sidebar header 
Some indentation too.
 2013-11-13 12:24:05 -08:00
John Firebaugh
b8a449b4b1 Show XHR responseText on error 2013-11-13 12:01:21 -08:00
Aaron Lidman
28a4185bb2 Add cascade font-weights 2013-11-13 12:00:39 -08:00
Aaron Lidman
e04ce095f1 Revert to named font-weights, closes #58 2013-11-13 11:54:37 -08:00
Aaron Lidman
c5be2b6f84 Prevent empty search 2013-11-13 10:45:20 -08:00
Aaron Lidman
6f444fc99e Zoom in to note if zoom < 15 2013-11-13 10:33:16 -08:00
Aaron Lidman
2bb59daa37 Add close button to 404 page 2013-11-12 18:03:02 -08:00
Aaron Lidman
3fa364a22c Fix inconsistent headers 2013-11-12 17:51:48 -08:00
John Firebaugh
853dc286b9 Add sidebar loading indicator 2013-11-12 17:01:47 -08:00