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

1577 commits

Author SHA1 Message Date
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
John Firebaugh
641ce5b640 Render correct template 2013-11-12 15:39:25 -08:00
John Firebaugh
9dd230d0bc Refactor browse templates 2013-11-12 13:22:55 -08:00
John Firebaugh
a5b784bdf7 Replace Vary header with explicit xhr=1 param 
IE10 doesn't respect the Vary header.
 2013-11-08 17:11:54 -08:00
Aaron Lidman
1ae7872ed8 Update title on pushState, closes #33 2013-11-08 16:10:08 -08:00
John Firebaugh
261862a8dd Send appropriate Vary header 
Fixes an issue where the XHR response was sometimes
displayed when navigating back to a pushState
based history entry rather than the full page.
 2013-11-06 13:16:48 -08:00
John Firebaugh
15ff7b9843 Remove unused 2013-11-06 13:05:51 -08:00
Aaron Lidman
9f3dace353 Improve pagination 2013-11-05 12:25:54 -08:00
Tom Hughes
76cf302cd0 Make sure we order user changeset correctly for browse#changeset 2013-11-03 12:40:01 +00:00
Tom Hughes
559a822f59 Setup OAuth when rendering site#index from site#edit 2013-10-31 20:52:43 +00:00
Tom Hughes
82e4970766 Handle an empty type value in a nominatim result 2013-10-21 18:56:56 +01:00
Tom Hughes
3678e83678 Use gpx as the extension when we ask for /trace/N/data.gpx 2013-10-16 00:46:33 +01:00
Tom Hughes
078a9d8ee3 Fix server error when user#reset_password called with no token 2013-10-15 21:27:39 +01:00
John Firebaugh
5835350879 Restore raw latlon search result 2013-10-15 21:01:14 +01:00
Tom Hughes
3a44d461b7 Fix bogus redirect on error 2013-10-15 18:18:49 +01:00
Tom Hughes
c3c9d047ba Tidy up trace#edit and trace#delete and make them more consistent 2013-10-15 00:16:53 +01:00
John Firebaugh
8530e3eedb AJAXy changeset history 2013-10-13 14:46:09 -07:00
John Firebaugh
35458c0096 Convert search to pushState 2013-10-13 14:46:08 -07:00
John Firebaugh
3d4a137959 Don't rely on body classes so much 
Doesn't work well with pushState-based navigation.
 2013-10-13 14:46:08 -07:00
John Firebaugh
a56d1036d5 pushState based navigation between map-based layouts 2013-10-13 14:46:08 -07:00
John Firebaugh
4557654ba6 Simplify layouting 2013-10-13 14:46:07 -07:00
John Firebaugh
2f076d8f34 Fix "Edit" button when browsing features 2013-10-13 14:46:07 -07:00
John Firebaugh
3ebad9ec2f Add about page 2013-10-13 14:46:05 -07:00
John Firebaugh
e838dddf12 Redirect ?node=n and similar to browse pages 2013-10-13 14:45:58 -07:00
John Firebaugh
e8ac6bd5d9 Convert history page to sidebar layout 2013-10-13 14:45:58 -07:00
John Firebaugh
33a6b79bd7 Add help page 2013-10-13 14:45:57 -07:00
John Firebaugh
aaeca5b534 Use reverse geocoders for any lat/lon queries 
This simplifies the implementation, allows code sharing with
"Where am I?", and produces friendlier results for lat/lon
searches (actual reverse geocode results rather than a raw
lat/lon display).
 2013-10-13 19:30:38 +01:00
Tom Hughes
e341ef5673 Remove never actually used code from five years ago 2013-10-11 20:03:06 +01:00
Tom Hughes
2dcc6b620e Log details of any signup requests blocked by an ACL 2013-10-02 17:56:23 +01:00
Tom Hughes
eaefb3ea73 Improve consistency of selections in the browser controller 2013-09-30 08:45:19 +01:00
Tom Hughes
536d80c2b2 Fix typo 2013-09-30 08:35:34 +01:00
Tom Hughes
554a7c9d47 Convert some deprecated methods to modern arel syntax 2013-09-29 22:50:01 +01:00
Tom Hughes
63100ae8a0 Convert trace counting to use modern arel methods 2013-09-29 22:33:04 +01:00
Tom Hughes
a8d65b8dbf Don't redirect from user#terms to login if the user is logged in 2013-09-29 15:43:34 +01:00
Tom Hughes
0e9e6e6f8f Upgrade to http_accept_language 2.x 2013-09-24 20:22:44 +01:00
Tom Hughes
5432409ab6 Avoid singleton serialisation errors 2013-09-21 12:03:53 +01:00
Tom Hughes
6c51b3cc0a Replace deprecated finder methods 2013-09-21 11:35:46 +01:00
Tom Hughes
9ab8111022 Replace deprecated scoped method with all 2013-09-21 11:35:46 +01:00
Tom Hughes
f0feca800d Replace attr_accessible with strong parameters 2013-09-21 11:35:46 +01:00
Tom Hughes
40b452ac74 Use a view to build the trace RSS feed and get rid of OSM::GeoRSS 2013-09-18 18:23:03 +01:00
Tom Hughes
7e896d758d Return GPX traces as application/gpx+xml instead of text/xml 2013-09-09 16:23:38 +01:00
Tom Hughes
ecf8c90e88 Don't bother verifying an email address that hasn't changed 2013-09-09 16:05:16 +01:00
Tom Hughes
6494747882 Centre editors correctly when note=N is specified 2013-09-09 15:44:53 +01:00
Tom Hughes
26855add38 Rework piwik configuration 2013-08-24 12:54:51 +01:00
Tom Hughes
ae0177fbe6 Merge remote-tracking branch 'osmlab/id-default' 2013-08-23 17:41:09 +01:00
John Firebaugh
8dc16bd8db Make iD default editor 
Make iD the default editor for all users that have not specified
a preferred editor, except fall back to P2 on IE.
 2013-08-15 16:36:18 -07:00
John Firebaugh
b825f4826a Fix referer params for welcome page 2013-08-12 13:34:46 -07:00
John Firebaugh
3ca642271a Redirect /edit and /export with old-style edit params 2013-08-12 13:34:46 -07:00
John Firebaugh
091473602b Handle expired confirmation tokens 2013-08-12 13:34:45 -07:00
John Firebaugh
2fa4225784 Pass editing params through to welcome page 2013-08-12 13:34:44 -07:00