Tom Hughes
ce7b651eb2
Merge branch 'master' into openid
2011-06-10 19:11:08 +01:00
Tom Hughes
c4f7a8346a
Use session.delete to remove entries instead of assigning nil
2011-06-01 10:17:54 +01:00
Tom Hughes
d681d7e07f
Force a session to be created when doing a cookie test
2011-06-01 10:16:11 +01:00
Tom Hughes
2a635ab28f
Start ROTS for user login tests as well as creation tests
2011-05-21 13:35:15 +01:00
Tom Hughes
832b96b75a
Merge branch 'master' into openid
...
Conflicts:
app/controllers/user_controller.rb
app/views/user/terms.html.erb
test/fixtures/users.yml
2011-05-21 12:14:56 +01:00
Tom Hughes
42e72d5591
Make the edit action default to z17
...
If an attempt is made to invoke an editor without specifying a zoom
level (as with the GPX edit links) then default to z17 instead of z14
to avoid trying to load too much data. Fixes #3728 .
2011-05-07 00:05:49 +01:00
Mikel Maron
48929e8781
Add a map to the changeset list page
...
Add a map to the changeset list page, with a bounding box for each
changeset and highighting when the mouse is placed over either a box
on the map or a row of the table.
2011-05-01 22:55:28 +01:00
Tom Hughes
02e186ee5b
Allow user details to be fetched without agreeing terms
2011-04-20 21:17:59 +01:00
Tom Hughes
37b6418f72
Revert "Allow user details to be fetched without agreeing terms"
...
This reverts commit ddd12b03e1
2011-04-18 23:04:42 +01:00
Tom Hughes
ddd12b03e1
Allow user details to be fetched without agreeing terms
2011-04-18 22:23:48 +01:00
Tom Hughes
6f7eb8f0e8
Don't require terms to be agreed when logging out
2011-04-18 09:04:57 +01:00
Matt Amos
c21aa5933a
Added flash notice for CTs decline
...
Also ensured that CTs are either accepted or declined and cannot
be inadvertently bypassed.
2011-04-18 00:29:15 +01:00
Tom Hughes
2ba5067fcf
Use report_error so Potlatch can see the errors
2011-04-17 21:45:04 +01:00
Tom Hughes
8024a38be4
Make sure "please read the terms" error is issued in the right language
2011-04-17 20:33:49 +01:00
Tom Hughes
b77c6fe8ae
Improve recognition of OAuth referers for triggering of slim mode
2011-04-06 13:24:08 +01:00
Tom Hughes
685a35524a
Try and patch up poor browser language selections
...
The HTTP RFC says that a language range specified by a browser only
matches a resource whose language tag is the same, or longer. This
means that a browser language range of de-DE will not match a resource
with a language tag of de.
Because of this browsers should always send the generic range, such
as de, as a secondary choice after a more specific range like de-DE.
Some browers don't this however, so if we don't get a language match
we try and patch up the list of language ranges by inserting the
more generic ranges.
2011-04-04 22:44:43 +01:00
Tom Hughes
4b20afd51e
Preserve the referer at the end of account creation
2011-04-03 13:46:18 +01:00
Tom Hughes
097fb390b8
Only show login/signup in slim mode when used from oauth
2011-04-03 13:46:18 +01:00
Andy Allan
6edbcc12df
Use slim layout for OAuth pages too
2011-04-03 13:46:17 +01:00
Andy Allan
7b57119146
Another approach, but this time without scattering stuff all over the methods
2011-04-03 13:46:17 +01:00
Andy Allan
0531a7dfa1
Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command has any effect
2011-04-03 13:46:17 +01:00
Andy Allan
5531c0bf34
Use the slim layout on the login page
2011-04-03 13:46:16 +01:00
Tom Hughes
0169453855
Make sure the user is redirect correctly after seeing the terms
2011-04-03 13:46:16 +01:00
Tom Hughes
392aa71015
Tidy up a few things
2011-04-03 13:46:16 +01:00
Matt Amos
8b12abd5bb
Phase 2 CTs implementation and tests, with config parameter
2011-04-03 13:46:16 +01:00
Matt Amos
f3ff36418b
Fixed bug in changeset queries
...
The 'or' condition needed to be bracketed within larger 'and' expression.
2011-03-15 13:56:55 +00:00
Tom Hughes
11aff90f63
Merge branch 'master' into openid
...
Conflicts:
app/controllers/user_controller.rb
app/views/user/login.html.erb
public/stylesheets/common.css
2011-02-10 14:10:19 +00:00
Tom Hughes
f20a85a5c5
Allow the client to request errors as an XML document
2010-12-15 23:58:59 +00:00
Tom Hughes
3472c1d429
Channel all error reporting through report_error
2010-12-12 16:25:01 +00:00
Tom Hughes
7369b7427c
Remove bogus trailing slash from GPX namespace URL
2010-12-02 19:23:38 +00:00
Tom Hughes
aa4a8fdc81
Replace JOSM editing option with generic Remote Control option
2010-12-01 09:25:27 +00:00
Tom Hughes
409576eea0
Make launching of Potlatch 2 from the GPS trace list work
2010-11-30 17:11:49 +00:00
Tom Hughes
9c2de4039c
Add an explicit "default editor" option to the user settings
2010-11-29 12:20:23 +00:00
Tom Hughes
04a6c41be9
Show a popup listing available editors when hovering over the edit tab
2010-11-29 12:20:22 +00:00
Tom Hughes
6c3b5aa9d4
Only Potlatch 1 needs a token to be created
2010-11-29 12:20:22 +00:00
Tom Hughes
c3453cf57d
Make JOSM remote control based editing work
2010-11-29 12:20:22 +00:00
Matt Amos
cd66a5db99
Initial work on support for multiple editors
2010-11-29 12:20:21 +00:00
Tom Hughes
7f955a4aca
Don't show user navigation links for non-public users
...
The changeset browser pages should not show the per-user navigation links
for changesets made by users that have not made their edits public.
2010-11-23 09:30:22 +00:00
Tom Hughes
7f3d37867b
Protect against interception of confirmation emails
...
When processing an account confirmation email don't automatically
log the user in unless their browser session has a token that
matches the same user. Closes #3337 .
2010-11-15 21:41:32 +00:00
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
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
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
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
