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

3844 commits

This branch
This branch
All branches
Author SHA1 Message Date
Siebrand Mazeland
1910dda732 Localisation updates from http://translatewiki.net. 2010-10-29 01:35:34 +02:00
Tom Hughes
58653f8b9d Merge branch 'master' into openid 2010-10-23 12:00:40 +01:00
Siebrand Mazeland
68a65a9256 Localisation updates from http://translatewiki.net 2010-10-18 21:35:37 +02: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
7b3e8871d5 There are five trace fixtures now 2010-10-11 23:35:44 +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
59e86dc07a The read flag is a boolean 2010-10-08 15:25:10 +01:00
Tom Hughes
b658f5d148 Fix for postgres boolean support 2010-10-08 12:27:37 +01:00
Tom Hughes
c1b65d11fd Fixup openid test to reflect changes merged from master 2010-10-05 00:45:03 +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
c5631ea8fb Interplation variable names shouldn't be translated... 2010-10-04 21:53:03 +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
Siebrand Mazeland
7c01f78a42 Localisation updates from http://translatewiki.net 2010-10-03 22:36:22 +02: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
94f9f4b76f Pass any AX response to the callback along with the SReg response 2010-10-03 14:24:45 +01:00
Kai Krueger
a0b76fc2c5 Test openid based user creation right through to the final save 2010-10-01 21:29:23 +01:00
Tom Hughes
7c73eca63d Add monkey patch to make openid tests work with rails 2 2010-10-01 21:07:35 +01:00
Tom Hughes
f4a1bec37c Require a specific version of the oauth plugin 
It looks likely that the API  will change in future versions of
the oauth plugin, so require a known working version for now.
 2010-10-01 21:07:35 +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
Kai Krueger
ce1e788f82 Add a test for openid failure during user creation 2010-10-01 21:06:57 +01:00
Shaun McDonald
64916e8630 Update the airport tag to use the standard aeroway=aerodrome 
Update the airport tag to use the standard aeroway=aerodrome instead
of the amenity=airport as pointed out on potlatch-dev mailing list.
 2010-09-29 12:05:12 +01:00
Tom Hughes
eb050a1b7d Require a specific version of the oauth plugin 
It looks likely that the API  will change in future versions of
the oauth plugin, so require a known working version for now.
 2010-09-24 11:02:41 +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
c08f9a2f03 Remove oauth-plugin from vendor and require gem version instead 2010-09-21 16:20:30 +01:00
Ævar Arnfjörð Bjarmason
401d81940f wiki_pages: Run script/misc/update-wiki-pages 2010-09-21 16:19:54 +01:00
Siebrand Mazeland
9b404b9054 Localisation updates from http://translatewiki.net 2010-09-17 01:24:10 +02: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
Richard Fairhurst
d68466ecf8 Remove NearMap from Potlatch options 2010-09-15 10:32:13 +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
79276fb43a Merge branch 'master' into openid 2010-09-09 09:06:12 +01:00