Ubuntu Apps Directory

Merge lp:~michael.nelson/ubuntu-webcatalog/1025679-diffs-with-client into lp:ubuntu-webcatalog

1025679-diffs-with-client
Merge into trunk

Proposed by Michael Nelson on 2012-08-21

Status:

Merged

Approved by:

Łukasz Czyżykowski on 2012-08-21

Approved revision:

178

Merged at revision:

165

Proposed branch:

lp:~michael.nelson/ubuntu-webcatalog/1025679-diffs-with-client

Merge into:

lp:ubuntu-webcatalog

Diff against target:

812 lines (+317/-231)

7 files modified

src/webcatalog/department_filters.py (+1/-0)
src/webcatalog/fixtures/initial_data.json (+251/-224)
src/webcatalog/management/commands/import_sca_apps.py (+2/-1)
src/webcatalog/models/applications.py (+21/-6)
src/webcatalog/tests/test_commands.py (+8/-0)
src/webcatalog/tests/test_data/sca_apps.txt (+3/-0)
src/webcatalog/tests/test_models.py (+31/-0)

To merge this branch:

bzr merge lp:~michael.nelson/ubuntu-webcatalog/1025679-diffs-with-client

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Łukasz Czyżykowski (community)		2012-08-21	Approve on 2012-08-21
Review via email: mp+120530@code.launchpad.net

Description of the change

Overview
========

This branch ensures exported departments on the SCA api are used to populate the departments when importing sca apps. Particularly, to ensure all the books and magazines exported from SCA are listed under the correct dept.

Additionally, it updates a few icons, as per the related bug (see screenshots there).

Details
=======

I got the current dump of departments from production, then added the "Books & Magazines", to make sure we're not overwriting any existing relationships with departments.

Note: Some pdf's are still published on the sca api with only the dept 'Education' (ie. without "Books & Magazines"):
* 'LinuxUser Ausgabe ...
* ADMIN-Magazin Ausgabe ...
* Ubuntu User Ausgabe ...
* Android User Ausgabe...
* Others - just look for the department "Education" in the api, if it's a book/magazine it should include "Books & Magazines" :) ).

`fab test`

You can test locally by adding this to your local.cfg:

{{{
[webcatalog]
sca_api_url = http://software-center.ubuntu.com/api/2.0/
}}}
then running:
* fab manage:import_from_sca
* fab run
and checking the UI. You'll see this:

http://people.canonical.com/~michaeln/tmp/1025679-books-magazines.png

What becomes immediately apparent is that we should also be storing the published date or something to allow us to present these with the most recently published first?

lp:~michael.nelson/ubuntu-webcatalog/1025679-diffs-with-client updated on 2012-08-21

178. By Michael Nelson on 2012-08-21: REFACTOR: Don't use lists in method args :/.

Revision history for this message

Łukasz Czyżykowski (lukasz-czyzykowski) on 2012-08-21:

review: Approve

lp:~michael.nelson/ubuntu-webcatalog/1025679-diffs-with-client updated on 2012-08-21

179. By Michael Nelson on 2012-08-21: Merged trunk and resolved conflict.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Anthony Lenton

Daniel Strickland

Kiwinote

Michael Nelson

Michael Vogt

awanti

 === modified file 'src/webcatalog/department_filters.py'
 --- src/webcatalog/department_filters.py	2012-07-02 21:25:30 +0000
 +++ src/webcatalog/department_filters.py	2012-08-21 13:59:20 +0000
@@ -53,6 +53,7 @@
  department_filters = {
      'Accessories': [category_filter(set(['Utility', 'System']))],
++    'Books & Magazines': [],
      'Education': [category_filter(set(['Education']))],
      'Fonts': [package_name_filter(r'[to]tf-.*')],
      'Games': [category_filter(set(['Game', 'Sports']))],
 === modified file 'src/webcatalog/fixtures/initial_data.json'
 --- src/webcatalog/fixtures/initial_data.json	2012-04-17 16:56:44 +0000
 +++ src/webcatalog/fixtures/initial_data.json	2012-08-21 13:59:20 +0000
@@ -1,407 +1,434 @@
+ [
+     {
--        "pk": 1,
--        "model": "webcatalog.department",
++        "pk": 1,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Games",
--            "parent": null,
++            "name": "Games",
++            "parent": null,
              "slug": "games"
+         }
--    },
++    },
+     {
--        "pk": 2,
--        "model": "webcatalog.department",
++        "pk": 2,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Office",
--            "parent": null,
++            "name": "Office",
++            "parent": null,
              "slug": "office"
+         }
--    },
++    },
+     {
--        "pk": 3,
--        "model": "webcatalog.department",
++        "pk": 3,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Sound & Video",
--            "parent": null,
++            "name": "Sound & Video",
++            "parent": null,
              "slug": "sound-video"
+         }
--    },
++    },
+     {
--        "pk": 4,
--        "model": "webcatalog.department",
++        "pk": 4,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Developer Tools",
--            "parent": null,
++            "name": "Developer Tools",
++            "parent": null,
              "slug": "developer-tools"
+         }
--    },
++    },
+     {
--        "pk": 5,
--        "model": "webcatalog.department",
++        "pk": 5,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Science & Engineering",
--            "parent": null,
++            "name": "Science & Engineering",
++            "parent": null,
              "slug": "science-engineering"
+         }
--    },
++    },
+     {
--        "pk": 6,
--        "model": "webcatalog.department",
++        "pk": 6,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Education",
--            "parent": null,
++            "name": "Education",
++            "parent": null,
              "slug": "education"
+         }
--    },
++    },
+     {
--        "pk": 7,
--        "model": "webcatalog.department",
++        "pk": 7,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Biology",
--            "parent": 5,
++            "name": "Biology",
++            "parent": 5,
              "slug": "biology"
+         }
--    },
++    },
+     {
--        "pk": 8,
--        "model": "webcatalog.department",
++        "pk": 8,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Accessories",
--            "parent": null,
++            "name": "Accessories",
++            "parent": null,
              "slug": "accessories"
+         }
--    },
++    },
+     {
--        "pk": 9,
--        "model": "webcatalog.department",
++        "pk": 9,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Role-Playing",
--            "parent": 1,
++            "name": "Role-Playing",
++            "parent": 1,
              "slug": "role-playing"
+         }
--    },
++    },
+     {
--        "pk": 10,
--        "model": "webcatalog.department",
++        "pk": 10,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Geography",
--            "parent": 5,
++            "name": "Geography",
++            "parent": 5,
              "slug": "geography"
+         }
--    },
++    },
+     {
--        "pk": 13,
--        "model": "webcatalog.department",
++        "pk": 13,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Graphics",
--            "parent": null,
++            "name": "Graphics",
++            "parent": null,
              "slug": "graphics"
+         }
--    },
++    },
+     {
--        "pk": 12,
--        "model": "webcatalog.department",
++        "pk": 12,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Viewers",
--            "parent": 13,
++            "name": "Viewers",
++            "parent": 13,
              "slug": "viewers"
+         }
--    },
++    },
+     {
--        "pk": 14,
--        "model": "webcatalog.department",
++        "pk": 14,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Themes & Tweaks",
--            "parent": null,
++            "name": "Themes & Tweaks",
++            "parent": null,
              "slug": "themes-tweaks"
+         }
--    },
++    },
+     {
--        "pk": 15,
--        "model": "webcatalog.department",
++        "pk": 15,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Internet",
--            "parent": null,
++            "name": "Internet",
++            "parent": null,
              "slug": "internet"
+         }
--    },
++    },
+     {
--        "pk": 16,
--        "model": "webcatalog.department",
++        "pk": 16,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Debugging",
--            "parent": 4,
++            "name": "Debugging",
++            "parent": 4,
              "slug": "debugging"
+         }
--    },
++    },
+     {
--        "pk": 17,
--        "model": "webcatalog.department",
++        "pk": 17,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Profiling",
--            "parent": 4,
++            "name": "Profiling",
++            "parent": 4,
              "slug": "profiling"
+         }
--    },
++    },
+     {
--        "pk": 18,
--        "model": "webcatalog.department",
++        "pk": 18,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Chat",
--            "parent": 15,
++            "name": "Chat",
++            "parent": 15,
              "slug": "chat"
+         }
--    },
++    },
+     {
--        "pk": 19,
--        "model": "webcatalog.department",
++        "pk": 19,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "IDEs",
--            "parent": 4,
++            "name": "IDEs",
++            "parent": 4,
              "slug": "ides"
+         }
--    },
++    },
+     {
--        "pk": 20,
--        "model": "webcatalog.department",
++        "pk": 20,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "3D",
--            "parent": 13,
++            "name": "3D",
++            "parent": 13,
              "slug": "3d"
+         }
--    },
++    },
+     {
--        "pk": 21,
--        "model": "webcatalog.department",
++        "pk": 21,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Engineering",
--            "parent": 5,
++            "name": "Engineering",
++            "parent": 5,
              "slug": "engineering"
+         }
--    },
++    },
+     {
--        "pk": 22,
--        "model": "webcatalog.department",
++        "pk": 22,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Electronics",
--            "parent": 5,
++            "name": "Electronics",
++            "parent": 5,
              "slug": "electronics"
+         }
--    },
++    },
+     {
--        "pk": 23,
--        "model": "webcatalog.department",
++        "pk": 23,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Web Browsers",
--            "parent": 15,
++            "name": "Web Browsers",
++            "parent": 15,
              "slug": "web-browsers"
+         }
--    },
++    },
+     {
--        "pk": 24,
--        "model": "webcatalog.department",
++        "pk": 24,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Mathematics",
--            "parent": 5,
++            "name": "Mathematics",
++            "parent": 5,
              "slug": "mathematics"
+         }
--    },
++    },
+     {
--        "pk": 25,
--        "model": "webcatalog.department",
++        "pk": 25,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Chemistry",
--            "parent": 5,
++            "name": "Chemistry",
++            "parent": 5,
              "slug": "chemistry"
+         }
--    },
++    },
+     {
--        "pk": 26,
--        "model": "webcatalog.department",
++        "pk": 26,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Physics",
--            "parent": 5,
++            "name": "Physics",
++            "parent": 5,
              "slug": "physics"
+         }
--    },
++    },
+     {
--        "pk": 28,
--        "model": "webcatalog.department",
++        "pk": 28,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Mail",
--            "parent": 15,
++            "name": "Mail",
++            "parent": 15,
              "slug": "mail"
+         }
--    },
++    },
+     {
--        "pk": 29,
--        "model": "webcatalog.department",
++        "pk": 29,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Computing & Robotics",
--            "parent": 5,
++            "name": "Computing & Robotics",
++            "parent": 5,
              "slug": "computing-robotics"
+         }
--    },
++    },
+     {
--        "pk": 30,
--        "model": "webcatalog.department",
++        "pk": 30,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Web Development",
--            "parent": 4,
++            "name": "Web Development",
++            "parent": 4,
              "slug": "web-development"
+         }
--    },
++    },
+     {
--        "pk": 31,
--        "model": "webcatalog.department",
++        "pk": 31,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Graphic Interface Design",
--            "parent": 4,
++            "name": "Graphic Interface Design",
++            "parent": 4,
              "slug": "graphic-interface-design"
+         }
--    },
++    },
+     {
--        "pk": 32,
--        "model": "webcatalog.department",
++        "pk": 32,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Version Control",
--            "parent": 4,
++            "name": "Version Control",
++            "parent": 4,
              "slug": "version-control"
+         }
--    },
++    },
+     {
--        "pk": 33,
--        "model": "webcatalog.department",
++        "pk": 33,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Photography",
--            "parent": 13,
++            "name": "Photography",
++            "parent": 13,
              "slug": "photography"
+         }
--    },
++    },
+     {
--        "pk": 34,
--        "model": "webcatalog.department",
++        "pk": 34,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Astronomy",
--            "parent": 5,
++            "name": "Astronomy",
++            "parent": 5,
              "slug": "astronomy"
+         }
--    },
++    },
+     {
--        "pk": 35,
--        "model": "webcatalog.department",
++        "pk": 35,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Universal Access",
--            "parent": null,
++            "name": "Universal Access",
++            "parent": null,
              "slug": "universal-access"
+         }
--    },
++    },
+     {
--        "pk": 36,
--        "model": "webcatalog.department",
++        "pk": 36,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Drawing",
--            "parent": 13,
++            "name": "Drawing",
++            "parent": 13,
              "slug": "drawing"
+         }
--    },
++    },
+     {
--        "pk": 37,
--        "model": "webcatalog.department",
++        "pk": 37,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Painting",
--            "parent": 13,
++            "name": "Painting",
++            "parent": 13,
              "slug": "painting"
+         }
--    },
++    },
+     {
--        "pk": 38,
--        "model": "webcatalog.department",
++        "pk": 38,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Publishing",
--            "parent": 13,
++            "name": "Publishing",
++            "parent": 13,
              "slug": "publishing"
+         }
--    },
++    },
+     {
--        "pk": 39,
--        "model": "webcatalog.department",
++        "pk": 39,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Localization",
--            "parent": 4,
++            "name": "Localization",
++            "parent": 4,
              "slug": "localization"
+         }
--    },
++    },
+     {
--        "pk": 40,
--        "model": "webcatalog.department",
++        "pk": 40,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Scanning & OCR",
--            "parent": 13,
++            "name": "Scanning & OCR",
++            "parent": 13,
              "slug": "scanning-ocr"
+         }
--    },
++    },
+     {
--        "pk": 41,
--        "model": "webcatalog.department",
++        "pk": 41,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Geology",
--            "parent": 5,
++            "name": "Geology",
++            "parent": 5,
              "slug": "geology"
+         }
--    },
++    },
+     {
--        "pk": 42,
--        "model": "webcatalog.department",
++        "pk": 42,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Board Games",
--            "parent": 1,
++            "name": "Board Games",
++            "parent": 1,
              "slug": "board-games"
+         }
--    },
++    },
+     {
--        "pk": 43,
--        "model": "webcatalog.department",
++        "pk": 43,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Puzzles",
--            "parent": 1,
++            "name": "Puzzles",
++            "parent": 1,
              "slug": "puzzles"
+         }
--    },
++    },
+     {
--        "pk": 44,
--        "model": "webcatalog.department",
++        "pk": 44,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "File Sharing",
--            "parent": 15,
++            "name": "File Sharing",
++            "parent": 15,
              "slug": "file-sharing"
+         }
--    },
++    },
+     {
--        "pk": 45,
--        "model": "webcatalog.department",
++        "pk": 45,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Sports",
--            "parent": 1,
++            "name": "Sports",
++            "parent": 1,
              "slug": "sports"
+         }
--    },
++    },
+     {
--        "pk": 46,
--        "model": "webcatalog.department",
++        "pk": 46,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Card Games",
--            "parent": 1,
++            "name": "Card Games",
++            "parent": 1,
              "slug": "card-games"
+         }
--    },
++    },
+     {
--        "pk": 47,
--        "model": "webcatalog.department",
++        "pk": 47,
++        "model": "webcatalog.department",
          "fields": {
--            "name": "Fonts",
--            "parent": null,
++            "name": "Fonts",
++            "parent": null,
              "slug": "fonts"
+         }
++    },
++    {
++        "pk": 48,
++        "model": "webcatalog.department",
++        "fields": {
++            "name": "Java",
++            "parent": 4,
++            "slug": "java"
++        }
++    },
++    {
++        "pk": 49,
++        "model": "webcatalog.department",
++        "fields": {
++            "name": "Python",
++            "parent": 4,
++            "slug": "python"
++        }
++    },
++    {
++        "pk": 50,
++        "model": "webcatalog.department",
++        "fields": {
++            "name": "Books & Magazines",
++            "parent": null,
++            "slug": "books-magazines"
++        }
+     }
+ ]
 === modified file 'src/webcatalog/management/commands/import_sca_apps.py'
 --- src/webcatalog/management/commands/import_sca_apps.py	2012-08-20 09:17:36 +0000
 +++ src/webcatalog/management/commands/import_sca_apps.py	2012-08-21 13:59:20 +0000
