merge-payui : Code : Pay Service

Get this branch:: bzr branch lp:~dobey/pay-service/merge-payui

Only dobey can upload to this branch. If you are dobey please log in for upload directions.

Branch merges

No branches dependent on this one.

Merged into lp:pay-service at revision 96

Charles Kerr (community): Approve on 2016-03-10

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2016-03-10

Diff: 10389 lines (+9058/-472)

107 files modified

.bzrignore (+3/-2)
CMakeLists.txt (+1/-2)
HACKING (+85/-0)
debian/control (+22/-4)
debian/copyright (+2/-2)
debian/pay-service.click-hook (+0/-4)
debian/pay-service.install (+2/-2)
debian/pay-ui.install (+3/-0)
debian/rules (+1/-1)
pay-ui/CMakeLists.txt (+21/-0)
pay-ui/app/CMakeLists.txt (+6/-0)
pay-ui/app/components/AlertDialog.qml (+31/-0)
pay-ui/app/components/BeforeUnloadDialog.qml (+37/-0)
pay-ui/app/components/CMakeLists.txt (+6/-0)
pay-ui/app/components/ConfirmDialog.qml (+37/-0)
pay-ui/app/components/ModalDialog.qml (+32/-0)
pay-ui/app/components/PromptDialog.qml (+51/-0)
pay-ui/app/components/SecurityCertificatePopover.qml (+145/-0)
pay-ui/app/payui.qml (+459/-0)
pay-ui/app/tests/unit/js/unit_test.js (+17/-0)
pay-ui/app/tests/unit/tst_checkoutpage.qml (+73/-0)
pay-ui/app/tests/unit/tst_purchasewebkit.qml (+57/-0)
pay-ui/app/ui/CMakeLists.txt (+6/-0)
pay-ui/app/ui/CheckoutPage.qml (+404/-0)
pay-ui/app/ui/ErrorDialog.qml (+67/-0)
pay-ui/app/ui/UbuntuPurchaseWebkit.qml (+107/-0)
pay-ui/backend/CMakeLists.txt (+49/-0)
pay-ui/backend/modules/payui/backend.cpp (+23/-0)
pay-ui/backend/modules/payui/backend.h (+33/-0)
pay-ui/backend/modules/payui/certificateadapter.cpp (+46/-0)
pay-ui/backend/modules/payui/certificateadapter.h (+51/-0)
pay-ui/backend/modules/payui/credentials_service.cpp (+81/-0)
pay-ui/backend/modules/payui/credentials_service.h (+53/-0)
pay-ui/backend/modules/payui/network.cpp (+512/-0)
pay-ui/backend/modules/payui/network.h (+136/-0)
pay-ui/backend/modules/payui/oxideconstants.cpp (+19/-0)
pay-ui/backend/modules/payui/oxideconstants.h (+53/-0)
pay-ui/backend/modules/payui/pay_info.cpp (+37/-0)
pay-ui/backend/modules/payui/pay_info.h (+73/-0)
pay-ui/backend/modules/payui/purchase.cpp (+154/-0)
pay-ui/backend/modules/payui/purchase.h (+59/-0)
pay-ui/backend/modules/payui/qmldir (+2/-0)
pay-ui/backend/tests/CMakeLists.txt (+30/-0)
pay-ui/backend/tests/mock_click_server.py (+162/-0)
pay-ui/backend/tests/test_network.cpp (+317/-0)
pay-ui/pay-ui.in (+19/-0)
pay-ui/tests/autopilot/pay_ui/__init__.py (+106/-0)
pay-ui/tests/autopilot/pay_ui/tests/__init__.py (+77/-0)
pay-ui/tests/autopilot/pay_ui/tests/mock_server.py (+337/-0)
pay-ui/tests/autopilot/pay_ui/tests/test_pay_ui.py (+186/-0)
pay-ui/tests/autopilot/run_autopilot (+1/-0)
po/CMakeLists.txt (+1/-1)
po/POTFILES.in (+8/-0)
po/aa.po (+106/-0)
po/am.po (+106/-0)
po/ast.po (+106/-0)
po/az.po (+106/-0)
po/br.po (+106/-0)
po/ca.po (+106/-0)
po/ca@valencia.po (+106/-0)
po/cs.po (+106/-0)
po/cy.po (+106/-0)
po/de.po (+106/-0)
po/el.po (+106/-0)
po/en_AU.po (+106/-0)
po/en_GB.po (+106/-0)
po/es.po (+106/-0)
po/eu.po (+106/-0)
po/fa.po (+106/-0)
po/fi.po (+106/-0)
po/fr.po (+106/-0)
po/gd.po (+107/-0)
po/gl.po (+106/-0)
po/he.po (+106/-0)
po/hu.po (+106/-0)
po/id.po (+106/-0)
po/is.po (+106/-0)
po/it.po (+106/-0)
po/ja.po (+106/-0)
po/ko.po (+106/-0)
po/nb.po (+106/-0)
po/nl.po (+106/-0)
po/pay-service.pot (+82/-2)
po/pl.po (+106/-0)
po/pt.po (+106/-0)
po/pt_BR.po (+106/-0)
po/ro.po (+106/-0)
po/ru.po (+106/-0)
po/sl.po (+106/-0)
po/sq.po (+106/-0)
po/sr.po (+106/-0)
po/sv.po (+107/-0)
po/ug.po (+106/-0)
po/uk.po (+106/-0)
po/vi.po (+106/-0)
po/zh_CN.po (+106/-0)
po/zh_TW.po (+106/-0)
service-ng/src/launchpad.net/go-mir/mir/fakes/prompt_session.go (+5/-1)
service-ng/src/launchpad.net/go-mir/mir/mir_prompt_session_helper.c (+41/-0)
service-ng/src/launchpad.net/go-mir/mir/mir_prompt_session_helper.h (+28/-0)
service-ng/src/launchpad.net/go-mir/mir/prompt_session.go (+14/-1)
service-ng/src/pay-service-2/service/pay_ui.go (+18/-83)
service-ng/src/pay-service-2/service/pay_ui_test.go (+8/-199)
service-ng/test-service.sh (+2/-2)
tests/setup-staging.sh (+0/-8)
ual-helper/CMakeLists.txt (+0/-12)
ual-helper/exec-tool.c (+0/-146)

