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

287 commits

Author SHA1 Message Date
Tom Hughes
7fef0353f2 More test work 2015-03-08 00:48:13 +00:00
Tom Hughes
b0150caee6 Convert OpenID authentication to use OmniAuth 2015-02-25 01:07:23 +00:00
Tom Hughes
dc2a2c8ebd Standardise on double quoted strings 2015-02-20 19:47:26 +00:00
Tom Hughes
ef7f3d800c Fix most auto-correctable rubocop issues 2015-02-20 08:56:16 +00:00
Tom Hughes
34e3e51456 Cleanup trailing whitespace 2015-02-20 08:56:16 +00:00
Matt Amos
0cb475cc1a Merge remote-tracking branch 'upstream/master' into routing-merge 
Conflicts:
	app/assets/javascripts/index.js
	config/locales/en.yml
 2014-11-10 16:14:06 +00:00
Matt Amos
a3eb48385b Merge remote-tracking branch 'upstream/master' into routing 
Conflicts:
	app/assets/javascripts/index.js
	app/assets/javascripts/leaflet.map.js.erb
	config/environments/production.rb
	config/locales/de.yml
 2014-11-03 11:08:13 +00:00
Tom Hughes
501d13e1c0 Merge branch 'master' into overpass 2014-11-01 12:50:23 +00:00
Tom Hughes
f636391580 Move changeset comment feeds out of the API namespace 2014-10-23 21:40:13 +01:00
Łukasz Gurdek
14ac1babc2 Changeset discussions 
Add support for commenting on changesets with RSS feeds and email
notification of comments to other commenters and people that have
chosen to subscribe to a changeset.
 2014-10-23 21:24:51 +01:00
Tom Hughes
a70b61315c Merge branch 'master' into overpass 2014-06-15 14:54:39 +01:00
Martin Raifer
1eab367de5 Instruct iD to load gpx file 
When one clicks on the edit link of an uploaded GPX file, this instructs
the iD editor to load the respective GPX data from the appropriate URL.

See https://github.com/openstreetmap/iD/issues/970#issuecomment-43439476.
 2014-05-18 18:59:08 +01:00
John Firebaugh
f2bf38606e Permalinks for directions 2014-05-14 15:52:25 -07:00
Tom Hughes
078059b76b Initial work on overpass based query API 2014-03-16 16:18:12 +00:00
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