lp://staging/~mvo/software-center/oem-descriptor-in-user-agent-5.2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/software-center/5.2 at revision 3075

Gary Lasker (community): Approve on 2012-08-29

Diff: 225 lines (+89/-16)

8 files modified

softwarecenter/enums.py (+1/-1)
softwarecenter/paths.py (+3/-0)
softwarecenter/ui/gtk3/views/webkit.py (+21/-4)
softwarecenter/utils.py (+13/-1)
test/data/ubuntu_dist_channel (+3/-0)
test/gtk3/test_purchase.py (+0/-10)
test/gtk3/test_webkit.py (+42/-0)
test/test_utils.py (+6/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1042749: include oem descriptor in internal webkit user agent string

Medium

Fix Released

Link a bug report

Related blueprints

3076. By Michael Vogt on 2012-08-28

merged latest 5.2 fixes

3075. By Michael Vogt on 2012-08-28

fix test failures

3074. By Michael Vogt on 2012-08-28

test/test_utils.py: fix path for 5.2

3073. By Michael Vogt on 2012-08-28

merge oem channel descriptor for 5.2 and resolve conflicts

3072. By Gary Lasker on 2012-08-18

* lp:~mvo/software-center/fix-lp870847-5.2:
  - fix incorrect validation pattern in modify_review call, this
    should fix the ablity of users to modify their reviews
    (LP: #870847)

3071. By Michael Vogt on 2012-07-23

releasing version 5.2.5

3070. By Michael Vogt on 2012-07-23

merged lp:~mvo/software-center/lp1026494

3069. By Michael Vogt on 2012-07-19

merged lp:~gary-lasker/software-center/fix-lp969907-for-5.2

3068. By Michael Vogt on 2012-07-19

test/test_region.py: skip real (non-mock) geoip test as its not always available

3067. By Gary Lasker on 2012-07-19

* lp:~gary-lasker/software-center/launcher-integration-unit-tests:
 - additional unit tests to round out the suite for the Unity
   launcher integration feature