diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-11-28 12:40:02 +0100 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-11-28 12:40:02 +0100 |
| commit | e037bc48e9bae5d4bb6e0ddf736c3260bebb5f20 (patch) | |
| tree | 1c11b4752558e76a76c1947943c33c3384005287 /addons/auth_oauth/auth_oauth_data.xml | |
| parent | 21baf8dfac5fd73c32748f15167a3c863e477a13 (diff) | |
| parent | cb32b7e76fbf59049654cbff7ad87c3bc5a881cb (diff) | |
[MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121128114002-yk9zk24rk79v4pkd
Diffstat (limited to 'addons/auth_oauth/auth_oauth_data.xml')
| -rw-r--r-- | addons/auth_oauth/auth_oauth_data.xml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml index c07359a062c..983549f9378 100644 --- a/addons/auth_oauth/auth_oauth_data.xml +++ b/addons/auth_oauth/auth_oauth_data.xml @@ -1,15 +1,15 @@ <?xml version="1.0"?> <openerp> <data noupdate="1"> - <record id="provider_openerp" model="auth.oauth.provider"> - <field name="name">OpenERP Accounts</field> + <field name="name">OpenERP.com Accounts</field> <field name="auth_endpoint">https://accounts.openerp.com/oauth2/auth</field> <field name="scope">userinfo</field> <field name="validation_endpoint">https://accounts.openerp.com/oauth2/tokeninfo</field> <field name="data_endpoint"></field> <field name="css_class">zocial openerp</field> - <field name="body">Sign in with OpenERP account</field> + <field name="body">Log in with OpenERP.com</field> + <field name="enabled" eval="True"/> </record> <record id="provider_facebook" model="auth.oauth.provider"> <field name="name">Facebook Graph</field> @@ -18,7 +18,7 @@ <field name="validation_endpoint">https://graph.facebook.com/me/permissions</field> <field name="data_endpoint"></field> <field name="css_class">zocial facebook</field> - <field name="body">Sign in with facebook</field> + <field name="body">Log in with facebook</field> </record> <record id="provider_google" model="auth.oauth.provider"> <field name="name">Google OAuth2</field> @@ -27,9 +27,10 @@ <field name="validation_endpoint">https://www.googleapis.com/oauth2/v1/tokeninfo</field> <field name="data_endpoint">https://www.googleapis.com/oauth2/v1/userinfo</field> <field name="css_class">zocial google</field> - <field name="body">Sign in with google</field> + <field name="body">Log in with google</field> </record> - <!-- <record id="provider_twitter" model="auth.oauth.provider"> + <!-- + <record id="provider_twitter" model="auth.oauth.provider"> <field name="name">Twitter OAuth</field> <field name="auth_endpoint">https://api.twitter.com/oauth/request_token</field> <field name="scope"></field> @@ -37,7 +38,7 @@ <field name="data_endpoint"></field> <field name="css_class">zocial twitter</field> <field name="body">Sign in with twitter</field> - </record> --> - + </record> + --> </data> </openerp> |