summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorryoon <ryoon>2014-03-23 01:19:17 +0000
committerryoon <ryoon>2014-03-23 01:19:17 +0000
commitc0c58f28ab8e5765d77499537c9e27122ab2ab55 (patch)
tree5eff235e9391018e25aa1f2c2aa348339ccdc385 /www
parent97d55d4d6e51f5f8c7538a5b46ff59e6d98ddcf5 (diff)
downloadpkgsrc-c0c58f28ab8e5765d77499537c9e27122ab2ab55.tar.gz
Update to 6.0.2
* Update MESSAGE to use nginx and php-fpm. I cannot enable with apache24 (yet). Changelog: Version 6.0.2 March 3rd 2014 Several security fixes Improved trash bin performance for deleting lots of files Mobile interface improvements Fix key problems in encryption mode in rare situations Smaller LDAP improvements Fix the keep-alive ping for non standard php session lifetimes Cleanup storage table when deleting an entry Fix compatibility with xsendfile mode Fix file size calculation in encryption mode Fix image previews in trash bin Fix public upload with enabled enryption Added APC enabled check Correctly localise date in notification emails Improve compatibility with some CIFS servers Fix shared files and Gallery Several Contacts compatibility improvements Several Documents improvements A lot of smaller bug fixes
Diffstat (limited to 'www')
-rw-r--r--www/php-owncloud/MESSAGE58
-rw-r--r--www/php-owncloud/Makefile4
-rw-r--r--www/php-owncloud/PLIST629
-rw-r--r--www/php-owncloud/distinfo8
4 files changed, 449 insertions, 250 deletions
diff --git a/www/php-owncloud/MESSAGE b/www/php-owncloud/MESSAGE
index 697b21f004d..5471eb6a9af 100644
--- a/www/php-owncloud/MESSAGE
+++ b/www/php-owncloud/MESSAGE
@@ -1,25 +1,49 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.13 2013/11/22 14:34:33 ryoon Exp $
+$NetBSD: MESSAGE,v 1.14 2014/03/23 01:19:17 ryoon Exp $
To use ownCloud, you will need to perform the following steps.
1. If you want to use with MySQL server, install databases/mysql55-*
and enable it, then create database.
-2. Install apache httpd server, for example www/apache24 and www/ap-php.
+2. Install nginx httpd server, for example www/nginx.
-3. Be sure to have the following lines in ${PREFIX}/etc/httpd/httpd.conf
+3. Install PHP-FPM, PHP FastCGI Process Magager from www/php-fpm.
- Alias /owncloud ${PREFIX}/share/owncloud
- <Directory "${PREFIX}/share/owncloud">
- DirectoryIndex index.php
- Options All
- Allow from All
- AllowOverride All
- Require all granted
- </Directory>
+4. Be sure to have the following lines in ${PREFIX}/etc/nginx/nginx.conf
+ to enable PHP script in http://YOUR_SERVER_NAME/owncloud/ .
-4. Be sure to have the following lines in ${PREFIX}/etc/php.ini.
+ http {
+ server {
+ listen 80;
+ server_name YOUR_SERVER_NAME;
+ root ${PREFIX}/share/owncloud/;
+
+ client_max_body_size 10G; # set max upload size
+ fastcgi_buffers 64 4K;
+
+ location /owncloud {
+ index index.php;
+ error_page 403 /owncloud/core/templates/403.php;
+ error_page 404 /owncloud/core/templates/404.php;
+ alias ${PREFIX}/share/owncloud;
+ }
+
+ location ~ ^(.+?\.php)(/.*)?$ {
+ include fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME ${PREFIX}/share/$1;
+ fastcgi_param PATH_INFO $2;
+ fastcgi_pass 127.0.0.1:9000;
+ }
+ }
+ }
+
+5. Be sure to have the following lines in ${PREFIX}/etc/php-fam.conf
+ to restrict access from localhost only.
+
+ listen.allowed_clients = 127.0.0.1
+
+6. Be sure to have the following lines in ${PREFIX}/etc/php.ini.
extension=dom.so
extension=gd.so
@@ -34,7 +58,13 @@ To use ownCloud, you will need to perform the following steps.
extension=mysql.so ;if you select MySQL backend.
extension=pgsql.so ;if you select PostgreSQL backend.
-5. Start apache httpd.
+7. Start PHP-FPM daemon.
+
+ ${RCD_SCRIPTS_DIR}/php_fpm start
+
+8. Start nginx httpd server.
+
+ ${RCD_SCRIPTS_DIR}/nginx start
-6. Access http://localhost/owncloud/ and setup.
+6. Access http://YOUR_SERVER_NAME/owncloud/ and setup.
===========================================================================
diff --git a/www/php-owncloud/Makefile b/www/php-owncloud/Makefile
index afede268ccb..20c2fbe7e49 100644
--- a/www/php-owncloud/Makefile
+++ b/www/php-owncloud/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2014/02/02 14:56:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2014/03/23 01:19:17 ryoon Exp $
#
-DISTNAME= owncloud-6.0.1
+DISTNAME= owncloud-6.0.2
PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME}
CATEGORIES= www
MASTER_SITES= http://download.owncloud.org/community/
diff --git a/www/php-owncloud/PLIST b/www/php-owncloud/PLIST
index 10157e0a2c4..5768e469825 100644
--- a/www/php-owncloud/PLIST
+++ b/www/php-owncloud/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2014/02/02 14:56:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.24 2014/03/23 01:19:17 ryoon Exp $
share/owncloud/.htaccess
share/owncloud/3rdparty/Archive/Tar.php
share/owncloud/3rdparty/Console/Getopt.php
@@ -1520,6 +1520,7 @@ share/owncloud/3rdparty/miniColors/css/images/trigger.png
share/owncloud/3rdparty/miniColors/css/jquery.miniColors.css
share/owncloud/3rdparty/miniColors/js/jquery.miniColors.js
share/owncloud/3rdparty/miniColors/js/jquery.miniColors.min.js
+share/owncloud/3rdparty/patches.txt
share/owncloud/3rdparty/phpass/PasswordHash.php
share/owncloud/3rdparty/phpass/c/Makefile
share/owncloud/3rdparty/phpass/c/crypt_private.c
@@ -1664,79 +1665,6 @@ share/owncloud/3rdparty/phpdocx/lib/log4php/renderers/LoggerRendererException.ph
share/owncloud/3rdparty/phpdocx/lib/log4php/renderers/LoggerRendererMap.php
share/owncloud/3rdparty/phpdocx/lib/log4php/xml/log4php.dtd
share/owncloud/3rdparty/phpdocx/pdf/LICENSE.LGPL
-share/owncloud/3rdparty/phpdocx/pdf/dompdf.php
-share/owncloud/3rdparty/phpdocx/pdf/dompdf_config.inc.php
-share/owncloud/3rdparty/phpdocx/pdf/include/_dompdf2phpdocx.php
-share/owncloud/3rdparty/phpdocx/pdf/include/_dompdf_treeOut__20120418.php
-share/owncloud/3rdparty/phpdocx/pdf/include/absolute_positioner.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/abstract_renderer.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/attribute_translator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/block_frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/block_frame_reflower.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/block_positioner.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/block_renderer.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/cached_pdf_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/canvas.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/canvas_factory.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/cellmap.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/cpdf_adapter.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/css_color.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/dompdf.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/dompdf_exception.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/dompdf_internal_exception.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/dompdf_treeOut.php
-share/owncloud/3rdparty/phpdocx/pdf/include/file.skel
-share/owncloud/3rdparty/phpdocx/pdf/include/fixed_positioner.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/font_metrics.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/frame.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/frame_factory.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/frame_reflower.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/frame_tree.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/functions.inc.php
-share/owncloud/3rdparty/phpdocx/pdf/include/gd_adapter.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/image_cache.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/image_frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/image_frame_reflower.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/image_renderer.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/inline_frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/inline_frame_reflower.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/inline_positioner.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/inline_renderer.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/javascript_embedder.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/list_bullet_frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/list_bullet_frame_reflower.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/list_bullet_image_frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/list_bullet_positioner.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/list_bullet_renderer.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/null_frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/null_frame_reflower.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/null_positioner.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/page_cache.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/page_frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/page_frame_reflower.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/pdflib_adapter.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/php_evaluator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/positioner.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/renderer.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/style.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/stylesheet.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/table_cell_frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/table_cell_frame_reflower.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/table_cell_positioner.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/table_cell_renderer.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/table_frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/table_frame_reflower.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/table_row_frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/table_row_frame_reflower.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/table_row_group_frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/table_row_group_frame_reflower.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/table_row_positioner.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/tcpdf_adapter.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/text_frame_decorator.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/text_frame_reflower.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/text_renderer.cls.php
-share/owncloud/3rdparty/phpdocx/pdf/include/ttf_info.cls.php
share/owncloud/3rdparty/phpdocx/pdf/lib/class.pdf.php
share/owncloud/3rdparty/phpdocx/pdf/lib/fonts/Courier-Bold.afm
share/owncloud/3rdparty/phpdocx/pdf/lib/fonts/Courier-BoldOblique.afm
@@ -2197,94 +2125,6 @@ share/owncloud/3rdparty/phpdocx/pdf/tcpdf/tcpdf.fdf
share/owncloud/3rdparty/phpdocx/pdf/tcpdf/tcpdf.p12
share/owncloud/3rdparty/phpdocx/pdf/tcpdf/tcpdf.php
share/owncloud/3rdparty/phpdocx/pdf/tcpdf/unicode_data.php
-share/owncloud/3rdparty/phpdocx/pdf/www/examples.php
-share/owncloud/3rdparty/phpdocx/pdf/www/foot.inc
-share/owncloud/3rdparty/phpdocx/pdf/www/head.inc
-share/owncloud/3rdparty/phpdocx/pdf/www/images/arrow_01.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/arrow_02.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/arrow_03.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/arrow_04.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/arrow_05.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/arrow_06.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/css2.png
-share/owncloud/3rdparty/phpdocx/pdf/www/images/dompdf_simple.png
-share/owncloud/3rdparty/phpdocx/pdf/www/images/favicon.ico
-share/owncloud/3rdparty/phpdocx/pdf/www/images/favicon.png
-share/owncloud/3rdparty/phpdocx/pdf/www/images/h_bar.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/left_arrow.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/logo.png
-share/owncloud/3rdparty/phpdocx/pdf/www/images/logo.xcf
-share/owncloud/3rdparty/phpdocx/pdf/www/images/php5-power-micro.png
-share/owncloud/3rdparty/phpdocx/pdf/www/images/small_logo.png
-share/owncloud/3rdparty/phpdocx/pdf/www/images/star_01.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/star_02.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/star_03.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/star_04.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/star_05.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/title.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/v_bar.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/images/xhtml10.png
-share/owncloud/3rdparty/phpdocx/pdf/www/index.php
-share/owncloud/3rdparty/phpdocx/pdf/www/style.css
-share/owncloud/3rdparty/phpdocx/pdf/www/test/anchor_link.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/background_image.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/backgroundcolor_fontdecoration_pageborder.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/baseline.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/block_height.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/border_css_values.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/border_test.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/br.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/center_table.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/css/common.css
-share/owncloud/3rdparty/phpdocx/pdf/www/test/css/importabs.css
-share/owncloud/3rdparty/phpdocx/pdf/www/test/css/importall.css
-share/owncloud/3rdparty/phpdocx/pdf/www/test/css/importdisplay.css
-share/owncloud/3rdparty/phpdocx/pdf/www/test/css/importprint.css
-share/owncloud/3rdparty/phpdocx/pdf/www/test/css/importsub.css
-share/owncloud/3rdparty/phpdocx/pdf/www/test/css/linkall.css
-share/owncloud/3rdparty/phpdocx/pdf/www/test/css/linkdefault.css
-share/owncloud/3rdparty/phpdocx/pdf/www/test/css/linkdisplay.css
-share/owncloud/3rdparty/phpdocx/pdf/www/test/css/linkprint.css
-share/owncloud/3rdparty/phpdocx/pdf/www/test/css/print_static.css
-share/owncloud/3rdparty/phpdocx/pdf/www/test/demo_01.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/entities.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/font_selection.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/gif_test.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/html_attributes.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/image.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/image_variants.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/images/dokuwiki-128.png
-share/owncloud/3rdparty/phpdocx/pdf/www/test/images/dompdf_simple.png
-share/owncloud/3rdparty/phpdocx/pdf/www/test/images/goldengate.jpg
-share/owncloud/3rdparty/phpdocx/pdf/www/test/images/html.png
-share/owncloud/3rdparty/phpdocx/pdf/www/test/images/pdf.png
-share/owncloud/3rdparty/phpdocx/pdf/www/test/images/php.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/test/images/png.png
-share/owncloud/3rdparty/phpdocx/pdf/www/test/images/smiley.png
-share/owncloud/3rdparty/phpdocx/pdf/www/test/images/what_ordered.gif
-share/owncloud/3rdparty/phpdocx/pdf/www/test/important_flag.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/javascript.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/large_table.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/latin1.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/long_table.php
-share/owncloud/3rdparty/phpdocx/pdf/www/test/margin.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/media.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/multiple_class.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/nbsp.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/nested_table.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/pages.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/php_test.php
-share/owncloud/3rdparty/phpdocx/pdf/www/test/remote.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/simple_ul.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/special.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/symbols.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/table.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/table_01.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/table_height.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/table_image.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/ul.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/unicode.html
-share/owncloud/3rdparty/phpdocx/pdf/www/test/unicode_wrapping.html
share/owncloud/3rdparty/phpdocx/templates/README.txt
share/owncloud/3rdparty/phpdocx/templates/phpdocxBaseTemplate.docx
share/owncloud/3rdparty/phpdocx/templates/xmls/app.xml
@@ -3494,6 +3334,7 @@ share/owncloud/apps/documents/README.md
share/owncloud/apps/documents/ajax/controller.php
share/owncloud/apps/documents/ajax/documentController.php
share/owncloud/apps/documents/ajax/download.php
+share/owncloud/apps/documents/ajax/mimes.php
share/owncloud/apps/documents/ajax/otpoll.php
share/owncloud/apps/documents/ajax/personal.php
share/owncloud/apps/documents/ajax/sessionController.php
@@ -4293,7 +4134,6 @@ share/owncloud/apps/documents/lib/file.php
share/owncloud/apps/documents/lib/filter.php
share/owncloud/apps/documents/lib/genesis.php
share/owncloud/apps/documents/lib/helper.php
-share/owncloud/apps/documents/lib/invite.php
share/owncloud/apps/documents/lib/request.php
share/owncloud/apps/documents/lib/storage.php
share/owncloud/apps/documents/lib/view.php
@@ -4308,7 +4148,6 @@ share/owncloud/apps/documents/src/patches/hideCaretAvatar.patch
share/owncloud/apps/documents/src/patches/keepBodyStyle.patch
share/owncloud/apps/documents/src/updateWebODF.sh
share/owncloud/apps/documents/templates/documents.php
-share/owncloud/apps/documents/templates/part.sessions.php
share/owncloud/apps/documents/templates/personal.php
share/owncloud/apps/documents/templates/public.php
share/owncloud/apps/documents/templates/settings.php
@@ -4552,6 +4391,7 @@ share/owncloud/apps/files_encryption/css/settings-personal.css
share/owncloud/apps/files_encryption/files/error.php
share/owncloud/apps/files_encryption/hooks/hooks.php
share/owncloud/apps/files_encryption/js/detect-migration.js
+share/owncloud/apps/files_encryption/js/encryption.js
share/owncloud/apps/files_encryption/js/settings-admin.js
share/owncloud/apps/files_encryption/js/settings-personal.js
share/owncloud/apps/files_encryption/l10n/ar.php
@@ -4634,6 +4474,7 @@ share/owncloud/apps/files_encryption/tests/binary
share/owncloud/apps/files_encryption/tests/crypt.php
share/owncloud/apps/files_encryption/tests/encryption.key
share/owncloud/apps/files_encryption/tests/helper.php
+share/owncloud/apps/files_encryption/tests/hooks.php
share/owncloud/apps/files_encryption/tests/keymanager.php
share/owncloud/apps/files_encryption/tests/legacy-encrypted-text.txt
share/owncloud/apps/files_encryption/tests/proxy.php
@@ -5743,6 +5584,7 @@ share/owncloud/apps/files_sharing/appinfo/update.php
share/owncloud/apps/files_sharing/appinfo/version
share/owncloud/apps/files_sharing/css/404.css
share/owncloud/apps/files_sharing/css/authenticate.css
+share/owncloud/apps/files_sharing/css/mobile.css
share/owncloud/apps/files_sharing/css/public.css
share/owncloud/apps/files_sharing/js/public.js
share/owncloud/apps/files_sharing/js/share.js
@@ -5832,6 +5674,8 @@ share/owncloud/apps/files_sharing/templates/part.404.php
share/owncloud/apps/files_sharing/templates/public.php
share/owncloud/apps/files_sharing/tests/api.php
share/owncloud/apps/files_sharing/tests/base.php
+share/owncloud/apps/files_sharing/tests/cache.php
+share/owncloud/apps/files_sharing/tests/permissions.php
share/owncloud/apps/files_sharing/tests/watcher.php
share/owncloud/apps/files_texteditor/ajax/loadfile.php
share/owncloud/apps/files_texteditor/ajax/savefile.php
@@ -6369,72 +6213,6 @@ share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js
share/owncloud/apps/files_videoviewer/js/mep-extra.js
share/owncloud/apps/files_videoviewer/js/silverlightmediaelement.xap
share/owncloud/apps/files_videoviewer/js/viewer.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/Builder.py
-share/owncloud/apps/files_videoviewer/mediaelement/src/compiler.jar
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/background.png
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/bigplay.fw.png
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/bigplay.png
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/bigplay.svg
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/controls-ted.png
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/controls-wmp-bg.png
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/controls-wmp.png
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/controls.fw.png
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/controls.png
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/controls.svg
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/loading.gif
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/mediaelementplayer.css
-share/owncloud/apps/files_videoviewer/mediaelement/src/css/mejs-skins.css
-share/owncloud/apps/files_videoviewer/mediaelement/src/flash/FlashMediaElement.as
-share/owncloud/apps/files_videoviewer/mediaelement/src/flash/FlashMediaElement.fla
-share/owncloud/apps/files_videoviewer/mediaelement/src/flash/HtmlMediaEvent.as
-share/owncloud/apps/files_videoviewer/mediaelement/src/flash/htmlelements/AudioElement.as
-share/owncloud/apps/files_videoviewer/mediaelement/src/flash/htmlelements/IMediaElement.as
-share/owncloud/apps/files_videoviewer/mediaelement/src/flash/htmlelements/VideoElement.as
-share/owncloud/apps/files_videoviewer/mediaelement/src/flash/htmlelements/YouTubeElement.as
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/jeesh-extras.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/jeesh.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/me-featuredetection.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/me-header.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/me-i18n-locale-de.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/me-i18n-locale-zh.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/me-i18n.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/me-mediaelements.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/me-namespace.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/me-plugindetector.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/me-shim.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/me-utility.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-ads-vast.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-ads.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-backlight.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-contextmenu.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-endedhtml.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-fullscreen.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-googleanalytics.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-loop.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-playlist.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-playpause.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-postroll.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-progress.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-sourcechooser.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-speed.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-stop.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-time.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-tracks.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-visualcontrols.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-feature-volume.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-header.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-library.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/js/mep-player.js
-share/owncloud/apps/files_videoviewer/mediaelement/src/silverlight/App.xaml
-share/owncloud/apps/files_videoviewer/mediaelement/src/silverlight/App.xaml.cs
-share/owncloud/apps/files_videoviewer/mediaelement/src/silverlight/MainPage.xaml
-share/owncloud/apps/files_videoviewer/mediaelement/src/silverlight/MainPage.xaml.cs
-share/owncloud/apps/files_videoviewer/mediaelement/src/silverlight/Properties/AppManifest.xml
-share/owncloud/apps/files_videoviewer/mediaelement/src/silverlight/Properties/AssemblyInfo.cs
-share/owncloud/apps/files_videoviewer/mediaelement/src/silverlight/SilverlightMediaElement.csproj
-share/owncloud/apps/files_videoviewer/mediaelement/src/silverlight/SilverlightMediaElement.csproj.user
-share/owncloud/apps/files_videoviewer/mediaelement/src/silverlight/SilverlightMediaElement.sln
-share/owncloud/apps/files_videoviewer/mediaelement/src/yuicompressor-2.4.2.jar
share/owncloud/apps/firstrunwizard/ajax/disable.php
share/owncloud/apps/firstrunwizard/ajax/enable.php
share/owncloud/apps/firstrunwizard/appinfo/app.php
@@ -6514,6 +6292,7 @@ share/owncloud/apps/gallery/appinfo/info.xml
share/owncloud/apps/gallery/appinfo/routes.php
share/owncloud/apps/gallery/appinfo/update.php
share/owncloud/apps/gallery/appinfo/version
+share/owncloud/apps/gallery/css/mobile.css
share/owncloud/apps/gallery/css/public.css
share/owncloud/apps/gallery/css/slideshow.css
share/owncloud/apps/gallery/css/styles.css
@@ -7166,6 +6945,7 @@ share/owncloud/apps/user_ldap/templates/part.wizard-server.php
share/owncloud/apps/user_ldap/templates/part.wizard-userfilter.php
share/owncloud/apps/user_ldap/templates/part.wizardcontrols.php
share/owncloud/apps/user_ldap/templates/settings.php
+share/owncloud/apps/user_ldap/tests/access.php
share/owncloud/apps/user_ldap/tests/user_ldap.php
share/owncloud/apps/user_ldap/user_ldap.php
share/owncloud/apps/user_ldap/user_proxy.php
@@ -7249,6 +7029,7 @@ share/owncloud/core/command/user/report.php
share/owncloud/core/css/apps.css
share/owncloud/core/css/auth.css
share/owncloud/core/css/fixes.css
+share/owncloud/core/css/icons.css
share/owncloud/core/css/images/animated-overlay.gif
share/owncloud/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
share/owncloud/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
@@ -7269,6 +7050,184 @@ share/owncloud/core/css/jquery.ocdialog.css
share/owncloud/core/css/multiselect.css
share/owncloud/core/css/share.css
share/owncloud/core/css/styles.css
+share/owncloud/core/doc/admin/_images/100000000000001D0000001E5C455170.png
+share/owncloud/core/doc/admin/_images/100000000000003800000018D49F1CE7.png
+share/owncloud/core/doc/admin/_images/1000000000000050000000DB83B8FA5B.png
+share/owncloud/core/doc/admin/_images/10000000000000950000004412998BE7.png
+share/owncloud/core/doc/admin/_images/10000000000000A800000073F49785A6.png
+share/owncloud/core/doc/admin/_images/10000000000000B600000120706C3C75.png
+share/owncloud/core/doc/admin/_images/10000000000000CD000000ECA8DE7780.png
+share/owncloud/core/doc/admin/_images/10000000000000D2000000F553818155.png
+share/owncloud/core/doc/admin/_images/10000000000000F1000000F56125BDBA.png
+share/owncloud/core/doc/admin/_images/10000000000000F1000000F6704F46D3.png
+share/owncloud/core/doc/admin/_images/10000000000000F20000003BAA849B42.png
+share/owncloud/core/doc/admin/_images/10000000000000F300000068AF0ECD53.png
+share/owncloud/core/doc/admin/_images/10000000000000F40000019A110DD159.png
+share/owncloud/core/doc/admin/_images/10000000000000F5000000675DC5F68C.png
+share/owncloud/core/doc/admin/_images/10000000000000F500000067A8845EF8.png
+share/owncloud/core/doc/admin/_images/10000000000000F60000006754ED2A1E.png
+share/owncloud/core/doc/admin/_images/10000000000000F6000000685DFB3767.png
+share/owncloud/core/doc/admin/_images/100000000000012C0000009C444B4720.png
+share/owncloud/core/doc/admin/_images/100000000000013C0000017D4FC6CEF5.png
+share/owncloud/core/doc/admin/_images/10000000000001400000008A557EF7E3.png
+share/owncloud/core/doc/admin/_images/10000000000001440000005A2989832F.png
+share/owncloud/core/doc/admin/_images/1000000000000160000000DBB2FB0223.png
+share/owncloud/core/doc/admin/_images/1000000000000163000000E9CDA84C92.png
+share/owncloud/core/doc/admin/_images/1000000000000165000000D3FF2168AB.png
+share/owncloud/core/doc/admin/_images/1000000000000167000000B43E4BF478.png
+share/owncloud/core/doc/admin/_images/1000000000000175000000FAB2A2B294.png
+share/owncloud/core/doc/admin/_images/10000000000001800000009A9494E037.png
+share/owncloud/core/doc/admin/_images/10000000000001880000007EA4444400.png
+share/owncloud/core/doc/admin/_images/100000000000018B000000A090F31164.png
+share/owncloud/core/doc/admin/_images/100000000000018E000000C4BA62B2A3.png
+share/owncloud/core/doc/admin/_images/1000000000000193000001AE9AB8B0A2.png
+share/owncloud/core/doc/admin/_images/1000000000000194000000498325A766.png
+share/owncloud/core/doc/admin/_images/1000000000000194000000FAD39BC0D8.png
+share/owncloud/core/doc/admin/_images/1000000000000195000000EF7E44082C.png
+share/owncloud/core/doc/admin/_images/10000000000001980000009271BE0D26.png
+share/owncloud/core/doc/admin/_images/100000000000019E0000004CD2A0F407.png
+share/owncloud/core/doc/admin/_images/10000000000001A3000000AAFE82893A.png
+share/owncloud/core/doc/admin/_images/10000000000001A40000006C954442CE.png
+share/owncloud/core/doc/admin/_images/10000000000001AC000000477C76808F.png
+share/owncloud/core/doc/admin/_images/10000000000001BF00000012349EAE2F.png
+share/owncloud/core/doc/admin/_images/10000000000001C1000000FE663748B2.png
+share/owncloud/core/doc/admin/_images/10000000000001C9000000AF9C1CE57F.png
+share/owncloud/core/doc/admin/_images/10000000000001CE000000F2E2084BA1.png
+share/owncloud/core/doc/admin/_images/10000000000001CF00000176B0BE1EBC.png
+share/owncloud/core/doc/admin/_images/10000000000001D30000014DC251C948.png
+share/owncloud/core/doc/admin/_images/10000000000001E50000006E3ECDC427.png
+share/owncloud/core/doc/admin/_images/10000000000001E50000018C3AD09A21.png
+share/owncloud/core/doc/admin/_images/10000000000001EE00000164642CCA08.png
+share/owncloud/core/doc/admin/_images/10000000000001F40000016609A0CFCC.png
+share/owncloud/core/doc/admin/_images/10000000000001FD000000DF8D2D7546.png
+share/owncloud/core/doc/admin/_images/1000000000000200000000BCCCC35DEB.png
+share/owncloud/core/doc/admin/_images/10000000000002170000004A27056037.png
+share/owncloud/core/doc/admin/_images/100000000000021C0000004CACBF786C.png
+share/owncloud/core/doc/admin/_images/10000000000002210000002DE3BE7515.png
+share/owncloud/core/doc/admin/_images/1000000000000227000000935D9B1EF6.png
+share/owncloud/core/doc/admin/_images/100000000000023B000000125381F51B.png
+share/owncloud/core/doc/admin/_images/100000000000024400000027BEE1E4A9.png
+share/owncloud/core/doc/admin/_images/1000000000000247000000A77440E4D3.png
+share/owncloud/core/doc/admin/_images/10000000000002650000018CA6A1BE66.png
+share/owncloud/core/doc/admin/_images/10000000000002650000018E4285E964.png
+share/owncloud/core/doc/admin/_images/10000000000002690000018D3A8C9F17.png
+share/owncloud/core/doc/admin/_images/100000000000026A000001DCAF8778F2.png
+share/owncloud/core/doc/admin/_images/100000000000026E0000003672ADCB6E.png
+share/owncloud/core/doc/admin/_images/10000000000002720000013FB6EDA793.png
+share/owncloud/core/doc/admin/_images/100000000000027B0000011D10F70F88.png
+share/owncloud/core/doc/admin/_images/10000000000002840000016729388B7F.png
+share/owncloud/core/doc/admin/_images/1000000000000288000001A1D5BE4881.png
+share/owncloud/core/doc/admin/_images/1000000000000289000001A9D7F3941F.png
+share/owncloud/core/doc/admin/_images/10000000000002910000018B31D51F03.png
+share/owncloud/core/doc/admin/_images/1000000000000291000001951B69B9A6.png
+share/owncloud/core/doc/admin/_images/10000000000002950000019EF5732E36.png
+share/owncloud/core/doc/admin/_images/10000000000002950000021E245F6883.png
+share/owncloud/core/doc/admin/_images/1000000000000298000001870B0581FA.png
+share/owncloud/core/doc/admin/_images/1000000000000298000001874D3CA506.png
+share/owncloud/core/doc/admin/_images/100000000000029B0000018885B5282E.png
+share/owncloud/core/doc/admin/_images/100000000000029F000000B8A83D0275.png
+share/owncloud/core/doc/admin/_images/10000000000002A6000000BFBE298238.png
+share/owncloud/core/doc/admin/_images/10000000000002B1000002258C08D304.png
+share/owncloud/core/doc/admin/_images/10000000000002B3000000365E1CD00D.png
+share/owncloud/core/doc/admin/_images/10000000000002B30000003A5B960711.png
+share/owncloud/core/doc/admin/_images/10000000000002BB000000266DB6AD1A.png
+share/owncloud/core/doc/admin/_images/10000000000002BB000001EABD7E6DF0.png
+share/owncloud/core/doc/admin/_images/10000000000002BF000001E5B544E7E7.png
+share/owncloud/core/doc/admin/_images/10000000000002C1000001ED5CECCC6D.png
+share/owncloud/core/doc/admin/_images/10000000000002C3000001EBBD39E47A.png
+share/owncloud/core/doc/admin/_images/10000000000002C700000048F3729BAA.png
+share/owncloud/core/doc/admin/_images/10000000000002F3000000926CA65D02.png
+share/owncloud/core/doc/admin/_images/1000000000000304000001B964698779.png
+share/owncloud/core/doc/admin/_images/1000000000000336000000F38C3FAF84.png
+share/owncloud/core/doc/admin/_images/1000000000000372000002AF943ADDA0.png
+share/owncloud/core/doc/admin/_images/10000000000003730000002B6865E951.png
+share/owncloud/core/doc/admin/_images/10000000000003A60000011E274A1A28.png
+share/owncloud/core/doc/admin/_images/10000000000003A6000002A9C7A660BE.png
+share/owncloud/core/doc/admin/_images/10000000000003A800000039364066E4.png
+share/owncloud/core/doc/admin/_images/10000000000003B30000021B5EE5D338.png
+share/owncloud/core/doc/admin/_images/10000000000003DF00000071A41D8A1F.png
+share/owncloud/core/doc/admin/_images/10000000000003DF000000D953A456B6.png
+share/owncloud/core/doc/admin/_images/10000000000003E8000001524A147A04.png
+share/owncloud/core/doc/admin/_images/10000000000003EC000000AB60616FA7.png
+share/owncloud/core/doc/admin/_images/10000000000003FB000002359BAFB40E.png
+share/owncloud/core/doc/admin/_images/10000000000004010000017E4A6552BC.png
+share/owncloud/core/doc/admin/_images/1000000000000403000001632F0B76F6.png
+share/owncloud/core/doc/admin/_images/1000000000000404000000FCFC13E732.png
+share/owncloud/core/doc/admin/_images/10000000000004100000005657010336.png
+share/owncloud/core/doc/admin/_images/10000000000004170000016ACB5E15AE.png
+share/owncloud/core/doc/admin/_images/100000000000041D0000003D52225C0D.png
+share/owncloud/core/doc/admin/_images/100000000000041D0000017D8D1BC4D9.png
+share/owncloud/core/doc/admin/_images/100000000000042500000163D2B339D5.png
+share/owncloud/core/doc/admin/_images/1000000000000427000000324F58266D.png
+share/owncloud/core/doc/admin/_images/100000000000042E000001D3EEB9978B.png
+share/owncloud/core/doc/admin/_images/100000000000042F000000CC3EDDE79E.png
+share/owncloud/core/doc/admin/_images/1000000000000430000000AF9D6E724E.png
+share/owncloud/core/doc/admin/_images/100000000000043000000164DA0CE8C9.png
+share/owncloud/core/doc/admin/_images/100000000000043200000169BCD20493.png
+share/owncloud/core/doc/admin/_images/100000000000044C000002B0B421E27E.png
+share/owncloud/core/doc/admin/_images/1000000000000453000001BFFCF48776.png
+share/owncloud/core/doc/admin/_images/100000000000045800000197FE462F2B.png
+share/owncloud/core/doc/admin/_images/1000000000000462000000D44541CF9A.png
+share/owncloud/core/doc/admin/_images/1000000000000467000002B63162E59B.png
+share/owncloud/core/doc/admin/_images/10000000000004690000026615360BEB.png
+share/owncloud/core/doc/admin/_images/100000000000046C000000C2D3E5CF30.png
+share/owncloud/core/doc/admin/_images/100000000000046D0000015F4B5494A9.png
+share/owncloud/core/doc/admin/_images/100000000000046F000000DEA2BFCD9B.png
+share/owncloud/core/doc/admin/_images/1000000000000470000001B68AE60DD3.png
+share/owncloud/core/doc/admin/_images/10000000000004710000014BBC34499D.png
+share/owncloud/core/doc/admin/_images/100000000000047200000129CB014025.png
+share/owncloud/core/doc/admin/_images/10000000000004770000008AAF3CFFDB.png
+share/owncloud/core/doc/admin/_images/100000000000047700000219A3013A92.png
+share/owncloud/core/doc/admin/_images/1000000000000479000002887E7F48EA.png
+share/owncloud/core/doc/admin/_images/100000000000047A000000B727198874.png
+share/owncloud/core/doc/admin/_images/100000000000047A000000FB86FF2A9A.png
+share/owncloud/core/doc/admin/_images/100000000000047A0000011C6682A254.png
+share/owncloud/core/doc/admin/_images/100000000000048100000245268CDB7A.png
+share/owncloud/core/doc/admin/_images/10000000000004920000028D9C8DC2CB.png
+share/owncloud/core/doc/admin/_images/10000000000004C0000000795BB2C146.png
+share/owncloud/core/doc/admin/_images/10000000000004CA000002B52116BE0C.png
+share/owncloud/core/doc/admin/_images/10000000000004ED000000BE3B9E25D5.png
+share/owncloud/core/doc/admin/_images/1000000000000523000000C6F786381C.png
+share/owncloud/core/doc/admin/_images/100000000000052500000088DBB95005.png
+share/owncloud/core/doc/admin/_images/1000000000000525000000BE30CF0423.png
+share/owncloud/core/doc/admin/_images/1000000000000527000000A7AB409FE0.png
+share/owncloud/core/doc/admin/_images/100000000000052F000000C2867B7294.png
+share/owncloud/core/doc/admin/_images/1000000000000530000001410CF0028A.png
+share/owncloud/core/doc/admin/_images/100000000000053100000142D9A4C916.png
+share/owncloud/core/doc/admin/_images/1000000000000532000000285DDBBF37.png
+share/owncloud/core/doc/admin/_images/100000000000053A00000067708C8F53.png
+share/owncloud/core/doc/admin/_images/1000000000000552000000BF22E90239.png
+share/owncloud/core/doc/admin/_images/1000000000000557000002E148BAB6D4.png
+share/owncloud/core/doc/admin/_images/10000000000005970000006AE23997C9.png
+share/owncloud/core/doc/admin/_images/10000000000005AF00000074604B1A67.png
+share/owncloud/core/doc/admin/_images/10000000000005B90000007866D92D14.png
+share/owncloud/core/doc/admin/_images/10000000000005BB0000007C1DF71FA7.png
+share/owncloud/core/doc/admin/_images/10000000000005C30000006CAFFAAD61.png
+share/owncloud/core/doc/admin/_images/10000000000005D00000003B29340A7A.png
+share/owncloud/core/doc/admin/_images/10000000000005D50000009458C5EE48.png
+share/owncloud/core/doc/admin/_images/10000000000005E20000009B1BA5A8CF.png
+share/owncloud/core/doc/admin/_images/10000000000005E6000000676902E040.png
+share/owncloud/core/doc/admin/_images/10000000000005EB000000A68BA73E2D.png
+share/owncloud/core/doc/admin/_images/10000000000005EC00000073E678DFEC.png
+share/owncloud/core/doc/admin/_images/10000000000005F30000030F1372448D.png
+share/owncloud/core/doc/admin/_images/10000000000005F70000005F0912E904.png
+share/owncloud/core/doc/admin/_images/10000000000005F70000007E43DB8026.png
+share/owncloud/core/doc/admin/_images/10000000000005FA0000005CE8491B77.png
+share/owncloud/core/doc/admin/_images/10000000000005FF0000005F35710398.png
+share/owncloud/core/doc/admin/_images/10000000000006000000005EDA7B96BE.png
+share/owncloud/core/doc/admin/_images/100000000000060300000065DF96536B.png
+share/owncloud/core/doc/admin/_images/10000000000006060000006A0106CA0C.png
+share/owncloud/core/doc/admin/_images/100000000000061A0000006FC014C3A4.png
+share/owncloud/core/doc/admin/_images/100000000000061D0000007047877972.png
+share/owncloud/core/doc/admin/_images/100000000000061E0000006BCF9ECC0B.png
+share/owncloud/core/doc/admin/_images/100000000000062A0000005F61A18950.png
+share/owncloud/core/doc/admin/_images/1000000000000631000000E19D116AA0.png
+share/owncloud/core/doc/admin/_images/100000000000063F00000090AAE1FA4A.png
+share/owncloud/core/doc/admin/_images/1000000000000668000002D29EAD9899.png
+share/owncloud/core/doc/admin/_images/100000000000066D000001AAD8CE8256.png
+share/owncloud/core/doc/admin/_images/10000201000002FC000001DC2DDAD2F1.png
+share/owncloud/core/doc/admin/_images/1000020100000359000000A8B848DE68.png
+share/owncloud/core/doc/admin/_images/10000201000005F90000029D8BA200FB.png
share/owncloud/core/doc/admin/_images/custom_mount_config_gui-1.png
share/owncloud/core/doc/admin/_images/custom_mount_config_gui-2.png
share/owncloud/core/doc/admin/_images/custom_mount_config_gui-3.png
@@ -7293,6 +7252,75 @@ share/owncloud/core/doc/admin/_images/ucsint1.png
share/owncloud/core/doc/admin/_images/ucsint2.png
share/owncloud/core/doc/admin/_images/win7features.jpg
share/owncloud/core/doc/admin/_images/winserverroles.jpg
+share/owncloud/core/doc/admin/_sources/apps/activity/Configuration.txt
+share/owncloud/core/doc/admin/_sources/apps/activity/Introduction.txt
+share/owncloud/core/doc/admin/_sources/apps/activity/RSS_Feed.txt
+share/owncloud/core/doc/admin/_sources/apps/activity/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/apps/activity/Utilization.txt
+share/owncloud/core/doc/admin/_sources/apps/activity/index.txt
+share/owncloud/core/doc/admin/_sources/apps/admin_dependencies_chk/Configuration.txt
+share/owncloud/core/doc/admin/_sources/apps/admin_dependencies_chk/Introduction.txt
+share/owncloud/core/doc/admin/_sources/apps/admin_dependencies_chk/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/apps/admin_dependencies_chk/Utilization.txt
+share/owncloud/core/doc/admin/_sources/apps/admin_dependencies_chk/index.txt
+share/owncloud/core/doc/admin/_sources/apps/files_antivirus/Configuration.txt
+share/owncloud/core/doc/admin/_sources/apps/files_antivirus/Introduction.txt
+share/owncloud/core/doc/admin/_sources/apps/files_antivirus/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/apps/files_antivirus/index.txt
+share/owncloud/core/doc/admin/_sources/apps/files_encryption/Configuration.txt
+share/owncloud/core/doc/admin/_sources/apps/files_encryption/File_Systems.txt
+share/owncloud/core/doc/admin/_sources/apps/files_encryption/Introduction.txt
+share/owncloud/core/doc/admin/_sources/apps/files_encryption/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/apps/files_encryption/index.txt
+share/owncloud/core/doc/admin/_sources/apps/files_external/Configuration.txt
+share/owncloud/core/doc/admin/_sources/apps/files_external/Introduction.txt
+share/owncloud/core/doc/admin/_sources/apps/files_external/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/apps/files_external/index.txt
+share/owncloud/core/doc/admin/_sources/apps/files_sharing/Configuration.txt
+share/owncloud/core/doc/admin/_sources/apps/files_sharing/Introduction.txt
+share/owncloud/core/doc/admin/_sources/apps/files_sharing/Retrieving_shared_data.txt
+share/owncloud/core/doc/admin/_sources/apps/files_sharing/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/apps/files_sharing/Utilization.txt
+share/owncloud/core/doc/admin/_sources/apps/files_sharing/index.txt
+share/owncloud/core/doc/admin/_sources/apps/files_trashbin/Configuration_and_storage_.txt
+share/owncloud/core/doc/admin/_sources/apps/files_trashbin/Introduction.txt
+share/owncloud/core/doc/admin/_sources/apps/files_trashbin/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/apps/files_trashbin/Utilization.txt
+share/owncloud/core/doc/admin/_sources/apps/files_trashbin/index.txt
+share/owncloud/core/doc/admin/_sources/apps/files_versions/Configuration_and_storage.txt
+share/owncloud/core/doc/admin/_sources/apps/files_versions/Introduction.txt
+share/owncloud/core/doc/admin/_sources/apps/files_versions/Utilization.txt
+share/owncloud/core/doc/admin/_sources/apps/files_versions/index.txt
+share/owncloud/core/doc/admin/_sources/apps/firstrunwizard/Configuration.txt
+share/owncloud/core/doc/admin/_sources/apps/firstrunwizard/Introduction.txt
+share/owncloud/core/doc/admin/_sources/apps/firstrunwizard/Links.txt
+share/owncloud/core/doc/admin/_sources/apps/firstrunwizard/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/apps/firstrunwizard/Usage.txt
+share/owncloud/core/doc/admin/_sources/apps/firstrunwizard/index.txt
+share/owncloud/core/doc/admin/_sources/apps/user_ldap/CONFIGURATION.txt
+share/owncloud/core/doc/admin/_sources/apps/user_ldap/Introduction.txt
+share/owncloud/core/doc/admin/_sources/apps/user_ldap/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/apps/user_ldap/index.txt
+share/owncloud/core/doc/admin/_sources/apps/viewers/Configuration.txt
+share/owncloud/core/doc/admin/_sources/apps/viewers/Introduction.txt
+share/owncloud/core/doc/admin/_sources/apps/viewers/Utilization.txt
+share/owncloud/core/doc/admin/_sources/apps/viewers/index.txt
+share/owncloud/core/doc/admin/_sources/config/APPS.txt
+share/owncloud/core/doc/admin/_sources/config/Code_Locations.txt
+share/owncloud/core/doc/admin/_sources/config/Default_Parameters.txt
+share/owncloud/core/doc/admin/_sources/config/Deleted_Items.txt
+share/owncloud/core/doc/admin/_sources/config/Introduction.txt
+share/owncloud/core/doc/admin/_sources/config/Logging.txt
+share/owncloud/core/doc/admin/_sources/config/Mail_Parameters.txt
+share/owncloud/core/doc/admin/_sources/config/Maintenance.txt
+share/owncloud/core/doc/admin/_sources/config/Miscellaneous.txt
+share/owncloud/core/doc/admin/_sources/config/Previews.txt
+share/owncloud/core/doc/admin/_sources/config/Reverse_Proxy_Configurations.txt
+share/owncloud/core/doc/admin/_sources/config/Session_Info.txt
+share/owncloud/core/doc/admin/_sources/config/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/config/User_Experience.txt
+share/owncloud/core/doc/admin/_sources/config/Verification.txt
+share/owncloud/core/doc/admin/_sources/config/index.txt
share/owncloud/core/doc/admin/_sources/configuration/auth_ldap.txt
share/owncloud/core/doc/admin/_sources/configuration/background_jobs.txt
share/owncloud/core/doc/admin/_sources/configuration/configuration_3rdparty.txt
@@ -7316,6 +7344,9 @@ share/owncloud/core/doc/admin/_sources/configuration/custom_user_backend.txt
share/owncloud/core/doc/admin/_sources/configuration/index.txt
share/owncloud/core/doc/admin/_sources/configuration/xsendfile.txt
share/owncloud/core/doc/admin/_sources/contents.txt
+share/owncloud/core/doc/admin/_sources/cron/Introduction.txt
+share/owncloud/core/doc/admin/_sources/cron/Usage.txt
+share/owncloud/core/doc/admin/_sources/cron/index.txt
share/owncloud/core/doc/admin/_sources/index.txt
share/owncloud/core/doc/admin/_sources/installation/index.txt
share/owncloud/core/doc/admin/_sources/installation/installation_appliance.txt
@@ -7331,6 +7362,35 @@ share/owncloud/core/doc/admin/_sources/maintenance/index.txt
share/owncloud/core/doc/admin/_sources/maintenance/migrating.txt
share/owncloud/core/doc/admin/_sources/maintenance/restore.txt
share/owncloud/core/doc/admin/_sources/maintenance/update.txt
+share/owncloud/core/doc/admin/_sources/quota/Checking_available_space.txt
+share/owncloud/core/doc/admin/_sources/quota/Excluded_from_quota.txt
+share/owncloud/core/doc/admin/_sources/quota/Introduction.txt
+share/owncloud/core/doc/admin/_sources/quota/Sharing.txt
+share/owncloud/core/doc/admin/_sources/quota/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/quota/index.txt
+share/owncloud/core/doc/admin/_sources/sharing_api/Contents.txt
+share/owncloud/core/doc/admin/_sources/sharing_api/Create_a_new_Share.txt
+share/owncloud/core/doc/admin/_sources/sharing_api/Delete_Share.txt
+share/owncloud/core/doc/admin/_sources/sharing_api/Get_All_Shares.txt
+share/owncloud/core/doc/admin/_sources/sharing_api/Get_Information_about_a_known_share.txt
+share/owncloud/core/doc/admin/_sources/sharing_api/Get_Shares_from_a_Specific_File_or_Folder.txt
+share/owncloud/core/doc/admin/_sources/sharing_api/Introduction.txt
+share/owncloud/core/doc/admin/_sources/sharing_api/index.txt
+share/owncloud/core/doc/admin/_sources/sync_client/Advanced_Usage.txt
+share/owncloud/core/doc/admin/_sources/sync_client/Introduction.txt
+share/owncloud/core/doc/admin/_sources/sync_client/Obtaining_the_Client.txt
+share/owncloud/core/doc/admin/_sources/sync_client/Setting_up_an_Account.txt
+share/owncloud/core/doc/admin/_sources/sync_client/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/sync_client/Visual_Tour.txt
+share/owncloud/core/doc/admin/_sources/sync_client/index.txt
+share/owncloud/core/doc/admin/_sources/web_guide/Adding_Data.txt
+share/owncloud/core/doc/admin/_sources/web_guide/Initial_Log_In.txt
+share/owncloud/core/doc/admin/_sources/web_guide/Introduction.txt
+share/owncloud/core/doc/admin/_sources/web_guide/Main_ownCloud_screen.txt
+share/owncloud/core/doc/admin/_sources/web_guide/Navigation.txt
+share/owncloud/core/doc/admin/_sources/web_guide/Personal_Configurations.txt
+share/owncloud/core/doc/admin/_sources/web_guide/Table_of_Contents.txt
+share/owncloud/core/doc/admin/_sources/web_guide/index.txt
share/owncloud/core/doc/admin/_static/ajax-loader.gif
share/owncloud/core/doc/admin/_static/basic.css
share/owncloud/core/doc/admin/_static/bootstrap-responsive.css
@@ -7360,6 +7420,75 @@ share/owncloud/core/doc/admin/_static/underscore.js
share/owncloud/core/doc/admin/_static/up-pressed.png
share/owncloud/core/doc/admin/_static/up.png
share/owncloud/core/doc/admin/_static/websupport.js
+share/owncloud/core/doc/admin/apps/activity/Configuration.html
+share/owncloud/core/doc/admin/apps/activity/Introduction.html
+share/owncloud/core/doc/admin/apps/activity/RSS_Feed.html
+share/owncloud/core/doc/admin/apps/activity/Table_of_Contents.html
+share/owncloud/core/doc/admin/apps/activity/Utilization.html
+share/owncloud/core/doc/admin/apps/activity/index.html
+share/owncloud/core/doc/admin/apps/admin_dependencies_chk/Configuration.html
+share/owncloud/core/doc/admin/apps/admin_dependencies_chk/Introduction.html
+share/owncloud/core/doc/admin/apps/admin_dependencies_chk/Table_of_Contents.html
+share/owncloud/core/doc/admin/apps/admin_dependencies_chk/Utilization.html
+share/owncloud/core/doc/admin/apps/admin_dependencies_chk/index.html
+share/owncloud/core/doc/admin/apps/files_antivirus/Configuration.html
+share/owncloud/core/doc/admin/apps/files_antivirus/Introduction.html
+share/owncloud/core/doc/admin/apps/files_antivirus/Table_of_Contents.html
+share/owncloud/core/doc/admin/apps/files_antivirus/index.html
+share/owncloud/core/doc/admin/apps/files_encryption/Configuration.html
+share/owncloud/core/doc/admin/apps/files_encryption/File_Systems.html
+share/owncloud/core/doc/admin/apps/files_encryption/Introduction.html
+share/owncloud/core/doc/admin/apps/files_encryption/Table_of_Contents.html
+share/owncloud/core/doc/admin/apps/files_encryption/index.html
+share/owncloud/core/doc/admin/apps/files_external/Configuration.html
+share/owncloud/core/doc/admin/apps/files_external/Introduction.html
+share/owncloud/core/doc/admin/apps/files_external/Table_of_Contents.html
+share/owncloud/core/doc/admin/apps/files_external/index.html
+share/owncloud/core/doc/admin/apps/files_sharing/Configuration.html
+share/owncloud/core/doc/admin/apps/files_sharing/Introduction.html
+share/owncloud/core/doc/admin/apps/files_sharing/Retrieving_shared_data.html
+share/owncloud/core/doc/admin/apps/files_sharing/Table_of_Contents.html
+share/owncloud/core/doc/admin/apps/files_sharing/Utilization.html
+share/owncloud/core/doc/admin/apps/files_sharing/index.html
+share/owncloud/core/doc/admin/apps/files_trashbin/Configuration_and_storage_.html
+share/owncloud/core/doc/admin/apps/files_trashbin/Introduction.html
+share/owncloud/core/doc/admin/apps/files_trashbin/Table_of_Contents.html
+share/owncloud/core/doc/admin/apps/files_trashbin/Utilization.html
+share/owncloud/core/doc/admin/apps/files_trashbin/index.html
+share/owncloud/core/doc/admin/apps/files_versions/Configuration_and_storage.html
+share/owncloud/core/doc/admin/apps/files_versions/Introduction.html
+share/owncloud/core/doc/admin/apps/files_versions/Utilization.html
+share/owncloud/core/doc/admin/apps/files_versions/index.html
+share/owncloud/core/doc/admin/apps/firstrunwizard/Configuration.html
+share/owncloud/core/doc/admin/apps/firstrunwizard/Introduction.html
+share/owncloud/core/doc/admin/apps/firstrunwizard/Links.html
+share/owncloud/core/doc/admin/apps/firstrunwizard/Table_of_Contents.html
+share/owncloud/core/doc/admin/apps/firstrunwizard/Usage.html
+share/owncloud/core/doc/admin/apps/firstrunwizard/index.html
+share/owncloud/core/doc/admin/apps/user_ldap/CONFIGURATION.html
+share/owncloud/core/doc/admin/apps/user_ldap/Introduction.html
+share/owncloud/core/doc/admin/apps/user_ldap/Table_of_Contents.html
+share/owncloud/core/doc/admin/apps/user_ldap/index.html
+share/owncloud/core/doc/admin/apps/viewers/Configuration.html
+share/owncloud/core/doc/admin/apps/viewers/Introduction.html
+share/owncloud/core/doc/admin/apps/viewers/Utilization.html
+share/owncloud/core/doc/admin/apps/viewers/index.html
+share/owncloud/core/doc/admin/config/APPS.html
+share/owncloud/core/doc/admin/config/Code_Locations.html
+share/owncloud/core/doc/admin/config/Default_Parameters.html
+share/owncloud/core/doc/admin/config/Deleted_Items.html
+share/owncloud/core/doc/admin/config/Introduction.html
+share/owncloud/core/doc/admin/config/Logging.html
+share/owncloud/core/doc/admin/config/Mail_Parameters.html
+share/owncloud/core/doc/admin/config/Maintenance.html
+share/owncloud/core/doc/admin/config/Miscellaneous.html
+share/owncloud/core/doc/admin/config/Previews.html
+share/owncloud/core/doc/admin/config/Reverse_Proxy_Configurations.html
+share/owncloud/core/doc/admin/config/Session_Info.html
+share/owncloud/core/doc/admin/config/Table_of_Contents.html
+share/owncloud/core/doc/admin/config/User_Experience.html
+share/owncloud/core/doc/admin/config/Verification.html
+share/owncloud/core/doc/admin/config/index.html
share/owncloud/core/doc/admin/configuration/auth_ldap.html
share/owncloud/core/doc/admin/configuration/background_jobs.html
share/owncloud/core/doc/admin/configuration/configuration_3rdparty.html
@@ -7383,6 +7512,9 @@ share/owncloud/core/doc/admin/configuration/custom_user_backend.html
share/owncloud/core/doc/admin/configuration/index.html
share/owncloud/core/doc/admin/configuration/xsendfile.html
share/owncloud/core/doc/admin/contents.html
+share/owncloud/core/doc/admin/cron/Introduction.html
+share/owncloud/core/doc/admin/cron/Usage.html
+share/owncloud/core/doc/admin/cron/index.html
share/owncloud/core/doc/admin/genindex.html
share/owncloud/core/doc/admin/index.html
share/owncloud/core/doc/admin/installation/index.html
@@ -7400,8 +7532,37 @@ share/owncloud/core/doc/admin/maintenance/migrating.html
share/owncloud/core/doc/admin/maintenance/restore.html
share/owncloud/core/doc/admin/maintenance/update.html
share/owncloud/core/doc/admin/objects.inv
+share/owncloud/core/doc/admin/quota/Checking_available_space.html
+share/owncloud/core/doc/admin/quota/Excluded_from_quota.html
+share/owncloud/core/doc/admin/quota/Introduction.html
+share/owncloud/core/doc/admin/quota/Sharing.html
+share/owncloud/core/doc/admin/quota/Table_of_Contents.html
+share/owncloud/core/doc/admin/quota/index.html
share/owncloud/core/doc/admin/search.html
share/owncloud/core/doc/admin/searchindex.js
+share/owncloud/core/doc/admin/sharing_api/Contents.html
+share/owncloud/core/doc/admin/sharing_api/Create_a_new_Share.html
+share/owncloud/core/doc/admin/sharing_api/Delete_Share.html
+share/owncloud/core/doc/admin/sharing_api/Get_All_Shares.html
+share/owncloud/core/doc/admin/sharing_api/Get_Information_about_a_known_share.html
+share/owncloud/core/doc/admin/sharing_api/Get_Shares_from_a_Specific_File_or_Folder.html
+share/owncloud/core/doc/admin/sharing_api/Introduction.html
+share/owncloud/core/doc/admin/sharing_api/index.html
+share/owncloud/core/doc/admin/sync_client/Advanced_Usage.html
+share/owncloud/core/doc/admin/sync_client/Introduction.html
+share/owncloud/core/doc/admin/sync_client/Obtaining_the_Client.html
+share/owncloud/core/doc/admin/sync_client/Setting_up_an_Account.html
+share/owncloud/core/doc/admin/sync_client/Table_of_Contents.html
+share/owncloud/core/doc/admin/sync_client/Visual_Tour.html
+share/owncloud/core/doc/admin/sync_client/index.html
+share/owncloud/core/doc/admin/web_guide/Adding_Data.html
+share/owncloud/core/doc/admin/web_guide/Initial_Log_In.html
+share/owncloud/core/doc/admin/web_guide/Introduction.html
+share/owncloud/core/doc/admin/web_guide/Main_ownCloud_screen.html
+share/owncloud/core/doc/admin/web_guide/Navigation.html
+share/owncloud/core/doc/admin/web_guide/Personal_Configurations.html
+share/owncloud/core/doc/admin/web_guide/Table_of_Contents.html
+share/owncloud/core/doc/admin/web_guide/index.html
share/owncloud/core/doc/user/_images/bookmark_addurl.png
share/owncloud/core/doc/user/_images/bookmark_setting.png
share/owncloud/core/doc/user/_images/calendar_createevent.png
@@ -7541,6 +7702,8 @@ share/owncloud/core/img/actions/caret-dark.png
share/owncloud/core/img/actions/caret-dark.svg
share/owncloud/core/img/actions/caret.png
share/owncloud/core/img/actions/caret.svg
+share/owncloud/core/img/actions/checkmark-white.png
+share/owncloud/core/img/actions/checkmark-white.svg
share/owncloud/core/img/actions/checkmark.png
share/owncloud/core/img/actions/checkmark.svg
share/owncloud/core/img/actions/clock.png
@@ -7603,6 +7766,10 @@ share/owncloud/core/img/actions/star.png
share/owncloud/core/img/actions/star.svg
share/owncloud/core/img/actions/starred.png
share/owncloud/core/img/actions/starred.svg
+share/owncloud/core/img/actions/toggle-filelist.png
+share/owncloud/core/img/actions/toggle-filelist.svg
+share/owncloud/core/img/actions/toggle-pictures.png
+share/owncloud/core/img/actions/toggle-pictures.svg
share/owncloud/core/img/actions/toggle.png
share/owncloud/core/img/actions/toggle.svg
share/owncloud/core/img/actions/triangle-e.png
@@ -9120,6 +9287,7 @@ share/owncloud/lib/private/connector/sabre/auth.php
share/owncloud/lib/private/connector/sabre/directory.php
share/owncloud/lib/private/connector/sabre/exception/entitytoolarge.php
share/owncloud/lib/private/connector/sabre/exception/unsupportedmediatype.php
+share/owncloud/lib/private/connector/sabre/exceptionloggerplugin.php
share/owncloud/lib/private/connector/sabre/file.php
share/owncloud/lib/private/connector/sabre/filesplugin.php
share/owncloud/lib/private/connector/sabre/locks.php
@@ -9283,6 +9451,7 @@ share/owncloud/lib/private/setup/mysql.php
share/owncloud/lib/private/setup/oci.php
share/owncloud/lib/private/setup/postgresql.php
share/owncloud/lib/private/setup/sqlite.php
+share/owncloud/lib/private/share/searchresultsorter.php
share/owncloud/lib/private/subadmin.php
share/owncloud/lib/private/tagmanager.php
share/owncloud/lib/private/tags.php
diff --git a/www/php-owncloud/distinfo b/www/php-owncloud/distinfo
index 5e957996d7e..b8eafceb42f 100644
--- a/www/php-owncloud/distinfo
+++ b/www/php-owncloud/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.25 2014/02/02 14:56:58 ryoon Exp $
+$NetBSD: distinfo,v 1.26 2014/03/23 01:19:17 ryoon Exp $
-SHA1 (owncloud-6.0.1.tar.bz2) = 49ee62aff7d59489249555a0c8e72c3498968bcc
-RMD160 (owncloud-6.0.1.tar.bz2) = 61859fafe4d030c1cf93decebb07f4da84f0b17b
-Size (owncloud-6.0.1.tar.bz2) = 48617092 bytes
+SHA1 (owncloud-6.0.2.tar.bz2) = 0ea1fc4b63723a5d5a9d952368b77ff515851bb2
+RMD160 (owncloud-6.0.2.tar.bz2) = cda8c73737f7c1baf71434b50bc37bc56bda9a4e
+Size (owncloud-6.0.2.tar.bz2) = 51422893 bytes
SHA1 (patch-apps_user_ldap_lib_access.php) = 82996f105c16018729596049a060756ad364cbb1