@@ -97,7 +97,8 @@
              app_data, distroseries)
          if form.is_valid():
              app = form.save()
--            app.update_departments()
++            department_names = app_data.get('department', [])
++            app.update_departments(department_names)
              self.add_icon_to_app(app, data=icon_data)
              self.output(u"{0} created.\n".format(app.name).encode('utf-8'), 1)
          return app.package_name
 === modified file 'src/webcatalog/models/applications.py'
 --- src/webcatalog/models/applications.py	2012-08-20 15:37:31 +0000
 +++ src/webcatalog/models/applications.py	2012-08-21 13:59:20 +0000
@@ -153,17 +153,32 @@
                  .filter(application__package_name=self.package_name)
                  .distinct().order_by('-code_name'))
--    def update_departments(self):
++    def update_departments(self, department_names=None):
          """Update the list of departments for this app"""
++        department_names = department_names or []
++
++        def get_dept(dept_name):
++            dept, created = Department.objects.get_or_create(
++                name=dept_name, defaults={'slug': slugify(dept_name)})
++            if created:
++                logging.warn("Department %s automatically created!" %
++                             dept_name)
++            return dept
++
++        if self.imported_from_sca:
++            if department_names:
++                for dept_name in department_names:
++                    dept = get_dept(dept_name)
++                    self.departments.add(dept)
++                return
++            elif self.departments.all():
++                return
++
          self.departments.clear()
          for dept_name, dept_filters in department_filters.items():
              for dept_filter in dept_filters:
                  if dept_filter(self):
