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

1825 commits

Author SHA1 Message Date
John Firebaugh
a6fb1ead5b Use a table for tags 
Fixes #595
 2013-12-03 22:33:07 +00:00
Tom Hughes
5642cf696e Fix UCL link 2013-12-03 18:16:22 +00:00
Tom Hughes
ecf3bdf2af Remove unused code for handling search results in Potlatch 2013-12-03 15:14:59 +00:00
Tom Hughes
50fafa14f8 Improve zoom level selection when invoking Potlatch on an object 
When invoking Potlatch on a node/way/relation object we should
normally have valid location information in the map parameters, so
use any zoom which is there if possible, otherwise fall back to an
object type specific default value.

Fixes #605.
 2013-12-03 15:06:34 +00:00
Tom Hughes
16a72d93de Don't show "Load More" if we found less than 20 changesets 2013-12-02 19:39:56 +00:00
Tom Hughes
d5a765588f Fix URL updating in Potlatch 1 
Potlatch 1 has hard coded calls to updatelinks, so rename the
updatelinks function to updateLinks and add an updatelinks function
using the old style argument list for Potlatch 1 to call.
 2013-12-01 22:37:04 +00:00
Richard Fairhurst
640ff57465 Add 'x' to close welcome box; remember preference 2013-12-01 21:36:25 +00:00
RM87
61fc15aee1 Remove spurious < character as reported in #508 2013-11-30 16:09:47 +00:00
Tom Hughes
a9f4549327 Tidy up the OAuth authorization screens 
Make sure all messages are translatable, separate errors from
user initiated denial of authorization.
 2013-11-30 12:25:22 +00:00
Tom Hughes
bfd11bf79a Change "Copyright & License" to "Copyright" and move it left 2013-11-30 10:51:43 +00:00
Paul Norman
a768e7111c Restore Copyright & License link 
The copyright and license is an important part of OpenStreetMap.
This restores the copyright & license link to the menu, placing
it in the top-right with the other pages which do not display a map.

Fixes #548

Fixes comments in https://github.com/openstreetmap/openstreetmap-website/pull/498#issuecomment-26741518
 2013-11-30 10:36:14 +00:00
Tom Hughes
68a3df4d53 Merge branch 'redesign' 
Conflicts:
	app/assets/stylesheets/common.css.scss
 2013-11-28 17:30:53 +00:00
John Firebaugh
6b236ec95b Fix feed link for pushState loaded history page 2013-11-25 15:47:42 -08:00
Tom Hughes
51ade94113 Drop max_id from the changeset feed URL 2013-11-25 22:28:02 +00:00
John Firebaugh
ca64b39e0d Make main page flash messages visible 2013-11-25 13:20:59 -08:00
Tom Hughes
43f52daeaa Remove unused partials 2013-11-25 00:51:53 +00:00
Tom Hughes
272a708b0f Format browse page titles in a consistent way 2013-11-24 16:55:56 +00:00
John Firebaugh
954261fb1c Restore prev/next changeset by user links 2013-11-22 12:17:27 -08:00
John Firebaugh
1557f9cf89 Pass along gpx parameter to iD 
See https://github.com/systemed/iD/issues/1965
 2013-11-22 10:57:07 -08:00
John Firebaugh
fbd5a88b24 Use machine-readable lat/lon format 2013-11-21 11:31:58 -08:00
Aaron Lidman
4c0a5ee7d9 Add coordinate detail to node pages 2013-11-20 13:31:05 -08:00
John Firebaugh
b5825b2f64 Sign Up -> Start Mapping 2013-11-19 15:02:31 -08:00
John Firebaugh
d0de36b607 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.
 2013-11-19 12:10:14 -08:00
Aaron Lidman
a5e8b4cb88 Improved export warning, removed heading 2013-11-19 11:57:30 -08:00
John Firebaugh
bd21a1f7ff Eliminate loading flash for welcome overlay 2013-11-19 11:18:11 -08:00
John Firebaugh
e91956d0f7 Fix test failures 2013-11-19 10:30:18 -08:00
John Firebaugh
44629832dd Merge branch 'master' into redesign 
Conflicts:
	vendor/assets/leaflet/leaflet.hash.js
	vendor/assets/leaflet/leaflet.js
 2013-11-19 09:42:47 -08:00
Aaron Lidman
fc23515570 Improved export filter tool 2013-11-18 19:11:01 -08:00
Aaron Lidman
f45437f836 Reorder changeset detail lists 
Nodes, ways, relations -> Ways, relations, nodes
 2013-11-18 16:24:25 -08:00
Aaron Lidman
6c64a74a46 Improve changeset detail display 2013-11-18 15:23:48 -08:00
Tom Hughes
214ff28cd9 Update to Leaflet 0.7 2013-11-18 17:43:46 +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
74be05018b Don't render the user menu for users without ids, closed #68 2013-11-15 15:48:43 -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
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
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
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
John Firebaugh
2bf9144702 Don't show search in expando header on interior pages 2013-11-13 12:55:02 -08:00
Aaron Lidman
1769971cde Moved note description out of the sidebar header 
Some indentation too.
 2013-11-13 12:24:05 -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
John Firebaugh
38564b4736 Include changeset ID in list 2013-11-12 15:44:17 -08:00
Aaron Lidman
1673851b50 Add zoom to note 2013-11-12 15:12:40 -08:00
John Firebaugh
3e305fb162 Fix lego translations 2013-11-12 14:46:47 -08:00
John Firebaugh
9dd230d0bc Refactor browse templates 2013-11-12 13:22:55 -08:00