Online Accounts: Account plugins

Merge lp://staging/~mardy/account-plugins/lp1299659 into lp://staging/account-plugins

  1. lp1299659
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Rejected
Rejected by: Alberto Mardegan
Proposed branch: lp://staging/~mardy/account-plugins/lp1299659
Merge into: lp://staging/account-plugins
Diff against target: 56 lines (+12/-5)
6 files modified
Makefile.am (+0/-1)
data/webkit-options/secure.flickr.com.conf (+0/-3)
debian/account-plugin-flickr.install (+0/-1)
debian/account-plugin-flickr.postinst (+4/-0)
debian/account-plugin-flickr.postrm (+4/-0)
debian/account-plugin-flickr.preinst (+4/-0)
To merge this branch: bzr merge lp://staging/~mardy/account-plugins/lp1299659
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alexandre Abreu (community) Approve
Online Accounts Pending
Review via email: mp+213415@code.staging.launchpad.net

Commit message

Restore the ability to create flickr accounts.

This has the unfortunate side-effect of re-opening bug 1041744, by making the unsupported "login with Facebook" and "login with Google" buttons visible again, but that's a necessary evil.

Description of the change

Restore the ability to create flickr accounts.

This has the unfortunate side-effect of re-opening bug 1041744, by making the unsupported "login with Facebook" and "login with Google" buttons visible again, but that's a necessary evil.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/23/rebuild

review: Approve (continuous-integration)
lp://staging/~mardy/account-plugins/lp1299659 updated
135. By Alberto Mardegan

Remove obsolete config file

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:135
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/24/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alexandre Abreu (abreu-alexandre) :
review: Approve
lp://staging/~mardy/account-plugins/lp1299659 updated
136. By Alberto Mardegan

Add version to debian scripts

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:136
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/25/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) wrote :

Looks like flickr fixed the problem, so this is no longer needed.

Unmerged revisions

136. By Alberto Mardegan

Add version to debian scripts

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches