lp:~mvo/software-center/tos-dialog

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:software-center at revision 2885

Gary Lasker (community): Approve on 2012-03-19

Diff: 908 lines (+355/-136) (has conflicts)

16 files modified

data/ui/gtk3/SoftwareCenter.ui (+10/-0)
data/ui/gtk3/dialogs.ui (+16/-11)
po/POTFILES.in (+2/-0)
softwarecenter/backend/oneconfhandler/core.py (+18/-3)
softwarecenter/enums.py (+3/-0)
softwarecenter/ui/gtk3/app.py (+7/-4)
softwarecenter/ui/gtk3/dialogs/__init__.py (+20/-2)
softwarecenter/ui/gtk3/dialogs/dialog_tos.py (+84/-0)
softwarecenter/ui/gtk3/panes/availablepane.py (+5/-5)
softwarecenter/ui/gtk3/review_gui_helper.py (+2/-5)
softwarecenter/ui/gtk3/utils.py (+14/-0)
softwarecenter/ui/gtk3/views/purchaseview.py (+34/-94)
softwarecenter/ui/gtk3/views/webkit.py (+114/-0)
softwarecenter/utils.py (+0/-10)
test/gtk3/test_dialogs.py (+6/-0)
test/gtk3/test_purchase.py (+20/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2855. By Michael Vogt on 2012-03-19

pyflakes/pep8 fixes

2854. By Michael Vogt on 2012-03-19

update implementation of the ToS dialog to follow the spec

2853. By Michael Vogt on 2012-03-19

fix typo, improve robustness of config setting, remove tos dialog-title

2852. By Michael Vogt on 2012-03-16

merged from trunk, fix pep8 issues

2851. By Michael Vogt on 2012-03-15

how ToS dialog on first purchase

2850. By Michael Vogt on 2012-03-15

add show_accept_tos_dialog dialog

2849. By Michael Vogt on 2012-03-14

add ToS help menu item

2848. By Michael Vogt on 2012-03-14

use enum.SOFTWARE_CENTER_NAME_KEYRING

2847. By Michael Vogt on 2012-03-14

* lp:~elachuni/software-center/unify-ussoc-envvar:
  - fix USSOC_SERVICE_URL env variable

2846. By Michael Vogt on 2012-03-14

merged lp:~elachuni/software-center/pep8-test-part8