lp:pay-service/devel

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:pay-service/14.10 at revision 9

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2014-06-18

Indicator Applet Developers: Pending requested 2014-06-13

Diff: 1627 lines (+946/-91)

35 files modified

.bzrignore (+3/-1)
CMakeLists.txt (+7/-4)
MERGE-REVIEW (+14/-0)
data/pay-service.conf.in (+3/-1)
debian/changelog (+11/-0)
debian/control (+4/-0)
debian/pay-service.click-hook (+5/-0)
debian/rules (+1/-1)
libpay/pay-package.cpp (+35/-3)
service/CMakeLists.txt (+7/-3)
service/dbus-interface.cpp (+7/-1)
service/dbus-interface.h (+2/-0)
service/item-memory.cpp (+24/-26)
service/main.cpp (+20/-19)
service/purchase-ual.cpp (+20/-5)
service/qtbridge.cpp (+189/-0)
service/qtbridge.h (+88/-0)
service/token-grabber-u1.cpp (+113/-0)
service/token-grabber-u1.h (+41/-0)
service/token-grabber.h (+39/-0)
service/verification-curl.cpp (+90/-11)
service/verification-curl.h (+7/-1)
tests/CMakeLists.txt (+20/-4)
tests/click-data/com.canonical.payui/0.1/.click/info/com.canonical.payui.manifest (+9/-0)
tests/click-data/com.canonical.payui/0.1/test.desktop (+3/-0)
tests/click-db/test.conf.in (+2/-0)
tests/dbus-interface-tests.cpp (+24/-2)
tests/libpay-tests.cpp (+5/-5)
tests/manual (+30/-0)
tests/purchase-ual-tests.cpp (+9/-2)
tests/setup-staging.sh (+19/-0)
tests/token-grabber-null.h (+36/-0)
tests/verification-curl-endpoints/good/device-id.in (+5/-0)
tests/verification-curl-endpoints/package-name.in (+3/-0)
tests/verification-curl-tests.cpp (+51/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

18. By Ted Gould on 2014-06-18

Doing the changelog manually for CI Train

17. By Ted Gould on 2014-06-18

Ensure that the debian changelog matches the trunk

16. By Ted Gould on 2014-06-13

Bringing in tests and merge commit rules

15. By Ted Gould on 2014-06-13

Check to ensure that the package is available to start

14. By Ted Gould on 2014-06-13

Fix scoping of root objects

13. By Ted Gould on 2014-06-13

Make it so that we can purchase without verification

12. By Ted Gould on 2014-06-13

Use proper URLs and servers

11. By Ted Gould on 2014-06-13

Use the pay-ui for payment interactions

10. By Ted Gould on 2014-06-13

Setup a click hook for testing and integration

9. By Ted Gould on 2014-06-13

Encode the dbus path in the library