[Pkg-owncloud-commits] [owncloud] 02/04: Merge tag 'upstream/5.0.12_rc1+dfsg'

David Prévot taffit at alioth.debian.org
Fri Sep 27 23:49:07 UTC 2013


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

taffit pushed a commit to branch master
in repository owncloud.

commit 56901b1da825f1421ddf13308753d645df4d9152
Merge: 461cbe2 a30b29d
Author: David Prévot <taffit at debian.org>
Date:   Fri Sep 27 18:15:56 2013 -0400

    Merge tag 'upstream/5.0.12_rc1+dfsg'
    
    Upstream version 5.0.12~rc1+dfsg
    
    # gpg: Signature faite le ven. 27 sept. 2013 18:14:32 AST avec la clef RSA d'identifiant 44F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 apps/contacts/appinfo/bootstrap.php                |    1 +
 apps/contacts/appinfo/remote.php                   |    1 +
 apps/contacts/js/contacts.js                       |   35 +-
 apps/contacts/lib/sabre/validatorplugin.php        |  122 +
 apps/contacts/lib/vcard.php                        |    9 +-
 apps/files/ajax/upload.php                         |    3 +-
 apps/files/js/file-upload.js                       |    5 +-
 apps/files/js/fileactions.js                       |    5 +
 apps/files/js/filelist.js                          |    7 +-
 apps/files_encryption/appinfo/app.php              |    4 +-
 apps/files_encryption/hooks/hooks.php              |   36 +-
 .../3rdparty/irodsphp/prods/src/Prods.inc.php      |    1 -
 .../irodsphp/prods/src/ProdsConfig.inc.php         |    2 -
 .../irodsphp/prods/src/ProdsPath.class.php         |    2 -
 .../irodsphp/prods/src/ProdsQuery.class.php        |    2 -
 .../irodsphp/prods/src/ProdsRule.class.php         |    2 -
 .../irodsphp/prods/src/ProdsStreamer.class.php     |    2 -
 .../irodsphp/prods/src/RODSAccount.class.php       |    2 -
 .../3rdparty/irodsphp/prods/src/RODSConn.class.php |    2 -
 .../irodsphp/prods/src/RODSConnManager.class.php   |    2 -
 .../irodsphp/prods/src/RODSException.class.php     |    2 -
 .../irodsphp/prods/src/RODSGenQueConds.class.php   |    2 -
 .../irodsphp/prods/src/RODSGenQueResults.class.php |    2 -
 .../irodsphp/prods/src/RODSGenQueSelFlds.class.php |    2 -
 .../irodsphp/prods/src/RODSKeyValPair.class.php    |    2 -
 .../irodsphp/prods/src/RODSMessage.class.php       |    2 -
 .../irodsphp/prods/src/RODSObjIOOpr.inc.php        |    1 -
 .../3rdparty/irodsphp/prods/src/RodsAPINum.inc.php |    1 -
 .../3rdparty/irodsphp/prods/src/RodsConst.inc.php  |    2 -
 .../irodsphp/prods/src/RodsErrorTable.inc.php      |    1 -
 .../irodsphp/prods/src/RodsGenQueryKeyWd.inc.php   |    1 -
 .../irodsphp/prods/src/RodsGenQueryNum.inc.php     |    1 -
 .../irodsphp/prods/src/packet/RODSPacket.class.php |    2 -
 .../prods/src/packet/RP_BinBytesBuf.class.php      |    2 -
 .../irodsphp/prods/src/packet/RP_CollInp.class.php |    2 -
 .../prods/src/packet/RP_CollOprStat.class.php      |    2 -
 .../prods/src/packet/RP_DataObjCopyInp.class.php   |    2 -
 .../prods/src/packet/RP_DataObjInp.class.php       |    2 -
 .../prods/src/packet/RP_ExecCmdOut.class.php       |    2 -
 .../prods/src/packet/RP_ExecMyRuleInp.class.php    |    2 -
 .../prods/src/packet/RP_GenQueryInp.class.php      |    2 -
 .../prods/src/packet/RP_GenQueryOut.class.php      |    2 -
 .../prods/src/packet/RP_InxIvalPair.class.php      |    2 -
 .../prods/src/packet/RP_InxValPair.class.php       |    2 -
 .../prods/src/packet/RP_KeyValPair.class.php       |    2 -
 .../prods/src/packet/RP_MiscSvrInfo.class.php      |    2 -
 .../src/packet/RP_ModAVUMetadataInp.class.php      |    2 -
 .../irodsphp/prods/src/packet/RP_MsParam.class.php |    2 -
 .../prods/src/packet/RP_MsParamArray.class.php     |    2 -
 .../prods/src/packet/RP_MsgHeader.class.php        |    3 -
 .../prods/src/packet/RP_RHostAddr.class.php        |    2 -
 .../prods/src/packet/RP_RodsObjStat.class.php      |    2 -
 .../irodsphp/prods/src/packet/RP_STR.class.php     |    2 -
 .../prods/src/packet/RP_SqlResult.class.php        |    2 -
 .../prods/src/packet/RP_StartupPack.class.php      |    2 -
 .../prods/src/packet/RP_TransStat.class.php        |    2 -
 .../irodsphp/prods/src/packet/RP_Version.class.php |    2 -
 .../prods/src/packet/RP_authRequestOut.class.php   |    2 -
 .../prods/src/packet/RP_authResponseInp.class.php  |    2 -
 .../prods/src/packet/RP_dataObjCloseInp.class.php  |    2 -
 .../prods/src/packet/RP_dataObjReadInp.class.php   |    2 -
 .../prods/src/packet/RP_dataObjWriteInp.class.php  |    2 -
 .../prods/src/packet/RP_fileLseekInp.class.php     |    2 -
 .../prods/src/packet/RP_fileLseekOut.class.php     |    2 -
 .../src/packet/RP_getTempPasswordOut.class.php     |    2 -
 .../src/packet/RP_pamAuthRequestInp.class.php      |    1 -
 .../src/packet/RP_pamAuthRequestOut.class.php      |    1 -
 .../prods/src/packet/RP_sslEndInp.class.php        |    1 -
 .../prods/src/packet/RP_sslStartInp.class.php      |    1 -
 .../3rdparty/irodsphp/prods/src/setRodsAPINum.php  |    2 -
 .../irodsphp/prods/src/setRodsErrorCodes.php       |    2 -
 .../irodsphp/prods/src/setRodsGenQueryKeyWd.php    |    2 -
 .../irodsphp/prods/src/setRodsGenQueryNum.php      |    2 -
 apps/files_external/lib/irods.php                  |   11 +-
 apps/gallery/ajax/thumbnail.php                    |    3 +-
 apps/gallery/css/styles.css                        |   14 +-
 apps/gallery/index.php                             |    1 +
 apps/gallery/js/gallery.js                         |  117 +-
 apps/gallery/js/slideshow.js                       |   35 +-
 apps/gallery/js/thumbnail.js                       |   61 +
 core/css/styles.css                                |    1 -
 .../configuration/configuration_encryption.txt     |   22 +-
 .../configuration/configuring_big_file_upload.txt  |    5 +-
 .../_sources/installation/installation_windows.txt |    2 +-
 .../configuration/configuration_encryption.html    |   22 +-
 .../configuration/configuring_big_file_upload.html |    6 +-
 .../admin/installation/installation_windows.html   |    2 +-
 core/doc/admin/searchindex.js                      |    2 +-
 .../_sources/files/configuring_big_file_upload.txt |    2 +-
 .../user/files/configuring_big_file_upload.html    |    2 +-
 core/js/jquery-ui-1.10.0.custom.js                 |14850 ++++++++++++++++++++
 core/js/share.js                                   |   17 +-
 core/templates/layout.user.php                     |    3 +-
 db_structure.xml                                   |    2 +-
 lib/files/cache/scanner.php                        |    2 +
 lib/files/storage/mappedlocal.php                  |   18 +-
 lib/files/view.php                                 |   89 +-
 lib/helper.php                                     |   20 +-
 lib/public/share.php                               |    9 +-
 public.php                                         |    1 +
 settings/js/users.js                               |    6 +-
 settings/users.php                                 |    2 +-
 102 files changed, 15366 insertions(+), 304 deletions(-)

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



More information about the Pkg-owncloud-commits mailing list