Revert r16046.
DO NOT COMMIT MAJOR ENHANCEMENTS TO TRUNK WITHOUT TALKING TO ME FIRST.
This commit is contained in:
parent
7551e8a0c1
commit
f4571eeb7c
85 changed files with 9 additions and 3278 deletions
|
@ -49,7 +49,6 @@ Rails::Initializer.run do |config|
|
|||
config.gem 'composite_primary_keys', :version => '2.2.2'
|
||||
config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'
|
||||
config.gem 'rmagick', :lib => 'RMagick'
|
||||
config.gem 'oauth', :version => '0.3.5'
|
||||
|
||||
# Only load the plugins named here, in the order given. By default, all plugins
|
||||
# in vendor/plugins are loaded in alphabetical order.
|
||||
|
|
|
@ -652,21 +652,6 @@ en:
|
|||
scheduled_for_deletion: "Track scheduled for deletion"
|
||||
make_public:
|
||||
made_public: "Track made public"
|
||||
oauth:
|
||||
client_application:
|
||||
request_access: "The application {{app_name}} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
|
||||
allow_to: "Allow the client application to:"
|
||||
allow_read_prefs: "read your user preferences."
|
||||
allow_write_prefs: "modify your user preferences."
|
||||
allow_write_diary: "create diary entries, comments and make friends."
|
||||
allow_write_api: "modify the map."
|
||||
allow_read_gpx: "read your private GPS traces."
|
||||
allow_write_gpx: "upload GPS traces."
|
||||
token:
|
||||
none: "You have not authorised any clients to act on your behalf. You do not have to do anything now to authorise them, as they will ask for authorisation when they need it. After that time you can return here to revoke those permissions if you do not want the clients to have your authorisation any more."
|
||||
application: "Application"
|
||||
issued: "Issued"
|
||||
revoke: "Revoke!"
|
||||
user:
|
||||
login:
|
||||
title: "Login"
|
||||
|
@ -764,12 +749,6 @@ en:
|
|||
return to profile: Return to profile
|
||||
flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
|
||||
flash update success: "User information updated successfully."
|
||||
my apps: "My client applications"
|
||||
developers: "Application Developers"
|
||||
dev_intro: "Have you written an application which you would like to register to make {{link}} requests to the OpenStreetMap server?"
|
||||
register_app: "Register your application"
|
||||
apps_registered: "You have the following client applications registered:"
|
||||
register_another_app: "Register another application"
|
||||
confirm:
|
||||
heading: Confirm a user account
|
||||
press confirm button: "Press the confirm button below to activate your account."
|
||||
|
|
|
@ -172,6 +172,7 @@ ActionController::Routing::Routes.draw do |map|
|
|||
map.connect '/export/finish', :controller => 'export', :action => 'finish'
|
||||
|
||||
# messages
|
||||
|
||||
map.connect '/user/:display_name/inbox', :controller => 'message', :action => 'inbox'
|
||||
map.connect '/user/:display_name/outbox', :controller => 'message', :action => 'outbox'
|
||||
map.connect '/message/new/:display_name', :controller => 'message', :action => 'new'
|
||||
|
@ -179,14 +180,6 @@ ActionController::Routing::Routes.draw do |map|
|
|||
map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark'
|
||||
map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply'
|
||||
|
||||
# oauth admin pages (i.e: for setting up new clients, etc...)
|
||||
map.resources :oauth_clients
|
||||
map.connect '/oauth/revoke', :controller => 'oauth', :action => 'revoke'
|
||||
map.authorize '/oauth/authorize', :controller => 'oauth', :action => 'oauthorize'
|
||||
map.request_token '/oauth/request_token', :controller => 'oauth', :action => 'request_token'
|
||||
map.access_token '/oauth/access_token', :controller => 'oauth', :action => 'access_token'
|
||||
map.test_request '/oauth/test_request', :controller => 'oauth', :action => 'test_request'
|
||||
|
||||
# fall through
|
||||
map.connect ':controller/:id/:action'
|
||||
map.connect ':controller/:action'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue