[Pkg-owncloud-commits] [owncloud] 160/223: Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 15c215cd031602013d982d630306314fc6c1b21c
Merge: b67588d 86f546f
Author: Georg Ehrke <developer at georgehrke.com>
Date:   Mon Jun 16 15:54:50 2014 +0200

    Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore
    
    Make shipped apps updatable via appstore

 lib/autoloader.php             |  11 +-
 lib/private/app.php            | 262 ++++++++++++++++++++++----------
 lib/private/installer.php      | 334 +++++++++++++++++++++++++++--------------
 settings/ajax/disableapp.php   |  11 +-
 settings/ajax/installapp.php   |  19 +++
 settings/ajax/uninstallapp.php |  19 +++
 settings/ajax/updateapp.php    |  41 ++++-
 settings/js/apps.js            |  27 ++++
 settings/routes.php            |   2 +
 settings/templates/apps.php    |   1 +
 tests/data/testapp.zip         | Bin 0 -> 895 bytes
 tests/data/testapp2.zip        | Bin 0 -> 2449 bytes
 tests/lib/installer.php        |  77 ++++++++++
 tests/preseed-config.php       |   2 +-
 14 files changed, 599 insertions(+), 207 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git