--                    dept, created = Department.objects.get_or_create(
--                        name=dept_name, defaults={'slug': slugify(dept_name)})
--                    if created:
--                        logging.warn("Department %s automatically created!" %
--                                     dept_name)
++                    dept = get_dept(dept_name)
                      self.departments.add(dept)
                      break
 === added file 'src/webcatalog/static/images/dept_icons/books-magazines.png'
 Binary files src/webcatalog/static/images/dept_icons/books-magazines.png	1970-01-01 00:00:00 +0000 and src/webcatalog/static/images/dept_icons/books-magazines.png	2012-08-21 13:59:20 +0000 differ
 === modified file 'src/webcatalog/static/images/dept_icons/java.png'
 Binary files src/webcatalog/static/images/dept_icons/java.png	2012-05-07 14:13:45 +0000 and src/webcatalog/static/images/dept_icons/java.png	2012-08-21 13:59:20 +0000 differ
 === added file 'src/webcatalog/static/images/dept_icons/python.png'
 Binary files src/webcatalog/static/images/dept_icons/python.png	1970-01-01 00:00:00 +0000 and src/webcatalog/static/images/dept_icons/python.png	2012-08-21 13:59:20 +0000 differ
 === modified file 'src/webcatalog/tests/test_commands.py'
 --- src/webcatalog/tests/test_commands.py	2012-08-21 12:51:48 +0000
 +++ src/webcatalog/tests/test_commands.py	2012-08-21 13:59:20 +0000
