Merge lp:~mardy/account-plugins/lp1180297 into lp:account-plugins/13.04

Proposed by Alberto Mardegan
Status: Merged
Approved by: Ken VanDine
Approved revision: 97
Merged at revision: 97
Proposed branch: lp:~mardy/account-plugins/lp1180297
Merge into: lp:account-plugins/13.04
Diff against target: 11 lines (+1/-0)
1 file modified
data/providers/ (+1/-0)
To merge this branch: bzr merge lp:~mardy/account-plugins/lp1180297
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot (community) continuous-integration Approve
Online Accounts Pending
Review via email:

Commit message

Allow Facebook to connect via plain HTTP

Workaround for

Description of the change

Allow Facebook to connect via plain HTTP

Workaround for

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good, not ideal, but we need to work around the problem with facebook. We did get approval from the security team on bug 1180297

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/providers/'
--- data/providers/ 2013-02-25 06:25:34 +0000
+++ data/providers/ 2013-05-27 06:21:28 +0000
@@ -18,6 +18,7 @@
18 <setting name="Display">popup</setting>18 <setting name="Display">popup</setting>
19 <setting name="Scope" type="as">['publish_stream','read_stream','status_update','user_photos','friends_photos','xmpp_login']</setting>19 <setting name="Scope" type="as">['publish_stream','read_stream','status_update','user_photos','friends_photos','xmpp_login']</setting>
20 <setting name="ClientId">@FACEBOOK_CLIENT_ID@</setting>20 <setting name="ClientId">@FACEBOOK_CLIENT_ID@</setting>
21 <setting name="AllowedSchemes" type="as">['https','http']</setting>
21 </group>22 </group>
22 </group>23 </group>
23 </group>24 </group>


People subscribed via source and target branches