Commit graph

2078 commits

Author SHA1 Message Date
Tom Hughes
f364dd8f00 Allow the Nominatim instance used to be configured 2010-11-02 10:40:43 +00:00
Tom Hughes
e09b187cae Merge branch 'master' into openid
Conflicts:
	app/controllers/user_controller.rb
2010-10-17 10:59:29 +01:00
Tom Hughes
86596c0d1f Remove duplicate (and inconsistent) title from the map key
The map key had a heading in the title bar space and then another
inconsistent one inside the sidebar - the second one has been removed.

The tooltop for the map key link has also been improved.
2010-10-14 18:11:56 +01:00
Tom Hughes
2f0ed54206 Handle attempts to agree terms by users with validation errors better 2010-10-12 20:34:49 +01:00
Tom Hughes
71f1554212 Make trace API a proper CRUD API like other object types 2010-10-11 23:09:27 +01:00
Tom Hughes
9caa2046ca Include description and tags in GPX details API response 2010-10-11 19:10:42 +01:00
Tom Hughes
1a80a11c4c Make permalinks draggable
Move the div containing the permalinks outside the map div so that
they aren't affected by the OpenLayers event handlers and hence get
the normal drag handling for links. Closes #3251.
2010-10-11 08:39:05 +01:00
Tom Hughes
c016bf6c15 Merge branch 'master' into openid
Conflicts:
	app/controllers/user_controller.rb