High

Fix Released

Link a bug report

Related blueprints

Branch information

Owner:: dobey

Project:: Pay Service

Status:: Merged

Recent revisions

121. By dobey on 2016-03-11: Only depend on the ubuntu web component plug-in package on archs where it is.
119. By dobey on 2016-03-10: Link the bug about pay-ui maintenance being difficult.
118. By dobey on 2016-03-10: Clean up some log level usage.
117. By dobey on 2016-03-10: Drop extra bit about payui from setup-staging script.
116. By dobey on 2016-03-10: Use a more verbose error message for generic network errors.
Adjust test to deal with more verbose message.
Use environment variable instead of -I in pay-ui script.
115. By dobey on 2016-03-09: Move the HACKING file to top level and adjust to be relevent for pay-service.
Make it possible to run the autopilot tests with 'make autopilot' again.
114. By dobey on 2016-03-09: Remove the old pay-ui debian dir.
113. By dobey on 2016-03-09: Remove unused imports from the test.
112. By dobey on 2016-03-09: Redirect the stdout/stderr of pay-ui to pay-service stdout/stderr.

»

Branch metadata

Branch format:: Branch format 7

Repository format:: Bazaar repository format 2a (needs bzr 1.16 or later)

Stacked on:: lp:pay-service

Pay Service

lp:~dobey/pay-service/merge-payui

Branch merges

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Subscribers

Pay Service

lp:~dobey/pay-service/merge-payui

Branch merges

Related source package recipes

Related snap packages

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Nearby

Subscribers