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

273 commits

Author SHA1 Message Date
Simon Poole
a24f52dec7 Add a landing page for "fix the map / report a problem" links 2014-01-19 13:48:27 +00:00
Tom Hughes
e418075e26 Replace some legacy routes with redirects 2013-12-03 19:08:21 +00:00
Tom Hughes
61bb31ebdd Preserve the bounding box when redirecting history URLs 
Using the options style for the redirect seems to cause parameters
to be preserved, which the path style of redirect does not.
 2013-12-01 19:59:57 +00:00
Tom Hughes
fb9b4edcdd Add tests for new redirects and fix a few bugs in the redirects 2013-11-28 08:56:52 +00:00
Tom Hughes
3cd5f45e08 Simplify browse routes and make routes more consistent 
This gets rid of the /browse/ prefix and uses /history consistently
for all routes that show a list of changesets.
 2013-11-28 00:14:07 +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
1b19974b12 Add note creation to the sidebar 2013-11-11 19:06:07 -08:00
John Firebaugh
15ff7b9843 Remove unused 2013-11-06 13:05:51 -08:00
John Firebaugh
5835350879 Restore raw latlon search result 2013-10-15 21:01:14 +01:00
Tom Hughes
71065a5f2a Add tests for trace#edit 2013-10-15 00:12:04 +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
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
6adcce4e5d Frontpage redesign 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
John Firebaugh
efc6aaf215 Remove vestigial routes 
Namefinder support was removed in 1a0728ec7b.
 2013-10-13 19:23:15 +01:00
Tom Hughes
5fc397935c Fix routing of changeset feed 2013-09-23 13:58:59 +01:00
Tom Hughes
038c341918 Allow GET as well as POST for oauth#request_token and oauth#access_token 2013-09-23 13:47:05 +01:00
Tom Hughes
57219d516a Fix routing of RSS feeds 2013-09-23 11:05:35 +01:00
Tom Hughes
3b34f700f1 Alloe GET as well as POST for oauth#revoke and oauth#authorize 2013-09-22 18:33:26 +01:00
Tom Hughes
bd8d207ea4 Rails now defaults to using PATCH for updates 2013-09-21 11:35:46 +01:00
Tom Hughes
984c6dc114 Update to rails 4.0.0 2013-09-21 11:35:45 +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
John Firebaugh
2a3bc0a387 Hook up user confirmation page 2013-08-12 13:34:44 -07:00
Saman Bemel-Benrud
ad60ee5c9c adding new verify page, updating graphics. 2013-08-12 13:34:42 -07:00
John Firebaugh
ef880621a4 Combine and refine third and sixth section 2013-08-12 13:34:41 -07:00
John Firebaugh
2690342b08 Reduce welcome email to minimal text 
Instead, redirect newly-confirmed users to the welcome
page. If confirmation is not required, redirect immediately
and don't send an email.
 2013-08-12 13:34:40 -07:00
John Firebaugh
e3aaa6dd4b Add welcome page based on http://osmlab.github.io/welcome-osm/ 2013-08-12 13:34:40 -07:00
John Firebaugh
849e874dce Refactor user creation actions 
Create a separate #create action that handles POSTs to
/user/new. This simplifies the other actions and ensures
that the URL is /user/new when validation errors occur,
rather than /user/terms.

Fixes #398
 2013-08-01 17:32:40 +01:00
Tom Hughes
d74d4f8d19 Add a reopen API call for notes 2013-06-10 18:52:50 +01:00
Tom Hughes
6659fb9b33 Rename the ugly "id_iframe" to just plain "id" 2013-05-07 14:50:31 +01:00
Tom MacWright
7a98913d0c Add iD editor 
iD sources live in vendor/assets/iD, and are managed with
vendorer, using the "rewrite" functionality to replace relative
paths in the CSS with <%= asset_path(…) %> directives.

To avoid needing to namespace all of its CSS classes, iD
is embedded via an iframe.

To setup, edit application.yml to include an `id_key` key.
(It can use the same consumer key as P2 if you like.)
 2013-05-03 10:52:41 -07:00
Tom Hughes
78f608b114 Merge branch 'master' into notes 
Conflicts:
	app/assets/javascripts/browse.js
	app/assets/javascripts/map.js.erb
	app/assets/stylesheets/common.css.scss
	app/views/site/index.html.erb
 2012-12-01 18:22:30 +00:00
Tom Hughes
c0b47c0c2a Serve embedded maps through the assets pipeline 2012-11-23 10:40:26 +00:00
Tom Hughes
28b4c624b8 Use named routes in note RSS builder 2012-10-14 13:52:58 +01:00
Tom Hughes
0037502426 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
 2012-10-13 15:55:34 +01:00
Tom Hughes
3ce4de1295 Add a /api/0.6/user/NNNN call to the API 2012-09-24 18:44:11 +01:00
Tom Hughes
4d91fe3dd9 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/site/index.html.erb
 2012-09-20 16:01:24 +01:00
John Firebaugh
8ec415b060 Use a param to trigger export rather than a separate action 
In site/_resize.html.erb and site/_search.html.erb, a
params[:action] conditional is used to include code that
should only run on the index action -- but it should be run
on the export action too. Cleanest fix is to eliminate that
action entirely.
 2012-09-07 09:27:59 +01:00
Tom Hughes
815c98c977 Select which key entries to show on the client 
Rather than requesting a new key every time the zoom or layer
changes, serve up all the entries initially with appropriate
annotations to allow the client to decide which ones to show.
 2012-08-31 10:29:32 +01:00
Tom Hughes
0d3a9ed9cb Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js
 2012-08-22 20:52:08 +01:00
Tom Hughes
573991e5a9 Fixup make_friend and remove_friend properly 
Requests using POST are now actioned immediately, while requests
using GET present a confirmation page.
 2012-08-15 20:13:14 +01:00
Tom Hughes
740ba0dd38 Require POST for make_friend and remove_friend 
Note that this breaks the make_friend link in friend notfication
emails, but it will do as a temporary measure.
 2012-08-14 22:49:52 +01:00
Tom Hughes
13ef6a2df1 Remove use of deprecated :comment attribute on link_to and button_to 2012-06-18 11:20:09 +01:00
Enno Brehm
6a09f49e71 Implement API endpoint to query permissions. 2012-05-05 15:28:45 +01:00
Matt Amos
851de28303 Added redactions resource 2012-04-05 13:50:15 +01:00
Matt Amos
8bfb5cae8a Added relation redaction logic, same as node and way logic, plus tests 2012-04-05 13:49:46 +01:00
Matt Amos
990f3eba40 Altered old_way stuff to be Railsy like old_node is now 2012-04-05 13:49:43 +01:00