2010-10-05 00:23:04 +01:00
Tom Hughes
bddf524c88 Allow users to send themselves a new confirmation email
Add a method which generates a new confirmation email, and provide
links to it from appropriate places.
2010-10-04 21:52:58 +01:00
Tom Hughes
52e523cb0b Invite users to fill in their profile after confirming an account 2010-10-04 19:45:26 +01:00
Tom Hughes
483936772d Improve the flash message shown after a user signs up
Make the message a bit more friendly and include the email address
the confirmation was sent to.
2010-10-04 19:11:01 +01:00
Tom Hughes
0874c807e3 Use javascript to automatically submit confirmation forms
In order to avoid forcing the user to press a confirm button, whilst
still not running into the problems we used to have with virus scanners
activating accounts we use javascript to hide and then automatically
submit the confirmation form.
2010-10-04 19:11:01 +01:00
Tom Hughes
c246b91675 Stop prompts wrapping in OpenID login box 2010-10-03 14:40:54 +01:00
Kai Krueger
96b2a9bf16 Add support for fetching attributes via AX as well as SReg 2010-10-03 14:25:45 +01:00
Tom Hughes
bebb9203df Fix errors when an existing user tries to agree to the new terms 2010-10-01 21:07:34 +01:00
Tom Hughes
f69abaa9cf Make terms page work during OpenID based signup 2010-10-01 21:07:34 +01:00
Kai Krueger
183a3e9d07 Yahoo appears to have changed their OpenID endpoint / discovery 2010-10-01 21:07:33 +01:00
Tom Hughes
f70feedc65 Merge branch 'master' into openid 2010-09-24 09:35:36 +01:00
Tom Hughes
2150d1021e Display the verifier if OAuth 1.0a is being used in OOB mode 2010-09-21 16:20:30 +01:00
Tom Hughes
1c3a9ee62b Update oauth models and controllers for OAuth 1.0a support 2010-09-21 16:20:30 +01:00
Tom Hughes
5c520a928b Work around change in handler behaviour in OpenLayers 2.10
We need to install the endDrag routine as the "done" handler after
creating the control otherwise the control will overwrite our handler
with one of it's own.
2010-09-15 10:52:04 +01:00
Tom Hughes
58b63dbc3d Escape ampersands in URLs when exporting HTML for embedding 2010-09-10 17:37:35 +01:00
Tom Hughes
4fbb622656 Make locale data for help and wiki links a bit cleaner 2010-09-10 11:43:13 +01:00
Tom Hughes
ef038fa5fe Only display the license notice if we don't already have a notice 2010-09-10 11:23:01 +01:00
Tom Hughes
d9f9cf4056 Mention help.openstreetmap.org in the welcome message 2010-09-10 11:20:00 +01:00
Tom Hughes
f3132f94f8 Link to help.openstreetmap.org from the sidebar 2010-09-10 11:14:00 +01:00
Tom Hughes
b477cd5492 Remove unused/non-functional tag searching methods 2010-09-09 21:32:15 +01:00
Tom Hughes
d28457b005 Update to OpenLayers 2.10 2010-09-09 16:27:50 +01:00
Tom Hughes
945d60ea5a Merge branch 'master' into openid 2010-09-09 09:07:13 +01:00
Tom Hughes
8f5c54f805 Fix typo 2010-09-09 09:06:58 +01:00
Tom Hughes
a22b0c1b64 Fix typo 2010-09-09 09:05:25 +01:00
Tom Hughes
d8006be822 Use the keyid to identify the layer to using when exporting to an
embeddable map. Fixes #3221.
2010-09-08 17:13:54 +01:00
Tom Hughes
dd7ef37ec0 Merge branch 'master' into openid
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	config/locales/en.yml
2010-09-06 12:49:10 +01:00
Tom Hughes
39a014075a Revert "We can cache the trace list for logged in users now"
This reverts commit f30dcd1a62.
2010-09-01 13:47:06 +01:00
Tom Hughes
ba70c100f1 Set the default trace visibility on the upload form 2010-08-24 21:32:07 +01:00
Tom Hughes
2ce394118d Allow uncompressed GPX traces to be fetched from the API 2010-08-24 21:21:02 +01:00
Tom Hughes
b3d92954d3 Use normal notice system to display login banner 2010-08-13 15:13:30 +01:00
Matt Amos
047027c95d Added login banner letting users more aware of the license change 2010-08-13 15:13:30 +01:00
Tom Hughes
6c2089da2d Don't refer to the decline button when there isn't one 2010-08-12 18:09:36 +01:00
Frederik Ramm
9aaafcb425 Add new <contributor-terms> element to user details 2010-08-12 17:47:51 +01:00
Tom Hughes
e055b8e2f8 Fix spelling of referer 2010-08-10 18:13:34 +01:00
Tom Hughes
a99b516962 Allow existing users to voluntarily sign up for the contributor terms
Based on a patch from Frederik Ramm this change allows users to make a
voluntary decision to sign up for the new contributor terms.
2010-08-10 18:08:11 +01:00
Tom Hughes
2adcfc1a72 Don't allow paging of the changeset atom feed
Make any request for a changeset feed with a page argument redirect
to the version with no page argument and ensure that any RSS links on
the HTML version of the changeset list don't have a page argument.
2010-08-09 13:47:21 +01:00
Matt Amos
838b1ee7e9 Fixed AMF controller to validate changeset comments
Fixed AMF controller so that it doesn't accept non-UTF8 comments, and
throws away non-XML characters.
2010-08-08 16:23:11 +01:00
Tom Hughes
4633838e21 Make sure the trace tab always links to the global trace list 2010-08-06 10:40:00 +01:00
Tom Hughes
c5b35406a6 More fixed to trace redirection
Redirect to list on a delete, not view. Also reorder the routes so
the more specific ones are first.
2010-08-06 10:31:20 +01:00
Tom Hughes
1ba40521af Really fix the redirect on trace deletion 2010-08-06 09:59:11 +01:00
Tom Hughes
289ab7c19d Fix redirect on deleting a trace 2010-08-06 09:56:49 +01:00
Tom Hughes
cf9cfd10a1 Fix redirect after a trace is uploaded 2010-08-06 09:53:53 +01:00
Tom Hughes
f07819d81a Rework application configuration
Use a preinitializer to load the settings from application.yml so
that they are available as early as possible. All settings can also
be overridden using environment variables.

The ad-hoc settins in environment.rb are then moved to this new
system so we have one consistent location for settings.
2010-08-04 22:06:05 +01:00