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

248 commits

Author SHA1 Message Date
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
Kai Krueger
72e59b49fa Copy the redaction code from nodes to ways 2012-04-05 13:49:39 +01:00
Matt Amos
67182f824e Fixing review comments 
Added scoping for unredacted items, cleaned up authorization and
railsified old_node_controller.
 2012-04-05 13:46:40 +01:00
Matt Amos
67dd9e4c9d Adding first cut of Redactions support 
Redactions support hiding historical versions of elements and
collecting meta-data about that action together.
 2012-04-05 13:46:36 +01:00
Tom Hughes
eaad3611b8 Add functional tests for messages 
Also fixes various issues in the code discovered while writing
the tests, and adds some named routes for messages.
 2012-03-22 23:14:29 +00:00
Tom Hughes
5f33656c8d Get rid of custom CSRF protection for user role changes 
By restricting role changes to POST requests, which they should be
anyway, we get all the rails CSRF protection for free.
 2012-03-20 17:21:13 +00:00
Tom Hughes
e1d873cde9 Add functional tests for user blocks 
Also fixes various issues in the code discovered while writing
the tests, and adds some named routes for user blocks.
 2012-03-19 11:26:02 +00:00
Tom Hughes
561f2f694a Add preview functionality to rich text controls 2012-03-17 16:36:57 +00:00
Tom Hughes
21855aa355 Allow POST requests to the home page so OpenSearch works 2012-03-14 13:44:03 +00:00
Tom Hughes
c9fb146608 Restructure notes URLs according to standard rails conventions 2012-03-10 17:04:57 +00:00
Tom Hughes
6aca6cfabf Merge branch 'master' into openstreetbugs 
Conflicts:
	config/routes.rb
	db/structure.sql
 2012-03-10 15:30:25 +00:00
Tom Hughes
58d889436f Fix various routing and route generation errors 2012-03-09 23:15:39 +00:00
Tom Hughes
d5bdf633bf Remove some unecessary routes and add lots of method constraints 2012-03-09 20:15:34 +00:00
Tom Hughes
fbf2310721 Remove redundant routes and add default format specifiers 2012-03-09 00:41:15 +00:00
Tom Hughes
e660e60966 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
 2012-03-08 18:23:27 +00:00
Steve Singer
1944372af8 Add a view to show diary comments left by a user 2012-02-28 21:29:18 +00:00
Tom Hughes
3121d1b5a0 Put pretty route for /copyright/locale first 2012-02-14 11:54:16 +00:00
Shaun McDonald
0465fda75a Railsify the box link on the browse changeset page 
This removes the whitespace in the url, and makes the root path a
named route so that it can be nicely referenced.
 2012-01-16 17:51:25 +00:00
Mikel Maron
d878db0a9b Add some more social features 
Add a view showing changesets by nearby users, and views showing
diary entries by friends and nearby users.
 2012-01-07 11:54:07 +00:00
Tom Hughes
52e5fa6ad7 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js
 2012-01-05 20:15:53 +00:00
Mikel Maron
ce829bcc7c Add support for viewing a list of your friends' changesets 2011-12-15 21:25:27 +00:00
Matt Amos
64030a40ac Replace @ with ~ in the shortlink 
This should help Twitter's horribly broken URL detection algorithm
not screw up shortlinks from OSM.
 2011-11-24 22:27:16 +00:00
Tom Hughes
be8164cf15 Generate correct URLs for changeset feeds 2011-11-19 12:42:37 +00:00
Tom Hughes
7b89dc6349 Make OAuth work again 2011-11-16 21:13:25 +00:00
Tom Hughes
a00b1240dd Revert "Put changeset feeds before lists in the routes" 
This reverts commit 76c1371dcf.
 2011-11-15 16:10:08 +00:00
Tom Hughes
76c1371dcf Put changeset feeds before lists in the routes 2011-11-15 12:56:38 +00:00