[gnome-software/wip/rancell/ubuntu-provenance: 83/83] Merge branch 'master' into wip/rancell/ubuntu-provenance



commit 9d9ec318b41b13438fc4f770e695e46b3447c535
Merge: f2c142b 3ee3a3c
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue Feb 23 16:09:08 2016 +1300

    Merge branch 'master' into wip/rancell/ubuntu-provenance

 RELEASE                                        |    6 +-
 configure.ac                                   |    7 +-
 contrib/gnome-software.spec.in                 |   12 +-
 data/appdata/org.gnome.Software.appdata.xml.in |   23 +
 po/LINGUAS                                     |    1 +
 po/POTFILES.in                                 |    1 +
 po/ca.po                                       |  715 ++++---
 po/de.po                                       |  339 ++-
 po/es.po                                       |  326 ++-
 po/hu.po                                       |  172 +-
 po/nl.po                                       | 2722 ++++++++++++++++++++++++
 po/pl.po                                       |  256 ++-
 po/pt_BR.po                                    |  225 ++-
 po/sk.po                                       |  189 ++-
 po/sr.po                                       |  803 +++++---
 po/sr latin po                                 |  920 +++++---
 po/th.po                                       |  668 ++++---
 po/zh_TW.po                                    |  809 ++++---
 src/Makefile.am                                |    9 +-
 src/gnome-software.gresource.xml               |    1 +
 src/gnome-software.ui                          |    8 +
 src/gs-app-row.c                               |    5 +
 src/gs-app.c                                   |   44 +
 src/gs-app.h                                   |    4 +
 src/gs-application.c                           |    2 +
 src/gs-category.c                              |    4 +-
 src/gs-hiding-box.c                            |    2 +-
 src/gs-plugin-loader.c                         |  114 +-
 src/gs-plugin-loader.h                         |    8 +
 src/gs-plugin.h                                |   15 +
 src/gs-review-dialog.c                         |   45 +-
 src/gs-review-dialog.ui                        |   27 +-
 src/gs-review-histogram.ui                     |   19 +-
 src/gs-review-row.c                            |   17 +-
 src/gs-review-row.ui                           |   13 +
 src/gs-review.h                                |    1 +
 src/gs-shell-details.c                         |   45 -
 src/gs-shell-installed.c                       |   10 +-
 src/gs-shell-installed.ui                      |   17 +-
 src/gs-shell-moderate.c                        |  320 +++
 src/gs-shell-moderate.h                        |   51 +
 src/gs-shell-moderate.ui                       |  104 +
 src/gs-shell-search-provider.c                 |    4 +-
 src/gs-shell-updates.c                         |  150 ++
 src/gs-shell-updates.ui                        |   25 +-
 src/gs-shell.c                                 |   12 +
 src/gs-shell.h                                 |    1 +
 src/gs-star-widget.c                           |   78 +-
 src/gs-star-widget.h                           |    2 +
 src/gs-star-widget.ui                          |   10 +-
 src/gs-update-monitor.c                        |    9 +-
 src/gs-upgrade-banner.c                        |   35 +-
 src/gs-upgrade-banner.h                        |    5 +-
 src/gtk-style-hc.css                           |   14 +-
 src/gtk-style.css                              |   16 +-
 src/plugins/Makefile.am                        |   19 +-
 src/plugins/gs-plugin-appstream.c              |   72 +-
 src/plugins/gs-plugin-dummy.c                  |    4 +-
 src/plugins/gs-plugin-epiphany.c               |   12 +
 src/plugins/gs-plugin-fedora-distro-upgrades.c |    8 +-
 src/plugins/gs-plugin-fedora-tagger-ratings.c  |  636 ------
 src/plugins/gs-plugin-fedora-tagger-usage.c    |   21 +-
 src/plugins/gs-plugin-fwupd.c                  |   17 +-
 src/plugins/gs-plugin-icons.c                  |   28 +-
 src/plugins/gs-plugin-local-ratings.c          |  253 ---
 src/plugins/gs-plugin-packagekit-refine.c      |   39 +-
 src/plugins/gs-plugin-packagekit.c             |   38 +
 src/plugins/gs-plugin-systemd-updates.c        |   12 +
 src/plugins/gs-plugin-ubuntu-reviews.c         |  679 ++++++
 src/plugins/gs-plugin-xdg-app-reviews.c        |  150 +-
 src/plugins/gs-plugin-xdg-app.c                |  593 +++++-
 71 files changed, 8702 insertions(+), 3319 deletions(-)
---
diff --cc src/plugins/Makefile.am
index c092346,5156bb7..09f22cf
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@@ -36,12 -36,10 +36,11 @@@ plugin_LTLIBRARIES =                                       
        libgs_plugin_moduleset.la                       \
        libgs_plugin_menu-spec-categories.la            \
        libgs_plugin_menu-spec-refine.la                \
-       libgs_plugin_local-ratings.la                   \
        libgs_plugin_fedora_distro_upgrades.la          \
        libgs_plugin_fedora_provenance.la               \
-       libgs_plugin_fedora_tagger_ratings.la           \
+       libgs_plugin_ubuntu-reviews.la                  \
        libgs_plugin_fedora_tagger_usage.la             \
 +      libgs_plugin_ubuntu_provenance.la               \
        libgs_plugin_epiphany.la                        \
        libgs_plugin_icons.la
  


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]