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

1441 commits

Author SHA1 Message Date
Tom Hughes
aa4a8fdc81 Replace JOSM editing option with generic Remote Control option 2010-12-01 09:25:27 +00:00
Tom Hughes
70d75e3dc0 Improve the unsaved edits warning for Potlatch 2 2010-11-30 21:12:21 +00:00
Siebrand Mazeland
f43f8996c9 Localisation updates from http://translatewiki.net. 2010-11-30 21:30:17 +01:00
Tom Hughes
73f574aa0f Correct a few interpolation variables in the Turkish translation 2010-11-30 08:57:54 +00:00
Siebrand Mazeland
70b3feb03a Localisation updates from http://translatewiki.net. 2010-11-29 17:16:59 +01:00
Tom Hughes
9c2de4039c Add an explicit "default editor" option to the user settings 2010-11-29 12:20:23 +00:00
Tom Hughes
0a52a4eb07 Implement automatic OAuth setup for Potlatch 2 2010-11-29 12:20:22 +00:00
Tom Hughes
b26adef905 Warn if we fail to contact JOSM 2010-11-29 12:20:22 +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
b90219f1d3 Add Potlatch 2 as an editor option 2010-11-29 12:20:21 +00:00
Matt Amos
cd66a5db99 Initial work on support for multiple editors 2010-11-29 12:20:21 +00:00
Siebrand Mazeland
f7743cbbc4 Localisation updates from http://translatewiki.net. 2010-11-07 21:55:58 +01:00
Tom Hughes
f364dd8f00 Allow the Nominatim instance used to be configured 2010-11-02 10:40:43 +00:00
Siebrand Mazeland
1910dda732 Localisation updates from http://translatewiki.net. 2010-10-29 01:35:34 +02: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
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
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
Siebrand Mazeland
7c01f78a42 Localisation updates from http://translatewiki.net 2010-10-03 22:36:22 +02: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
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
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
Richard Fairhurst
d68466ecf8 Remove NearMap from Potlatch options 2010-09-15 10:32:13 +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
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
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
6669253f9c Suppress deprecation warning from i18n 2010-09-02 20:00:43 +01:00
Tom Hughes
782ddc9c3e Require i18n version 0.4.1 and fix monkey patch to work with it 
Rails 3 pulls in i18n version 0.4.1 as a separate gem which then
breaks our code if it is running on a machine with rails 3 installed
as it tries to monkey patch i18n and fails, so this fix allows us
to run on a machine with rails 3 installed.
 2010-09-02 19:01:21 +01:00
Siebrand Mazeland
75aa771498 Localisation updates from http://transatewiki.net 2010-08-30 20:18:13 +02:00
Siebrand Mazeland
da24a83748 Localisation updates from http://translatewiki.net 2010-08-29 13:19:34 +02:00
Tom Hughes
2ce394118d Allow uncompressed GPX traces to be fetched from the API 2010-08-24 21:21:02 +01:00
Tom Hughes
b17523c893 Rename application.yml to example.application.yml 2010-08-13 22:50:18 +01:00
Ævar Arnfjörð Bjarmason
bf2149cfcb config/legales/FR.yml: Invalid YAML killed the French contributor terms 2010-08-13 15:13:31 +01:00
Tom Hughes
dbfb7c1e1d Add french version of text for when there is no decline button 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
Grant Slater
5857871924 CT Intro text amend. 2010-08-11 15:23:40 +01:00
Tom Hughes
027312fa7e Reorder routes so correct one is selected 2010-08-11 15:23:40 +01:00