@@ -682,6 +682,14 @@
          arb_apps = Application.objects.filter(package_name='eg_arb_app')
          self.assertEqual(2, arb_apps.count())
++    def test_import_sca_apps_updates_depts(self):
++        call_command('import_for_purchase_apps')
++
++        app = Application.objects.get(package_name='hello',
++                                      distroseries=self.natty)
++        self.assertEqual(['Books & Magazines'],
++                         [dept.name for dept in app.departments.all()])
++
      def test_no_longer_existing_apps_are_removed(self):
          precise = self.factory.make_distroseries(code_name='precise')
          old_app = self.factory.make_application(
 === modified file 'src/webcatalog/tests/test_data/sca_apps.txt'
 --- src/webcatalog/tests/test_data/sca_apps.txt	2012-06-26 09:00:21 +0000
 +++ src/webcatalog/tests/test_data/sca_apps.txt	2012-08-21 13:59:20 +0000
@@ -14,6 +14,9 @@
                  "http://localhost:8000/screenshot_1.png",
                  "http://localhost:8000/screenshot_2.png"
          ],
++        "department": [
++            "Books & Magazines"
++        ],
          "archive_root": "",
          "tos_url": "",
          "icon_url": "http://localhost:8000/site_media/icons/2011/06/eg_64x64.png",
 === modified file 'src/webcatalog/tests/test_models.py'
 --- src/webcatalog/tests/test_models.py	2012-08-20 15:36:56 +0000
 +++ src/webcatalog/tests/test_models.py	2012-08-21 13:59:20 +0000
@@ -61,6 +61,37 @@
          self.assertEqual(1, app.departments.count())
          self.assertEqual('Games', app.departments.get().name)
++    def test_update_departments_for_sca_doesnt_clear(self):
++        dept_names = ['dept1', 'dept2']
++        departments = [
++            self.factory.make_department(name) for name in dept_names]
++        app = self.factory.make_application(imported_from_sca=True,
++                                            departments=departments)
++
++        app.update_departments()
++
++        self.assertEqual(dept_names,
++                         [dept.name for dept in app.departments.all()])
++
++    def test_update_departments_for_sca_from_categories(self):
++        # If an sca-imported app doesn't have any departments, it
++        # should be updated as per the categories.
++        app = self.factory.make_application(imported_from_sca=True)
++        app.categories = 'Game;'
++
++        app.update_departments()
++
++        self.assertEqual(1, app.departments.count())
++        self.assertEqual('Games', app.departments.get().name)
++
++    def test_update_departments_for_sca_from_departments(self):
++        app = self.factory.make_application(imported_from_sca=True)
++
++        app.update_departments(['Books & Magazines'])
++
++        self.assertEqual(1, app.departments.count())
++        self.assertEqual('Books & Magazines', app.departments.get().name)
++
      def test_crumbs_no_department(self):
          app = self.factory.make_application()
          app_url = reverse('wc-package-detail',

Ubuntu Apps Directory

Merge lp:~michael.nelson/ubuntu-webcatalog/1025679-diffs-with-client into lp:ubuntu-webcatalog

Commit message

Description of the change

Preview Diff

Subscribers