[Pkg-owncloud-commits] [owncloud] 13/16: Imported Upstream version 7.0.3~rc2+dfsg
David Prévot
taffit at moszumanska.debian.org
Thu Oct 30 19:56:00 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit e33ed7ee705d6406eb42ac511e04dcb7814ff582
Merge: cfcb18d 321a631
Author: David Prévot <taffit at debian.org>
Date: Thu Oct 30 14:18:37 2014 -0400
Imported Upstream version 7.0.3~rc2+dfsg
apps/files_encryption/hooks/hooks.php | 58 ++++----
apps/files_encryption/tests/share.php | 17 ++-
apps/files_sharing/lib/sharedstorage.php | 2 +-
apps/gallery/js/slideshow.js | 62 +++++---
config/config.sample.php | 17 +++
core/avatar/controller.php | 1 +
.../_sources/configuration/background_jobs.txt | 2 +-
.../_sources/installation/installation_source.txt | 33 +++--
core/doc/admin/configuration/background_jobs.html | 2 +-
core/doc/admin/contents.html | 2 +-
.../admin/installation/installation_source.html | 35 +++--
core/doc/user/_sources/files/quota.txt | 3 +-
core/doc/user/_sources/installing_apps.txt | 19 +++
core/doc/user/files/quota.html | 3 +-
core/doc/user/installing_apps.html | 156 +++++++++++++++++++++
core/setup/controller.php | 49 +++----
lib/base.php | 6 +-
lib/private/connector/sabre/directory.php | 18 ++-
lib/private/db/adaptermysql.php | 17 +++
lib/private/db/adapteroci8.php | 12 +-
lib/private/db/adaptersqlite.php | 1 +
lib/private/db/adaptersqlsrv.php | 1 +
lib/private/db/connectionfactory.php | 5 +-
lib/private/db/sqlitesessioninit.php | 42 ++++++
lib/private/files/cache/cache.php | 14 +-
lib/private/setup.php | 103 +++++++++++++-
lib/private/util.php | 8 +-
search/ajax/search.php | 1 +
version.php | 8 +-
29 files changed, 547 insertions(+), 150 deletions(-)
diff --cc apps/files_encryption/tests/share.php
index f426ecd,a55a4d4..a55a4d4
mode 100644,100755..100644
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
diff --cc apps/gallery/js/slideshow.js
index 775f2e2,0000000..3d49c50
mode 100644,000000..100644
--- a/apps/gallery/js/slideshow.js
+++ b/apps/gallery/js/slideshow.js
@@@ -1,388 -1,0 +1,410 @@@
+/* global Gallery, Thumbnail */
+
+jQuery.fn.slideShow = function (container, start, options) {
+ var i, images = [], settings;
+ start = start || 0;
+ settings = jQuery.extend({
+ 'interval': 5000,
- 'play' : false,
- 'maxScale': 2
++ 'play': false,
++ 'maxScale': 2,
++ 'fallBacks': []
+ }, options);
+ var slideShow = $('#slideshow');
- if (settings.play){
++ if (settings.play) {
+ slideShow.children('.play').hide();
+ slideShow.children('.pause').show();
+ }
- else{
++ else {
+ slideShow.children('.play').show();
+ slideShow.children('.pause').hide();
+ }
+ jQuery.fn.slideShow.container = container;
+ jQuery.fn.slideShow.settings = settings;
+ jQuery.fn.slideShow.current = start;
+ if (settings.images) {
+ images = settings.images;
+ } else {
+ for (i = 0; i < this.length; i++) {
+ var imageLink = this[i];
+ images.push(imageLink.imageUrl || imageLink.href);
+ }
+ }
+ container.children('img').remove();
+ container.show();
++ jQuery.fn.slideShow.fallBacks = settings.fallBacks;
+ jQuery.fn.slideShow.images = images;
+ jQuery.fn.slideShow.cache = [];
- jQuery.fn.slideShow.showImage(images[start], images[start + 1]);
++ jQuery.fn.slideShow.showImage(images[start], images[start + 1], settings.fallBacks[start], settings.fallBacks[start + 1]);
+ jQuery.fn.slideShow.progressBar = container.find('.progress');
+
+ // hide arrows and play/pause when only one pic
+ slideShow.find('.next, .previous').toggle(images.length > 1);
+ if (images.length === 1) {
+ // note: only handling hide case here as we don't want to
+ // re-show the buttons that might have been hidden by
+ // the settings.play condition above
+ $('#slideshow').find('.play, .pause').hide();
+ }
+
+ jQuery(window).resize(function () {
- jQuery.fn.slideShow.loadImage(jQuery.fn.slideShow.images[jQuery.fn.slideShow.current]).then(function (image) {
++ jQuery.fn.slideShow.loadImage(
++ jQuery.fn.slideShow.images[jQuery.fn.slideShow.current],
++ jQuery.fn.slideShow.fallBacks[jQuery.fn.slideShow.current]
++ ).then(function (image) {
+ jQuery.fn.slideShow.fitImage(container, image);
+ });
+ });
+ return jQuery.fn.slideShow;
+};
+
+jQuery.fn.slideShow.progressBar = null;
+
- jQuery.fn.slideShow.loadImage = function (url) {
++jQuery.fn.slideShow.loadImage = function (url, fallBack) {
++ console.log(fallBack);
+ if (!jQuery.fn.slideShow.cache[url]) {
+ jQuery.fn.slideShow.cache[url] = new jQuery.Deferred();
+ var image = new Image();
+ jQuery.fn.slideShow.cache[url].fail(function () {
+ image = false;
+ jQuery.fn.slideShow.cache[url] = false;
+ });
+ image.onload = function () {
+ if (image) {
+ image.natWidth = image.width;
+ image.natHeight = image.height;
+ }
+ if (jQuery.fn.slideShow.cache[url]) {
+ jQuery.fn.slideShow.cache[url].resolve(image);
+ }
+ };
+ image.onerror = function () {
- if (jQuery.fn.slideShow.cache[url]) {
++ if (fallBack) {
++ jQuery.fn.slideShow.loadImage(fallBack).then(function (image) {
++ jQuery.fn.slideShow.cache[url].resolve(image);
++ });
++ } else if (jQuery.fn.slideShow.cache[url]) {
+ jQuery.fn.slideShow.cache[url].reject(url);
+ }
+ };
+ image.src = url;
+ }
+ return jQuery.fn.slideShow.cache[url];
+};
+
+jQuery.fn.slideShow.fitImage = function (container, image) {
+ var ratio = image.natWidth / image.natHeight,
+ screenRatio = container.width() / container.height(),
+ width = null, height = null, top = null;
+ if (ratio > screenRatio) {
+ if (container.width() > image.natWidth * jQuery.fn.slideShow.settings.maxScale) {
+ top = ((container.height() - image.natHeight) / 2) + 'px';
+ height = image.natHeight + 'px';
+ width = image.natWidth + 'px';
+ } else {
+ width = container.width() + 'px';
+ height = (container.width() / ratio) + 'px';
+ top = ((container.height() - (container.width() / ratio)) / 2) + 'px';
+ }
+ } else {
+ if (container.height() > image.natHeight * jQuery.fn.slideShow.settings.maxScale) {
+ top = ((container.height() - image.natHeight) / 2) + 'px';
+ height = image.natHeight + 'px';
+ width = image.natWidth + 'px';
+ } else {
+ top = 0;
+ height = container.height() + 'px';
+ width = (container.height() * ratio) + "px";
+ }
+ }
+ jQuery(image).css({
- top : top,
- width : width,
++ top: top,
++ width: width,
+ height: height
+ });
+};
+
- jQuery.fn.slideShow.showImage = function (url, preloadUrl) {
++jQuery.fn.slideShow.showImage = function (url, preloadUrl, fallBack, preloadFallBack) {
+ var container = jQuery.fn.slideShow.container;
+
+ container.css('background-position', 'center');
- jQuery.fn.slideShow.loadImage(url).then(function (image) {
++ jQuery.fn.slideShow.loadImage(
++ url,
++ fallBack
++ ).then(function (image) {
+ container.css('background-position', '-10000px 0');
+ if (url === jQuery.fn.slideShow.images[jQuery.fn.slideShow.current]) {
+ container.children('img').remove();
+ container.append(image);
+ jQuery.fn.slideShow.fitImage(container, image);
+ if (jQuery.fn.slideShow.settings.play) {
+ jQuery.fn.slideShow.setTimeout();
+ }
+ if (preloadUrl) {
- jQuery.fn.slideShow.loadImage(preloadUrl);
++ jQuery.fn.slideShow.loadImage(
++ fallBack,
++ preloadFallBack
++ );
+ }
+ }
+ });
+};
+
+jQuery.fn.slideShow.play = function () {
+ if (jQuery.fn.slideShow.settings) {
+ jQuery.fn.slideShow.settings.play = true;
+ jQuery.fn.slideShow.setTimeout();
+ }
+};
+
+jQuery.fn.slideShow.pause = function () {
+ if (jQuery.fn.slideShow.settings) {
+ jQuery.fn.slideShow.settings.play = false;
+ jQuery.fn.slideShow.clearTimeout();
+ }
+};
+
+jQuery.fn.slideShow.setTimeout = function () {
+ jQuery.fn.slideShow.clearTimeout();
+ jQuery.fn.slideShow.timeout = setTimeout(jQuery.fn.slideShow.next, jQuery.fn.slideShow.settings.interval);
+ jQuery.fn.slideShow.progressBar.stop();
+ jQuery.fn.slideShow.progressBar.css('height', '6px');
+ jQuery.fn.slideShow.progressBar.animate({'height': '26px'}, jQuery.fn.slideShow.settings.interval, 'linear');
+};
+
+jQuery.fn.slideShow.clearTimeout = function () {
+ if (jQuery.fn.slideShow.timeout) {
+ clearTimeout(jQuery.fn.slideShow.timeout);
+ }
+ jQuery.fn.slideShow.progressBar.stop();
+ jQuery.fn.slideShow.progressBar.css('height', '6px');
+ jQuery.fn.slideShow.timeout = 0;
+};
+
+jQuery.fn.slideShow.next = function () {
+ if (jQuery.fn.slideShow.container) {
+ jQuery.fn.slideShow.current++;
+ if (jQuery.fn.slideShow.current >= jQuery.fn.slideShow.images.length) {
+ jQuery.fn.slideShow.current = 0;
+ }
+ var image = jQuery.fn.slideShow.images[jQuery.fn.slideShow.current],
- nextImage = jQuery.fn.slideShow.images[(jQuery.fn.slideShow.current + 1) % jQuery.fn.slideShow.images.length];
- jQuery.fn.slideShow.showImage(image, nextImage);
++ nextImage = jQuery.fn.slideShow.images[(jQuery.fn.slideShow.current + 1) % jQuery.fn.slideShow.images.length],
++ fallBack= jQuery.fn.slideShow.fallBacks[jQuery.fn.slideShow.current],
++ nextFallBack = jQuery.fn.slideShow.fallBacks[(jQuery.fn.slideShow.current + 1) % jQuery.fn.slideShow.images.length];
++ jQuery.fn.slideShow.showImage(image, nextImage, fallBack, nextFallBack);
+ }
+};
+
+jQuery.fn.slideShow.previous = function () {
+ if (jQuery.fn.slideShow.container) {
+ jQuery.fn.slideShow.current--;
+ if (jQuery.fn.slideShow.current < 0) {
+ jQuery.fn.slideShow.current = jQuery.fn.slideShow.images.length - 1;
+ }
+ var image = jQuery.fn.slideShow.images[jQuery.fn.slideShow.current],
- previousImage = jQuery.fn.slideShow.images[(jQuery.fn.slideShow.current - 1 + jQuery.fn.slideShow.images.length) % jQuery.fn.slideShow.images.length];
- jQuery.fn.slideShow.showImage(image, previousImage);
++ previousImage = jQuery.fn.slideShow.images[(jQuery.fn.slideShow.current - 1 + jQuery.fn.slideShow.images.length) % jQuery.fn.slideShow.images.length],
++ fallBack = jQuery.fn.slideShow.fallBacks[jQuery.fn.slideShow.current],
++ previousFallBack = jQuery.fn.slideShow.fallBacks[(jQuery.fn.slideShow.current - 1 + jQuery.fn.slideShow.images.length) % jQuery.fn.slideShow.images.length];
++ jQuery.fn.slideShow.showImage(image, previousImage, fallBack, previousFallBack);
+ }
+};
+
+jQuery.fn.slideShow.stop = function () {
+ if (jQuery.fn.slideShow.container) {
+ jQuery.fn.slideShow.clearTimeout();
+ jQuery.fn.slideShow.container.hide();
+ jQuery.fn.slideShow.container = null;
+ if (jQuery.fn.slideShow.onstop) {
+ jQuery.fn.slideShow.onstop();
+ }
+ }
+};
+
+jQuery.fn.slideShow.hideImage = function () {
+ var container = jQuery.fn.slideShow.container;
+ if (container) {
+ container.children('img').remove();
+ }
+};
+
+jQuery.fn.slideShow.onstop = null;
+
+
+Slideshow = {};
+Slideshow.start = function (images, start, options) {
+ options = options || {};
+ var content = $('#content');
+ start = start || 0;
+ Thumbnail.concurrent = 1; //make sure we can load the image and doesn't get blocked by loading thumbnail
+ if (images.slideShow) {
+ images.slideShow($('#slideshow'), start, options);
+ } else {
+ options.images = images;
+ jQuery.fn.slideShow($('#slideshow'), start, options);
+ }
+};
+
+Slideshow.end = function () {
+ jQuery.fn.slideShow.stop();
+};
+
+Slideshow.next = function (event) {
+ if (event) {
+ event.stopPropagation();
+ }
+ jQuery.fn.slideShow.hideImage();
+ jQuery.fn.slideShow.next();
+};
+
+Slideshow.previous = function (event) {
+ if (event) {
+ event.stopPropagation();
+ }
+ jQuery.fn.slideShow.hideImage();
+ jQuery.fn.slideShow.previous();
+};
+
+Slideshow.pause = function (event) {
+ if (event) {
+ event.stopPropagation();
+ }
+ $('#slideshow').children('.play').show();
+ $('#slideshow').children('.pause').hide();
+ Slideshow.playPause.playing = false;
+ jQuery.fn.slideShow.pause();
+};
+
+Slideshow.play = function (event) {
+ if (event) {
+ event.stopPropagation();
+ }
+ $('#slideshow').children('.play').hide();
+ $('#slideshow').children('.pause').show();
+ Slideshow.playPause.playing = true;
+ jQuery.fn.slideShow.play();
+};
+Slideshow.playPause = function () {
+ if (Slideshow.playPause.playing) {
+ Slideshow.pause();
+ } else {
+ Slideshow.play();
+ }
+};
+Slideshow.playPause.playing = false;
+Slideshow._getSlideshowTemplate = function () {
+ var defer = $.Deferred();
+ if (!this.$slideshowTemplate) {
+ var self = this;
+ $.get(OC.filePath('gallery', 'templates', 'slideshow.html'), function (tmpl) {
+ self.$slideshowTemplate = $(tmpl);
+ defer.resolve(self.$slideshowTemplate);
+ })
+ .fail(function () {
+ defer.reject();
+ });
+ } else {
+ defer.resolve(this.$slideshowTemplate);
+ }
+ return defer.promise();
+};
+
+$(document).ready(function () {
+ if ($('#body-login').length > 0) {
+ return true; //deactivate slideshow on login page
+ }
+
+ //close slideshow on esc
+ $(document).keyup(function (e) {
+ if (e.keyCode === 27) { // esc
+ Slideshow.end();
+ } else if (e.keyCode === 37) { // left
+ Slideshow.previous();
+ } else if (e.keyCode === 39) { // right
+ Slideshow.next();
+ } else if (e.keyCode === 32) { // space
+ Slideshow.playPause();
+ }
+ });
+
+ $.when(Slideshow._getSlideshowTemplate()).then(function ($tmpl) {
+ $('body').append($tmpl); //move the slideshow outside the content so we can hide the content
+
+ if (!SVGSupport()) { //replace all svg images with png images for browser that dont support svg
+ replaceSVG();
+ }
+
+ var slideshow = $('#slideshow');
+ slideshow.children('.next').click(Slideshow.next);
+ slideshow.children('.previous').click(Slideshow.previous);
+ slideshow.children('.exit').click(jQuery.fn.slideShow.stop);
+ slideshow.children('.pause').click(Slideshow.pause);
+ slideshow.children('.play').click(Slideshow.play);
+ slideshow.click(Slideshow.next);
+
+ if ($.fn.mousewheel) {
+ slideshow.bind('mousewheel.fb', function (e, delta) {
+ e.preventDefault();
+ if ($(e.target).get(0).clientHeight === 0 || $(e.target).get(0).scrollHeight === $(e.target).get(0).clientHeight) {
+ if (delta > 0) {
+ Slideshow.previous();
+ } else {
+ Slideshow.next();
+ }
+ }
+ });
+ }
+ })
+ .fail(function () {
+ OC.Notification.show(t('core', 'Error loading slideshow template'));
+ });
+
+
+ if (OCA.Files && typeof Slideshow !== 'undefined') {
+ OCA.Files.fileActions.register('image', 'View', OC.PERMISSION_READ, '', function (filename, context) {
+ var files = context.fileList.files;
+ var start = 0;
+ var images = [];
+ var dir = context.dir + '/';
+ var user = OC.currentUser;
+ var width = $(document).width() * window.devicePixelRatio;
+ var height = $(document).height() * window.devicePixelRatio;
++ var fallBacks = [];
+ for (var i = 0; i < files.length; i++) {
+ var file = files[i];
+ if (file.mimetype && file.mimetype.indexOf('image') >= 0) {
+ if (file.mimetype === 'image/svg+xml') {
+ imageUrl = OCA.Files.Files.getDownloadUrl(file.name, dir);
+ } else {
- var imageUrl = OC.generateUrl('/core/preview.png?file={file}&x={x}&y={y}&a=true&scalingup=0', {
++ var imageUrl = OC.generateUrl('/core/preview.png?file={file}&x={x}&y={y}&a=true&scalingup=0&forceIcon=0', {
+ x: width,
+ y: height,
+ file: encodeURIComponent(dir + file.name)
+ });
+ if (!user) {
+ imageUrl = OC.generateUrl(
- '/apps/files_sharing/publicpreview?file={file}&x={x}&y={y}&a=true&t={t}&scalingup=0', {
++ '/apps/files_sharing/publicpreview?file={file}&x={x}&y={y}&a=true&t={t}&scalingup=0&forceIcon=0', {
+ file: encodeURIComponent(dir + file.name),
+ x: width,
+ y: height,
+ t: $('#sharingToken').val()
+ });
+ }
+ }
+
+ images.push({
+ name: file.name,
+ // use gallery URL instead of download URL
+ imageUrl: imageUrl
+ });
++ fallBacks.push(OCA.Files.Files.getDownloadUrl(file.name, dir));
+ }
+ }
+ for (i = 0; i < images.length; i++) {
+ if (images[i].name === filename) {
+ start = i;
+ }
+ }
- jQuery.fn.slideShow.call(images, $('#slideshow'), start);
++ jQuery.fn.slideShow.call(images, $('#slideshow'), start, {fallBacks: fallBacks});
+ });
+ OCA.Files.fileActions.setDefault('image', 'View');
+ }
+});
diff --cc core/doc/admin/_sources/configuration/background_jobs.txt
index 77cb2fa,0000000..952daa6
mode 100644,000000..100644
--- a/core/doc/admin/_sources/configuration/background_jobs.txt
+++ b/core/doc/admin/_sources/configuration/background_jobs.txt
@@@ -1,55 -1,0 +1,55 @@@
+Defining Background Jobs
+========================
+A system like ownCloud sometimes requires tasks to be done on a regular basis without the need for user interaction or hindering ownCloud performance. For that purpose, as a system administrator, you can define background jobs (for example, database clean-ups) which are executed without any need for user interaction.
+
+These jobs are typically referred to as *cron jobs*. Cron jobs are commands or shell-based scripts that are scheduled to run periodically at fixed times, dates, or intervals. ``cron.php`` is an ownCloud internal process that runs such background jobs on demand.
+
+ownCloud plug-in applications register actions with ``cron.php`` automatically to take care of typical housekeeping operations, such as garbage collecting of temporary files or checking for newly updated files using ``filescan()`` for externally mounted file systems.
+
+Parameters
+----------
+In the admin settings menu you can configure how cron-jobs should be executed.
+You can choose between the following options:
+
+- AJAX
+- Webcron
+- Cron
+
+Cron Jobs
+---------
+
+You can schedule cron jobs in three ways -- using AJAX, Webcron, or cron. The default method is to use AJAX. However, the recommended method is to use cron. The following sections describe the differences between each method.
+
+AJAX
+~~~~
+
+The AJAX scheduling method is the default option. Unfortunately, however, it is also the least reliable. Each time a user visits the ownCloud page, a single background job is executed. The advantage of this mechanism is that is does not require access to the system nor registration with a third party service. The disadvantage of this mechanism, when compared to the Webcron service, is that it requires regular visits to the page for it to be triggered.
+
+Webcron
+~~~~~~~
+
+By registering your ownCloud ``cron.php`` script address at an external webcron
+service (for example, easyCron_), you ensure that background jobs are executed
+regularly. To use this type of service, your server you must be able to access
+your server using the Internet. For example::
+
+ URL to call: http[s]://<domain-of-your-server>/owncloud/cron.php
+
+Cron
+~~~~
+
+Using the operating system cron feature is the preferred method for executing regular tasks. This method enables the execution of scheduled jobs without the inherent limitations the web server might have. For example:
+
+To run a cron job on a \*nix system, every 15 minutes, under the default web server user (often, ``www-data`` or ``wwwrun``), you must set up the following cron job to call the **cron.php** script::
+
+ # crontab -u www-data -e
- */15 * * * * php -f /var/www/owncloud/cron.php /dev/null 2>&1
++ */15 * * * * php -f /var/www/owncloud/cron.php > /dev/null 2>&1
+
+You can verify if the cron job has been added and scheduled by executing::
+
+ # crontab -u www-data -l
+ */15 * * * * php -f /var/www/owncloud/cron.php
+
+.. note:: Please refer to the crontab man page for the exact command syntax.
+
+.. _easyCron: http://www.easycron.com/
diff --cc core/doc/admin/_sources/installation/installation_source.txt
index 5402451,0000000..c68635a
mode 100644,000000..100644
--- a/core/doc/admin/_sources/installation/installation_source.txt
+++ b/core/doc/admin/_sources/installation/installation_source.txt
@@@ -1,404 -1,0 +1,417 @@@
+Manual Installation
+===================
+
+If you do not want to use packages, here is how you setup ownCloud from
+scratch using a classic :abbr:`LAMP (Linux, Apache, MySQL, PHP)` setup:
+
+This document provides a complete walk-through for installing ownCloud on Ubuntu
+14.04 LTS Server with Apache and MySQL.
+
+Prerequisites
+-------------
+
+.. note:: This tutorial assumes you have terminal access to the machine you want
+ to install ownCloud on. Although this is not an absolute requirement,
+ installation without it is highly likely to require contacting your
+ hoster (e.g. for installing required modules).
+
+To run ownCloud, your web server must have the following installed:
+
+* php5 (>= 5.3.8, minimum recommended 5.4)
+* PHP module ctype
+* PHP module dom
+* PHP module GD
+* PHP module iconv
+* PHP module JSON
+* PHP module libxml
+* PHP module mb multibyte
+* PHP module SimpleXML
+* PHP module zip
+* PHP module zlib
+
+Database connectors (pick at least one):
+
+* PHP module sqlite (>= 3, usually not recommended for performance reasons)
+* PHP module mysql
+* PHP module pgsql (requires PostgreSQL >= 9.0)
+
+*Recommended* packages:
+
+* PHP module curl (highly recommended, some functionality, e.g. http user
+ authentication, depends on this)
+* PHP module fileinfo (highly recommended, enhances file analysis performance)
+* PHP module bz2 (recommended, required for extraction of apps)
+* PHP module intl (increases language translation performance and fixes sorting
+ of non-ASCII characters)
+* PHP module mcrypt (increases file encryption performance)
+* PHP module openssl (required for accessing HTTPS resources)
+
+Required for specific apps (if you use the mentioned app, you must install that
+package):
+
+* PHP module ldap (for ldap integration)
+* smbclient (for SMB storage)
+* PHP module ftp (for FTP storage)
+
+Recommended for specific apps (*optional*):
+
+* PHP module exif (for image rotation in pictures app)
+* PHP module gmp (for SFTP storage)
+
+For enhanced performance (*optional* / select only one of the following):
+
+* PHP module apc
+* PHP module apcu
+* PHP module xcache
+
+For preview generation (*optional*):
+
+* PHP module imagick
+* avconv or ffmpeg
+* OpenOffice or libreOffice
+
+**Remarks:**
+
+* Please check your distribution, operating system or hosting partner
+ documentation on how to install/enable these modules.
+
+* Make sure your distribution's php version fulfils the version requirements
+ specified above. If it doesn't, there might be custom repositories you can
+ use. If you are e.g. running Ubuntu 10.04 LTS, you can update your PHP using
+ a custom `PHP PPA <https://launchpad.net/~ondrej/+archive/php5>`_::
+
+ sudo add-apt-repository ppa:ondrej/php5
+ sudo apt-get update
+ sudo apt-get install php5
+
+* You don’t need any WebDAV support module for your web server (i.e. Apache’s
+ mod_webdav) to access your ownCloud data via WebDAV. ownCloud has a built-in
+ WebDAV server of its own.
+
+Example installation on Ubuntu 14.04 LTS Server
+-----------------------------------------------
+On a machine running a pristine Ubuntu 14.04 LTS server, you would install the
+required and recommended modules for a typical ownCloud installation, using
+Apache and MySQL by issuing the following commands in a terminal::
+
+ apt-get install apache2 mysql-server libapache2-mod-php5
+ apt-get install php5-gd php5-json php5-mysql php5-curl
+ apt-get install php5-intl php5-mcrypt php5-imagick
+
+**Remarks:**
+
+* This installs the packages for the ownCloud core system. If you are planning
+ on running additional apps, keep in mind that they might require additional
+ packages. See the Prerequisites section (above) for details.
+
+* At the execution of each of the above commands you might be prompted whether
+ you want to continue; press "Y" for Yes (that is if your system language is
+ English. You might have to press a different key if you have a different
+ system language).
+
+* At the installation of the MySQL server, you will be prompted for a root
+ password. Be sure to remember the password you enter there for later use
+ as you will need it during ownCloud database setup.
+
+Now download the archive of the latest ownCloud version:
+
+* Navigate to the `ownCloud Installation Page <http://owncloud.org/install>`_.
+* Click the **Archive file for server owners** button.
+* Click **Download Unix**.
+* This downloads a file named owncloud-x.y.z.tar.bz2 (where
+ x.y.z is the version number of the current latest version).
+* Save this file on the machine you want to install ownCloud on.
+* Verify the MD5 or SHA256 sum::
+
+ md5sum owncloud-x.y.z.tar.bz2
+ sha256sum owncloud-x.y.z.tar.bz2
+
+* You may also verify the PGP signature::
+
+ wget https://download.owncloud.org/community/owncloud-x.y.z.tar.bz2.asc
+ wget https://owncloud.org/owncloud.asc
+ gpg --import owncloud.asc
+ gpg owncloud-x.y.z.tar.bz2
+
+* Now you can extract the archive contents. Open a terminal, navigate to your
+ download directory, and run::
+
+ tar -xjf owncloud-x.y.z.tar.bz2
+
+* Copy the ownCloud files to their final destination in the document root of
+ your web server::
+
+ cp -r owncloud /path/to/webserver/document-root
+
+ where ``/path/to/webserver/document-root`` is replaced by the
+ document root of your Web server. Typically, on Ubuntu systems this
+ ``/var/www/owncloud``, so your copying command is::
+
- cp -r owncloud /var/www/`
++ cp -r owncloud /var/www/
+
- Set the Directory Permissions
- -----------------------------
++Setting Secure Directory Permissions
++------------------------------------
+
+Your HTTP user must own at least the ``config/``, ``data/``
+and ``apps/`` directories in your ownCloud directory so that you can
+configure ownCloud, create, modify and delete your data files, and install apps
- via the ownCloud Web interface. If you are planning to use the automatic
- updater app for updating ownCloud, the whole ``owncloud/`` directory must be
- writable by the HTTP user.
++via the ownCloud Web interface. We recommend setting the directory
++permissions as strictly as possible for stronger security.
+
+You can find your HTTP user in your HTTP server configuration files. Or you can
+create a PHP page to find it for you. To do this, create a plain text file with
+a single line in it:
+
+ ``<?php echo exec('whoami'); ?>``
+
+Name it ``whoami.php`` and place it in your ``/var/www/html`` directory, and
- then open it in a Web browser, for example ``http://servername/whoami.php``. You
++then open it in a Web browser, for example ``http://localhost/whoami.php``. You
+should see a single line in your browser page with the HTTP user name.
+
+.. note:: When using an NFS mount for the data directory, do not change
+ ownership as above. The simple act of mounting the drive will set
+ proper permissions for ownCloud to write to the directory. Changing
+ ownership as above could result in some issues if the NFS mount is
+ lost.
+
- * The generic command to change ownership of all files and subdirectories in a
- directory is::
++The generic command to change ownership of all files and subdirectories in a
++directory is::
+
+ chown -R <http-user>:<http-user> /path/to/owncloud/
++
++For hardened security we highly recommend setting the permissions on your ownCloud directory as strictly
++as possible. These commands should be executed immediately after the initial installation::
++
++ chown -R root:root /path/to/owncloud/
++ chown <http-user>:<http-user> /path/to/owncloud/config/config.php
++ chown -R <http-user>:<http-user> /path/to/owncloud/data/
++ chown root:root /path/to/owncloud/data/.htaccess
++ chown <http-user>:<http-user> /path/to/owncloud/apps/
++
++These strict permissions will prevent the Updater app from working. If you use the Updater app, it needs your whole
++ownCloud directory to be owned by the http-user, like these examples:
+
+* This example is for Ubuntu 14.04 LTS server::
+
+ chown -R www-data:www-data /var/www/owncloud
+
+* Arch Linux::
+
+ chown -R http:http /path/to/owncloud/
+
+* Fedora::
+
+ chown -R apache:apache /path/to/owncloud/
+
+* openSUSE::
+
+ chown -R wwwrun:www /path/to/owncloud/
++
++After the Update app has run, you should re-apply the strict permissions.
+
+Apache is the recommended Web server.
+
+Apache Web Server Configuration
+-------------------------------
+
+.. note:: You can use ownCloud over plain http, but we strongly encourage you to
+ use SSL/TLS to encrypt all of your server traffic, and to protect
+ user's logins and data in transit.
+
+Enabling SSL
+------------
+
+An Apache installed under Ubuntu comes already set-up with a simple
+self-signed certificate. All you have to do is to enable the ssl module and
+the according site. Open a terminal and run::
+
+ a2enmod ssl
+ a2ensite default-ssl
+ service apache2 reload
+
+If you are using a different distribution, check your documentation on how to
+enable SSL.
+
+.. note:: Self-signed certificates have their drawbacks - especially when you
+ plan to make your ownCloud server publicly accessible. You might want
+ to consider getting a certificate signed by commercial signing
+ authority. Check with your domain name registrar or hosting service,
+ if you're using one, for good deals on commercial certificates.
+
+Configuring ownCloud
+--------------------
+
+Since there was a change in the way versions 2.2 and 2.4 are configured,
+you'll have to find out which Apache version you are using.
+
+Usually you can do this by running one of the following commands::
+
+ apachectl -v
+ apache2 -v
+
+Example output::
+
+ Server version: Apache/2.4.7 (Ubuntu)
+ Server built: Jul 22 2014 14:36:38
+
+Example config for Apache 2.2:
+
+.. code-block:: xml
+
+ <Directory /path/to/owncloud>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Order allow,deny
+ allow from all
+ </Directory>
+
+
+Example config for Apache 2.4:
+
+.. code-block:: xml
+
+ <Directory /path/to/owncloud>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Require all granted
+ </Directory>
+
+* This configuration entry needs to go into the configuration file of the
+ "site" you want to use.
+* On a Ubuntu system, this typically is the "default-ssl" site (to be found in
+ the :file:`/etc/apache2/sites-available/default-ssl.conf`).
+* Add the entry shown above immediately before the line containing::
+
+ </VirtualHost>
+
+ (this should be one of the last lines in the file).
+
+* A minimal site configuration file on Ubuntu 14.04 might look like this:
+
+.. code-block:: xml
+
+ <IfModule mod_ssl.c>
+ <VirtualHost _default_:443>
+ ServerName YourServerName
+ ServerAdmin webmaster at localhost
+ DocumentRoot /var/www
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ </Directory>
+ <Directory /var/www/>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ LogLevel warn
+ CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+ <FilesMatch "\.(cgi|shtml|phtml|php)$">
+ SSLOptions +StdEnvVars
+ </FilesMatch>
+ <Directory /usr/lib/cgi-bin>
+ SSLOptions +StdEnvVars
+ </Directory>
+ BrowserMatch "MSIE [2-6]" \
+ nokeepalive ssl-unclean-shutdown \
+ downgrade-1.0 force-response-1.0
+ BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
+ <Directory /var/www/owncloud>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Allow from all
+ Require all granted
+ Dav Off
+ Satisfy Any
+ </Directory>
+ </VirtualHost>
+ </IfModule>
+
+* For ownCloud to work correctly, we need the module ``mod_rewrite``. Enable it
+ by running::
+
+ a2enmod rewrite
+
+* In distributions that do not come with ``a2enmod``, the module needs to be
+ enabled manually by editing the Apache config files, usually
+ :file:`/etc/httpd/httpd.conf`. Consult the Apache documentation or your Linux
+ distribution's documentation.
+
+* In order for the maximum upload size to be configurable, the
+ :file:`.htaccess` in the ownCloud folder needs to be made writable by the
+ server (this should already be done, see section `Set the Directory
+ Permissions`_).
+
+* You should make sure that any built-in WebDAV module of your web server is
+ disabled (at least for the ownCloud directory), as it will interfere with
+ ownCloud's built-in WebDAV support.
+
+ If you need the WebDAV support in the rest of your configuration, you can turn
+ it off specifically for the ownCloud entry by adding the following line in
+ the ``<Directory`` section for your ownCloud server. Add the following line
+ directly after the ``allow from all`` / ``Require all granted`` line::
+
+ Dav Off
+
+* You must disable any server-configured authentication for ownCloud, as it
+ uses Basic authentication internally for DAV services. If you have turned on
+ authentication on a parent folder (via e.g. an ``AuthType Basic``
+ directive), you can turn off the authentication specifically for the ownCloud
+ entry. Following the above example configuration file, add the following line
+ directly after the ``allow from all`` / ``Require all granted`` line in the
+ ``<Directory`` section::
+
+ Satisfy Any
+
+* When using ssl, take special note on the ServerName. You should specify one in
+ the server configuration, as well as in the CommonName field of the
+ certificate. If you want your ownCloud to be reachable via the internet, then
+ set both of these to the domain you want to reach your ownCloud server.
+
+.. note:: By default, the certificates' CommonName will be set to the host name
+ at the time the ssl-cert package was installed.
+
+* Finally, restart Apache.
+
+ * On Ubuntu systems run::
+
+ service apache2 restart
+
+ * On systemd systems (Fedora, Arch Linux, OpenSUSE), run::
+
+ systemctl restart httpd.service
+
+
+Install Wizard
+--------------
+
+Finish setting up your ownCloud server by following
+the :doc:`installation_wizard`.
+
+Other Web Servers
+-----------------
+
+**Microsoft Internet Information Server (IIS)**
+
+See :doc:`installation_windows` for further instructions.
+
+**Nginx Configuration**
+
+See :doc:`configuration_nginx`
+
+**Lighttpd Configuration**
+
+See :doc:`configuration_lighttpd`
+
+**Yaws Configuration**
+
+See :doc:`configuration_yaws`
+
+**Hiawatha Configuration**
+
- See :doc:`configuration_hiawatha`
++See :doc:`configuration_hiawatha`
diff --cc core/doc/admin/configuration/background_jobs.html
index 235ee1e,0000000..0f5ffed
mode 100644,000000..100644
--- a/core/doc/admin/configuration/background_jobs.html
+++ b/core/doc/admin/configuration/background_jobs.html
@@@ -1,229 -1,0 +1,229 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Defining Background Jobs — ownCloud Administrators Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Configuring the Collaborative Documents App" href="configuring_documents.html" />
+ <link rel="prev" title="Configuring Server-to-Server Sharing" href="server_to_server_managing.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">Introduction</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="server_to_server_managing.html">Configuring Server-to-Server Sharing</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Defining Background Jobs</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#cron-jobs">Cron Jobs</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_documents.html">Configuring the Collaborative Documents App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_documents.html#enabling-the-documents-app">Enabling the Documents App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_assets.html">Asset Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Using Third Party Components</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration-antivirus.html">Configuring the ClamAV Antivirus Scanner</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Defining Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_file_sharing.html">File Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Configuring External Storage (GUI)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Configuring External Storage (Configuration File)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_search.html">Enabling Full-Text Search</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_config_sample_php.html">Config.php Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="defining-background-jobs">
+<h1>Defining Background Jobs<a class="headerlink" href="#defining-background-jobs" title="Permalink to this headline">¶</a></h1>
+<p>A system like ownCloud sometimes requires tasks to be done on a regular basis without the need for user interaction or hindering ownCloud performance. For that purpose, as a system administrator, you can define background jobs (for example, database clean-ups) which are executed without any need for user interaction.</p>
+<p>These jobs are typically referred to as <em>cron jobs</em>. Cron jobs are commands or shell-based scripts that are scheduled to run periodically at fixed times, dates, or intervals. <tt class="docutils literal"><span class="pre">cron.php</span></tt> is an ownCloud internal process that runs such background jobs on demand.</p>
+<p>ownCloud plug-in applications register actions with <tt class="docutils literal"><span class="pre">cron.php</span></tt> automatically to take care of typical housekeeping operations, such as garbage collecting of temporary files or checking for newly updated files using <tt class="docutils literal"><span class="pre">filescan()</span></tt> for externally mounted file systems.</p>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<p>In the admin settings menu you can configure how cron-jobs should be executed.
+You can choose between the following options:</p>
+<ul class="simple">
+<li>AJAX</li>
+<li>Webcron</li>
+<li>Cron</li>
+</ul>
+</div>
+<div class="section" id="cron-jobs">
+<h2>Cron Jobs<a class="headerlink" href="#cron-jobs" title="Permalink to this headline">¶</a></h2>
+<p>You can schedule cron jobs in three ways – using AJAX, Webcron, or cron. The default method is to use AJAX. However, the recommended method is to use cron. The following sections describe the differences between each method.</p>
+<div class="section" id="ajax">
+<h3>AJAX<a class="headerlink" href="#ajax" title="Permalink to this headline">¶</a></h3>
+<p>The AJAX scheduling method is the default option. Unfortunately, however, it is also the least reliable. Each time a user visits the ownCloud page, a single background job is executed. The advantage of this mechanism is that is does not require access to the system nor registration with a third party service. The disadvantage of this mechanism, when compared to the Webcron service, is that it requires regular visits to the page for it to be triggered.</p>
+</div>
+<div class="section" id="webcron">
+<h3>Webcron<a class="headerlink" href="#webcron" title="Permalink to this headline">¶</a></h3>
+<p>By registering your ownCloud <tt class="docutils literal"><span class="pre">cron.php</span></tt> script address at an external webcron
+service (for example, <a class="reference external" href="http://www.easycron.com/">easyCron</a>), you ensure that background jobs are executed
+regularly. To use this type of service, your server you must be able to access
+your server using the Internet. For example:</p>
+<div class="highlight-python"><pre>URL to call: http[s]://<domain-of-your-server>/owncloud/cron.php</pre>
+</div>
+</div>
+<div class="section" id="cron">
+<h3>Cron<a class="headerlink" href="#cron" title="Permalink to this headline">¶</a></h3>
+<p>Using the operating system cron feature is the preferred method for executing regular tasks. This method enables the execution of scheduled jobs without the inherent limitations the web server might have. For example:</p>
+<p>To run a cron job on a *nix system, every 15 minutes, under the default web server user (often, <tt class="docutils literal"><span class="pre">www-data</span></tt> or <tt class="docutils literal"><span class="pre">wwwrun</span></tt>), you must set up the following cron job to call the <strong>cron.php</strong> script:</p>
+<div class="highlight-python"><pre># crontab -u www-data -e
- */15 * * * * php -f /var/www/owncloud/cron.php /dev/null 2>&1</pre>
++*/15 * * * * php -f /var/www/owncloud/cron.php > /dev/null 2>&1</pre>
+</div>
+<p>You can verify if the cron job has been added and scheduled by executing:</p>
+<div class="highlight-python"><pre># crontab -u www-data -l
+*/15 * * * * php -f /var/www/owncloud/cron.php</pre>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Please refer to the crontab man page for the exact command syntax.</p>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/contents.html
index 859135d,0000000..e38ff08
mode 100644,000000..100644
--- a/core/doc/admin/contents.html
+++ b/core/doc/admin/contents.html
@@@ -1,432 -1,0 +1,432 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>ownCloud documentation contents — ownCloud Administrators Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 7.0 documentation" href="index.html" />
+ <link rel="next" title="Introduction" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="#">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="#">Overview</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="index.html">Introduction</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="whats_new_admin.html">What’s New for Admins in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="owncloud-documentation-contents">
+<span id="contents"></span><h1>ownCloud documentation contents<a class="headerlink" href="#owncloud-documentation-contents" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+</div>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="whats_new_admin.html">What’s New for Admins in ownCloud 7</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#new-user-management">New User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#external-storage">External Storage</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#object-stores-as-primary-storage">Object Stores as Primary Storage</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#server-to-server-sharing">Server to Server Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#sharepoint-integration-enterprise-edition-only">SharePoint Integration (Enterprise Edition only)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#windows-network-drive-integration-enterprise-edition-only">Windows Network Drive Integration (Enterprise Edition only)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#sharing">Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#email-configuration-wizard">Email Configuration Wizard</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#editable-email-templates">Editable Email Templates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#active-directory-and-ldap-enhancements">Active Directory and LDAP Enhancements</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_appliance.html">Appliances</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_appliance.html#software-appliances">Software Appliances</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_appliance.html#owncloud-on-hardware-appliances">ownCloud on Hardware Appliances</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_linux.html">Linux Distributions</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_linux.html#supported-distribution-packages">Supported Distribution Packages</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_macos.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_windows.html">Windows 7 and Windows Server 2008</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#activate-iis-with-cgi-support">Activate IIS with CGI Support</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#installing-php">Installing PHP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#installing-mysql">Installing MySQL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#installing-owncloud">Installing ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#ensure-proper-http-verb-handling">Ensure Proper HTTP-Verb Handling</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#configuring-owncloud-php-and-iis-for-large-file-uploads">Configuring ownCloud, PHP and IIS for Large File Uploads</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_ucs.html">Univention Corporate Server</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#pre-configuration">Pre configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#installation">Installation</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#postconfiguration-optional">Postconfiguration (optional)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#using-owncloud">Using ownCloud</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_source.html">Manual Installation</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#prerequisites">Prerequisites</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#example-installation-on-ubuntu-14-04-lts-server">Example installation on Ubuntu 14.04 LTS Server</a></li>
- <li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#set-the-directory-permissions">Set the Directory Permissions</a></li>
++<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#setting-secure-directory-permissions">Setting Secure Directory Permissions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#apache-web-server-configuration">Apache Web Server Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#enabling-ssl">Enabling SSL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#configuring-owncloud">Configuring ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#install-wizard">Install Wizard</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#other-web-servers">Other Web Servers</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_others.html">Other Installation Methods</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_others.html#pagekite-configuration">PageKite Configuration</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_wizard.html">Installation Wizard</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#required-settings">Required Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#advanced-options">Advanced Options</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#finish-installation">Finish Installation</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#note">Note</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/configuration_nginx.html">Nginx Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/configuration_lighttpd.html">Lighttpd Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/configuration_yaws.html">Yaws Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/configuration_hiawatha.html">Hiawatha Configuration</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_apps.html">Apps Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_apps.html#viewing-enabled-apps">Viewing Enabled Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_apps.html#managing-apps">Managing Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_apps.html#adding-third-party-apps">Adding Third Party Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_apps.html#setting-app-parameters">Setting App Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_users.html">User Management</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_users.html#creating-a-new-user">Creating a New User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_users.html#reset-a-user-s-password">Reset a User’s Password</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_users.html#renaming-a-user">Renaming a User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_users.html#granting-administrator-privileges-to-a-user">Granting Administrator Privileges to a User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_users.html#managing-groups">Managing Groups</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_users.html#setting-storage-quotas">Setting Storage Quotas</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_users.html#deleting-users">Deleting users</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/auth_ldap.html">User Authentication with LDAP</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#configuration">Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#advanced-settings">Advanced Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#expert-settings">Expert Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#testing-the-configuration">Testing the configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#owncloud-avatar-integration">ownCloud Avatar integration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#troubleshooting-tips-and-tricks">Troubleshooting, Tips and Tricks</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#ssl-certificate-verification-ldaps-tls">SSL Certificate Verification (LDAPS, TLS)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#microsoft-active-directory">Microsoft Active Directory</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#duplicating-server-configurations">Duplicating Server Configurations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#owncloud-ldap-internals">ownCloud LDAP Internals</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#user-and-group-mapping">User and Group Mapping</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#caching">Caching</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#handling-with-backup-server">Handling with Backup Server</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/server_to_server_managing.html">Configuring Server-to-Server Sharing</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/server_to_server_managing.html#notes">Notes</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/background_jobs.html">Defining Background Jobs</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/background_jobs.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/background_jobs.html#cron-jobs">Cron Jobs</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuring_documents.html">Configuring the Collaborative Documents App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuring_documents.html#enabling-the-documents-app">Enabling the Documents App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_assets.html">Asset Management</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_assets.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_3rdparty.html">Using Third Party Components</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_3rdparty.html#managing-third-party-parameters">Managing Third Party Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration-antivirus.html">Configuring the ClamAV Antivirus Scanner</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration-antivirus.html#installing-clamav">Installing ClamAV</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration-antivirus.html#enabling-the-antivirus-app-for-files">Enabling the Antivirus App for Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration-antivirus.html#configuring-clamav-on-owncloud">Configuring ClamAV on ownCloud</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_automation.html">Defining Automatic Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_automation.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_automation.html#automatic-configurations-examples">Automatic Configurations Examples</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_custom_clients.html">Custom Client Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_custom_clients.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_database.html">Database Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_database.html#requirements">Requirements</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_database.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_database.html#troubleshooting">Troubleshooting</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_encryption.html">Using Server-Side Encryption</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_encryption.html#enabling-the-encryption-app">Enabling the Encryption App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_encryption.html#sharing-encrypted-files">Sharing Encrypted Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_encryption.html#decrypting-encrypted-files">Decrypting Encrypted Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_encryption.html#enabling-a-file-recovery-key">Enabling a File Recovery Key</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_encryption.html#files-not-encrypted">Files Not Encrypted</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_encryption.html#ldap-and-other-external-user-back-ends">LDAP and Other External User Back-ends</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_knowledgebase.html">Knowledge Base Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_knowledgebase.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_language.html">Language Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_language.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_logging.html">Logging Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_logging.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_mail.html">Mail Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#configuring-an-smtp-server">Configuring an SMTP Server</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#configuring-php-and-sendmail">Configuring PHP and Sendmail</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#using-email-templates">Using Email Templates</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#setting-mail-server-parameters-in-config-php">Setting Mail Server Parameters in config.php</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#send-a-test-email">Send a Test Email</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#troubleshooting">Troubleshooting</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#enabling-debug-mode">Enabling Debug Mode</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_preview.html">Preview Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_preview.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_reverseproxy.html">Reverse Proxy Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_reverseproxy.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_reverseproxy.html#example">Example</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_file_sharing.html">File Sharing</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_file_sharing.html#creating-persistent-file-shares">Creating Persistent File Shares</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuring_big_file_upload.html#not-outnumberable-upload-limits">Not outnumberable upload limits:</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuring_big_file_upload.html#other-recommendable-preconditions">Other recommendable preconditions:</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/custom_mount_config_gui.html">Configuring External Storage (GUI)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#supported-mounts">Supported mounts</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#enabling-external-storage-support">Enabling External Storage Support</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#local-storage">Local Storage</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#amazon-s3">Amazon S3</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#dropbox">Dropbox</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#ftp-ftps-sftp">FTP/FTPS/SFTP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#google-drive">Google Drive</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#smb-cifs">SMB/CIFS</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#smb-cifs-using-oc-login">SMB/CIFS using OC login</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#owncloud-and-webdav">ownCloud and WebDAV</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#openstack-object-storage">OpenStack Object Storage</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#configuration-file">Configuration File</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/custom_mount_config.html">Configuring External Storage (Configuration File)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config.html#example">Example</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config.html#priorities">Priorities</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config.html#backends">Backends</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/custom_user_backend.html">Custom User Backend Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_user_backend.html#imap">IMAP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_user_backend.html#smb">SMB</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/xsendfile.html">Serving static files via web server</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/xsendfile.html#apache2-x-sendfile">Apache2 (X-Sendfile)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/xsendfile.html#lighttpd-x-sendfile2">LigHTTPd (X-Sendfile2)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/xsendfile.html#nginx-x-accel-redirect">Nginx (X-Accel-Redirect)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/xsendfile.html#how-to-check-if-it-s-working">How to check if it’s working?</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuring_search.html">Enabling Full-Text Search</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_config_sample_php.html">Config.php Parameters</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#default-parameters">Default Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#default-config-php-examples">Default config.php Examples</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#user-experience">User Experience</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#mail-parameters">Mail Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#proxy-configurations">Proxy Configurations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#deleted-items-trash-bin">Deleted Items (trash bin)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#owncloud-verifications">ownCloud Verifications</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#logging">Logging</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#alternate-code-locations">Alternate Code Locations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#apps">Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#previews">Previews</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#maintenance">Maintenance</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#ssl">SSL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_config_sample_php.html#miscellaneous">Miscellaneous</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/enable_maintenance.html">Maintenance Mode Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/enable_maintenance.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/backup.html">Backing up ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/backup.html#backup-folders">Backup Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/backup.html#backup-database">Backup Database</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/update.html">Updating ownCloud with the Updater App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/upgrade.html">Upgrading Your ownCloud Server</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/upgrade.html#manual-upgrade-procedure">Manual Upgrade Procedure</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/restore.html">Restoring ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/restore.html#restore-folders">Restore Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/restore.html#restore-database">Restore Database</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/migrating.html">Migrating ownCloud Installations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/convert_db.html">Converting Database Type</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/convert_db.html#run-the-conversion">Run the conversion</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/convert_db.html#unconvertible-tables">Unconvertible Tables</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues</a></li>
+</ul>
+</div>
+<div class="section" id="indices-and-tables">
+<h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li><a class="reference internal" href="genindex.html"><em>Index</em></a></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/installation/installation_source.html
index 650934e,0000000..9a6ada5
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_source.html
+++ b/core/doc/admin/installation/installation_source.html
@@@ -1,567 -1,0 +1,576 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Manual Installation — ownCloud Administrators Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="Other Installation Methods" href="installation_others.html" />
+ <link rel="prev" title="Univention Corporate Server" href="installation_ucs.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">Introduction</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 7</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Manual Installation</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#prerequisites">Prerequisites</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-installation-on-ubuntu-14-04-lts-server">Example installation on Ubuntu 14.04 LTS Server</a></li>
- <li class="toctree-l3"><a class="reference internal" href="#set-the-directory-permissions">Set the Directory Permissions</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#setting-secure-directory-permissions">Setting Secure Directory Permissions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#apache-web-server-configuration">Apache Web Server Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#enabling-ssl">Enabling SSL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#configuring-owncloud">Configuring ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#install-wizard">Install Wizard</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#other-web-servers">Other Web Servers</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html">Other Installation Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_wizard.html">Installation Wizard</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_nginx.html">Nginx Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_lighttpd.html">Lighttpd Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_yaws.html">Yaws Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_hiawatha.html">Hiawatha Configuration</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="manual-installation">
+<h1>Manual Installation<a class="headerlink" href="#manual-installation" title="Permalink to this headline">¶</a></h1>
+<p>If you do not want to use packages, here is how you setup ownCloud from
+scratch using a classic <abbr title="Linux, Apache, MySQL, PHP">LAMP</abbr> setup:</p>
+<p>This document provides a complete walk-through for installing ownCloud on Ubuntu
+14.04 LTS Server with Apache and MySQL.</p>
+<div class="section" id="prerequisites">
+<h2>Prerequisites<a class="headerlink" href="#prerequisites" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This tutorial assumes you have terminal access to the machine you want
+to install ownCloud on. Although this is not an absolute requirement,
+installation without it is highly likely to require contacting your
+hoster (e.g. for installing required modules).</p>
+</div>
+<p>To run ownCloud, your web server must have the following installed:</p>
+<ul class="simple">
+<li>php5 (>= 5.3.8, minimum recommended 5.4)</li>
+<li>PHP module ctype</li>
+<li>PHP module dom</li>
+<li>PHP module GD</li>
+<li>PHP module iconv</li>
+<li>PHP module JSON</li>
+<li>PHP module libxml</li>
+<li>PHP module mb multibyte</li>
+<li>PHP module SimpleXML</li>
+<li>PHP module zip</li>
+<li>PHP module zlib</li>
+</ul>
+<p>Database connectors (pick at least one):</p>
+<ul class="simple">
+<li>PHP module sqlite (>= 3, usually not recommended for performance reasons)</li>
+<li>PHP module mysql</li>
+<li>PHP module pgsql (requires PostgreSQL >= 9.0)</li>
+</ul>
+<p><em>Recommended</em> packages:</p>
+<ul class="simple">
+<li>PHP module curl (highly recommended, some functionality, e.g. http user
+authentication, depends on this)</li>
+<li>PHP module fileinfo (highly recommended, enhances file analysis performance)</li>
+<li>PHP module bz2 (recommended, required for extraction of apps)</li>
+<li>PHP module intl (increases language translation performance and fixes sorting
+of non-ASCII characters)</li>
+<li>PHP module mcrypt (increases file encryption performance)</li>
+<li>PHP module openssl (required for accessing HTTPS resources)</li>
+</ul>
+<p>Required for specific apps (if you use the mentioned app, you must install that
+package):</p>
+<ul class="simple">
+<li>PHP module ldap (for ldap integration)</li>
+<li>smbclient (for SMB storage)</li>
+<li>PHP module ftp (for FTP storage)</li>
+</ul>
+<p>Recommended for specific apps (<em>optional</em>):</p>
+<ul class="simple">
+<li>PHP module exif (for image rotation in pictures app)</li>
+<li>PHP module gmp (for SFTP storage)</li>
+</ul>
+<p>For enhanced performance (<em>optional</em> / select only one of the following):</p>
+<ul class="simple">
+<li>PHP module apc</li>
+<li>PHP module apcu</li>
+<li>PHP module xcache</li>
+</ul>
+<p>For preview generation (<em>optional</em>):</p>
+<ul class="simple">
+<li>PHP module imagick</li>
+<li>avconv or ffmpeg</li>
+<li>OpenOffice or libreOffice</li>
+</ul>
+<p><strong>Remarks:</strong></p>
+<ul>
+<li><p class="first">Please check your distribution, operating system or hosting partner
+documentation on how to install/enable these modules.</p>
+</li>
+<li><p class="first">Make sure your distribution’s php version fulfils the version requirements
+specified above. If it doesn’t, there might be custom repositories you can
+use. If you are e.g. running Ubuntu 10.04 LTS, you can update your PHP using
+a custom <a class="reference external" href="https://launchpad.net/~ondrej/+archive/php5">PHP PPA</a>:</p>
+<div class="highlight-python"><pre>sudo add-apt-repository ppa:ondrej/php5
+sudo apt-get update
+sudo apt-get install php5</pre>
+</div>
+</li>
+<li><p class="first">You don’t need any WebDAV support module for your web server (i.e. Apache’s
+mod_webdav) to access your ownCloud data via WebDAV. ownCloud has a built-in
+WebDAV server of its own.</p>
+</li>
+</ul>
+</div>
+<div class="section" id="example-installation-on-ubuntu-14-04-lts-server">
+<h2>Example installation on Ubuntu 14.04 LTS Server<a class="headerlink" href="#example-installation-on-ubuntu-14-04-lts-server" title="Permalink to this headline">¶</a></h2>
+<p>On a machine running a pristine Ubuntu 14.04 LTS server, you would install the
+required and recommended modules for a typical ownCloud installation, using
+Apache and MySQL by issuing the following commands in a terminal:</p>
+<div class="highlight-python"><pre>apt-get install apache2 mysql-server libapache2-mod-php5
+apt-get install php5-gd php5-json php5-mysql php5-curl
+apt-get install php5-intl php5-mcrypt php5-imagick</pre>
+</div>
+<p><strong>Remarks:</strong></p>
+<ul class="simple">
+<li>This installs the packages for the ownCloud core system. If you are planning
+on running additional apps, keep in mind that they might require additional
+packages. See the Prerequisites section (above) for details.</li>
+<li>At the execution of each of the above commands you might be prompted whether
+you want to continue; press “Y” for Yes (that is if your system language is
+English. You might have to press a different key if you have a different
+system language).</li>
+<li>At the installation of the MySQL server, you will be prompted for a root
+password. Be sure to remember the password you enter there for later use
+as you will need it during ownCloud database setup.</li>
+</ul>
+<p>Now download the archive of the latest ownCloud version:</p>
+<ul>
+<li><p class="first">Navigate to the <a class="reference external" href="http://owncloud.org/install">ownCloud Installation Page</a>.</p>
+</li>
+<li><p class="first">Click the <strong>Archive file for server owners</strong> button.</p>
+</li>
+<li><p class="first">Click <strong>Download Unix</strong>.</p>
+</li>
+<li><p class="first">This downloads a file named owncloud-x.y.z.tar.bz2 (where
+x.y.z is the version number of the current latest version).</p>
+</li>
+<li><p class="first">Save this file on the machine you want to install ownCloud on.</p>
+</li>
+<li><p class="first">Verify the MD5 or SHA256 sum:</p>
+<div class="highlight-python"><pre>md5sum owncloud-x.y.z.tar.bz2
+sha256sum owncloud-x.y.z.tar.bz2</pre>
+</div>
+</li>
+<li><p class="first">You may also verify the PGP signature:</p>
+<div class="highlight-python"><pre>wget https://download.owncloud.org/community/owncloud-x.y.z.tar.bz2.asc
+wget https://owncloud.org/owncloud.asc
+gpg --import owncloud.asc
+gpg owncloud-x.y.z.tar.bz2</pre>
+</div>
+</li>
+<li><p class="first">Now you can extract the archive contents. Open a terminal, navigate to your
+download directory, and run:</p>
+<div class="highlight-python"><pre>tar -xjf owncloud-x.y.z.tar.bz2</pre>
+</div>
+</li>
+<li><p class="first">Copy the ownCloud files to their final destination in the document root of
+your web server:</p>
+<div class="highlight-python"><pre>cp -r owncloud /path/to/webserver/document-root</pre>
+</div>
+<p>where <tt class="docutils literal"><span class="pre">/path/to/webserver/document-root</span></tt> is replaced by the
+document root of your Web server. Typically, on Ubuntu systems this
+<tt class="docutils literal"><span class="pre">/var/www/owncloud</span></tt>, so your copying command is:</p>
- <div class="highlight-python"><pre>cp -r owncloud /var/www/`</pre>
++<div class="highlight-python"><pre>cp -r owncloud /var/www/</pre>
+</div>
+</li>
+</ul>
+</div>
- <div class="section" id="set-the-directory-permissions">
- <h2>Set the Directory Permissions<a class="headerlink" href="#set-the-directory-permissions" title="Permalink to this headline">¶</a></h2>
++<div class="section" id="setting-secure-directory-permissions">
++<h2>Setting Secure Directory Permissions<a class="headerlink" href="#setting-secure-directory-permissions" title="Permalink to this headline">¶</a></h2>
+<p>Your HTTP user must own at least the <tt class="docutils literal"><span class="pre">config/</span></tt>, <tt class="docutils literal"><span class="pre">data/</span></tt>
+and <tt class="docutils literal"><span class="pre">apps/</span></tt> directories in your ownCloud directory so that you can
+configure ownCloud, create, modify and delete your data files, and install apps
- via the ownCloud Web interface. If you are planning to use the automatic
- updater app for updating ownCloud, the whole <tt class="docutils literal"><span class="pre">owncloud/</span></tt> directory must be
- writable by the HTTP user.</p>
++via the ownCloud Web interface. We recommend setting the directory
++permissions as strictly as possible for stronger security.</p>
+<p>You can find your HTTP user in your HTTP server configuration files. Or you can
+create a PHP page to find it for you. To do this, create a plain text file with
+a single line in it:</p>
+<blockquote>
+<div><tt class="docutils literal"><span class="pre"><?php</span> <span class="pre">echo</span> <span class="pre">exec('whoami');</span> <span class="pre">?></span></tt></div></blockquote>
+<p>Name it <tt class="docutils literal"><span class="pre">whoami.php</span></tt> and place it in your <tt class="docutils literal"><span class="pre">/var/www/html</span></tt> directory, and
- then open it in a Web browser, for example <tt class="docutils literal"><span class="pre">http://servername/whoami.php</span></tt>. You
++then open it in a Web browser, for example <tt class="docutils literal"><span class="pre">http://localhost/whoami.php</span></tt>. You
+should see a single line in your browser page with the HTTP user name.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">When using an NFS mount for the data directory, do not change
+ownership as above. The simple act of mounting the drive will set
+proper permissions for ownCloud to write to the directory. Changing
+ownership as above could result in some issues if the NFS mount is
+lost.</p>
+</div>
- <ul>
- <li><p class="first">The generic command to change ownership of all files and subdirectories in a
++<p>The generic command to change ownership of all files and subdirectories in a
+directory is:</p>
+<div class="highlight-python"><pre>chown -R <http-user>:<http-user> /path/to/owncloud/</pre>
+</div>
- </li>
++<p>For hardened security we highly recommend setting the permissions on your ownCloud directory as strictly
++as possible. These commands should be executed immediately after the initial installation:</p>
++<div class="highlight-python"><pre>chown -R root:root /path/to/owncloud/
++chown <http-user>:<http-user> /path/to/owncloud/config/config.php
++chown -R <http-user>:<http-user> /path/to/owncloud/data/
++chown root:root /path/to/owncloud/data/.htaccess
++chown <http-user>:<http-user> /path/to/owncloud/apps/</pre>
++</div>
++<p>These strict permissions will prevent the Updater app from working. If you use the Updater app, it needs your whole
++ownCloud directory to be owned by the http-user, like these examples:</p>
++<ul>
+<li><p class="first">This example is for Ubuntu 14.04 LTS server:</p>
+<div class="highlight-python"><pre>chown -R www-data:www-data /var/www/owncloud</pre>
+</div>
+</li>
+<li><p class="first">Arch Linux:</p>
+<div class="highlight-python"><pre>chown -R http:http /path/to/owncloud/</pre>
+</div>
+</li>
+<li><p class="first">Fedora:</p>
+<div class="highlight-python"><pre>chown -R apache:apache /path/to/owncloud/</pre>
+</div>
+</li>
+<li><p class="first">openSUSE:</p>
+<div class="highlight-python"><pre>chown -R wwwrun:www /path/to/owncloud/</pre>
+</div>
+</li>
+</ul>
++<p>After the Update app has run, you should re-apply the strict permissions.</p>
+<p>Apache is the recommended Web server.</p>
+</div>
+<div class="section" id="apache-web-server-configuration">
+<h2>Apache Web Server Configuration<a class="headerlink" href="#apache-web-server-configuration" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You can use ownCloud over plain http, but we strongly encourage you to
+use SSL/TLS to encrypt all of your server traffic, and to protect
+user’s logins and data in transit.</p>
+</div>
+</div>
+<div class="section" id="enabling-ssl">
+<h2>Enabling SSL<a class="headerlink" href="#enabling-ssl" title="Permalink to this headline">¶</a></h2>
+<p>An Apache installed under Ubuntu comes already set-up with a simple
+self-signed certificate. All you have to do is to enable the ssl module and
+the according site. Open a terminal and run:</p>
+<div class="highlight-python"><pre>a2enmod ssl
+a2ensite default-ssl
+service apache2 reload</pre>
+</div>
+<p>If you are using a different distribution, check your documentation on how to
+enable SSL.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Self-signed certificates have their drawbacks - especially when you
+plan to make your ownCloud server publicly accessible. You might want
+to consider getting a certificate signed by commercial signing
+authority. Check with your domain name registrar or hosting service,
+if you’re using one, for good deals on commercial certificates.</p>
+</div>
+</div>
+<div class="section" id="configuring-owncloud">
+<h2>Configuring ownCloud<a class="headerlink" href="#configuring-owncloud" title="Permalink to this headline">¶</a></h2>
+<p>Since there was a change in the way versions 2.2 and 2.4 are configured,
+you’ll have to find out which Apache version you are using.</p>
+<p>Usually you can do this by running one of the following commands:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">apachectl</span> <span class="o">-</span><span class="n">v</span>
+<span class="n">apache2</span> <span class="o">-</span><span class="n">v</span>
+</pre></div>
+</div>
+<p>Example output:</p>
+<div class="highlight-python"><pre>Server version: Apache/2.4.7 (Ubuntu)
+Server built: Jul 22 2014 14:36:38</pre>
+</div>
+<p>Example config for Apache 2.2:</p>
+<div class="highlight-xml"><pre><Directory /path/to/owncloud>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Order allow,deny
+ allow from all
+</Directory></pre>
+</div>
+<p>Example config for Apache 2.4:</p>
+<div class="highlight-xml"><pre><Directory /path/to/owncloud>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Require all granted
+</Directory></pre>
+</div>
+<ul>
+<li><p class="first">This configuration entry needs to go into the configuration file of the
+“site” you want to use.</p>
+</li>
+<li><p class="first">On a Ubuntu system, this typically is the “default-ssl” site (to be found in
+the <tt class="file docutils literal"><span class="pre">/etc/apache2/sites-available/default-ssl.conf</span></tt>).</p>
+</li>
+<li><p class="first">Add the entry shown above immediately before the line containing:</p>
+<div class="highlight-python"><pre></VirtualHost></pre>
+</div>
+<p>(this should be one of the last lines in the file).</p>
+</li>
+<li><p class="first">A minimal site configuration file on Ubuntu 14.04 might look like this:</p>
+</li>
+</ul>
+<div class="highlight-xml"><pre><IfModule mod_ssl.c>
+<VirtualHost _default_:443>
+ ServerName YourServerName
+ ServerAdmin webmaster at localhost
+ DocumentRoot /var/www
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ </Directory>
+ <Directory /var/www/>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ LogLevel warn
+ CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+ <FilesMatch "\.(cgi|shtml|phtml|php)$">
+ SSLOptions +StdEnvVars
+ </FilesMatch>
+ <Directory /usr/lib/cgi-bin>
+ SSLOptions +StdEnvVars
+ </Directory>
+ BrowserMatch "MSIE [2-6]" \
+ nokeepalive ssl-unclean-shutdown \
+ downgrade-1.0 force-response-1.0
+ BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
+ <Directory /var/www/owncloud>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Allow from all
+ Require all granted
+ Dav Off
+ Satisfy Any
+ </Directory>
+</VirtualHost>
+</IfModule></pre>
+</div>
+<ul>
+<li><p class="first">For ownCloud to work correctly, we need the module <tt class="docutils literal"><span class="pre">mod_rewrite</span></tt>. Enable it
+by running:</p>
+<div class="highlight-python"><pre>a2enmod rewrite</pre>
+</div>
+</li>
+<li><p class="first">In distributions that do not come with <tt class="docutils literal"><span class="pre">a2enmod</span></tt>, the module needs to be
+enabled manually by editing the Apache config files, usually
+<tt class="file docutils literal"><span class="pre">/etc/httpd/httpd.conf</span></tt>. Consult the Apache documentation or your Linux
+distribution’s documentation.</p>
+</li>
+<li><p class="first">In order for the maximum upload size to be configurable, the
+<tt class="file docutils literal"><span class="pre">.htaccess</span></tt> in the ownCloud folder needs to be made writable by the
- server (this should already be done, see section <a class="reference internal" href="#set-the-directory-permissions">Set the Directory
- Permissions</a>).</p>
++server (this should already be done, see section <a href="#id1"><span class="problematic" id="id2">`Set the Directory
++Permissions`_</span></a>).</p>
+</li>
+<li><p class="first">You should make sure that any built-in WebDAV module of your web server is
+disabled (at least for the ownCloud directory), as it will interfere with
+ownCloud’s built-in WebDAV support.</p>
+<p>If you need the WebDAV support in the rest of your configuration, you can turn
+it off specifically for the ownCloud entry by adding the following line in
+the <tt class="docutils literal"><span class="pre"><Directory</span></tt> section for your ownCloud server. Add the following line
+directly after the <tt class="docutils literal"><span class="pre">allow</span> <span class="pre">from</span> <span class="pre">all</span></tt> / <tt class="docutils literal"><span class="pre">Require</span> <span class="pre">all</span> <span class="pre">granted</span></tt> line:</p>
+<div class="highlight-python"><pre>Dav Off</pre>
+</div>
+</li>
+<li><p class="first">You must disable any server-configured authentication for ownCloud, as it
+uses Basic authentication internally for DAV services. If you have turned on
+authentication on a parent folder (via e.g. an <tt class="docutils literal"><span class="pre">AuthType</span> <span class="pre">Basic</span></tt>
+directive), you can turn off the authentication specifically for the ownCloud
+entry. Following the above example configuration file, add the following line
+directly after the <tt class="docutils literal"><span class="pre">allow</span> <span class="pre">from</span> <span class="pre">all</span></tt> / <tt class="docutils literal"><span class="pre">Require</span> <span class="pre">all</span> <span class="pre">granted</span></tt> line in the
+<tt class="docutils literal"><span class="pre"><Directory</span></tt> section:</p>
+<div class="highlight-python"><pre>Satisfy Any</pre>
+</div>
+</li>
+<li><p class="first">When using ssl, take special note on the ServerName. You should specify one in
+the server configuration, as well as in the CommonName field of the
+certificate. If you want your ownCloud to be reachable via the internet, then
+set both of these to the domain you want to reach your ownCloud server.</p>
+</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">By default, the certificates’ CommonName will be set to the host name
+at the time the ssl-cert package was installed.</p>
+</div>
+<ul>
+<li><p class="first">Finally, restart Apache.</p>
+<ul>
+<li><p class="first">On Ubuntu systems run:</p>
+<div class="highlight-python"><pre>service apache2 restart</pre>
+</div>
+</li>
+<li><p class="first">On systemd systems (Fedora, Arch Linux, OpenSUSE), run:</p>
+<div class="highlight-python"><pre>systemctl restart httpd.service</pre>
+</div>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="install-wizard">
+<h2>Install Wizard<a class="headerlink" href="#install-wizard" title="Permalink to this headline">¶</a></h2>
+<p>Finish setting up your ownCloud server by following
+the <a class="reference internal" href="installation_wizard.html"><em>Installation Wizard</em></a>.</p>
+</div>
+<div class="section" id="other-web-servers">
+<h2>Other Web Servers<a class="headerlink" href="#other-web-servers" title="Permalink to this headline">¶</a></h2>
+<p><strong>Microsoft Internet Information Server (IIS)</strong></p>
+<p>See <a class="reference internal" href="installation_windows.html"><em>Windows 7 and Windows Server 2008</em></a> for further instructions.</p>
+<p><strong>Nginx Configuration</strong></p>
+<p>See <a class="reference internal" href="configuration_nginx.html"><em>Nginx Configuration</em></a></p>
+<p><strong>Lighttpd Configuration</strong></p>
+<p>See <a class="reference internal" href="configuration_lighttpd.html"><em>Lighttpd Configuration</em></a></p>
+<p><strong>Yaws Configuration</strong></p>
+<p>See <a class="reference internal" href="configuration_yaws.html"><em>Yaws Configuration</em></a></p>
+<p><strong>Hiawatha Configuration</strong></p>
+<p>See <a class="reference internal" href="configuration_hiawatha.html"><em>Hiawatha Configuration</em></a></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/_sources/files/quota.txt
index 90c56f7,0000000..860571e
mode 100644,000000..100644
--- a/core/doc/user/_sources/files/quota.txt
+++ b/core/doc/user/_sources/files/quota.txt
@@@ -1,35 -1,0 +1,34 @@@
+Storage Quota
+=============
-
+Your ownCloud admin has the option to set a storage quota on users. Look at
+the top of your Personal page to see what your quota is, and how much you have
+used.
+
+.. figure:: ../images/quota1.png
+
+It may be helpful to understand how your quota is calculated.
+
+Metadata (thumbnails, temporary files, cache, and encryption keys) takes up
+about 10% of disk space, but is not counted against user quotas. Some apps
+store information in the database, such as the Calendar and Contacts apps. This
+data is excluded from your quota.
+
+Only files that originate with users count against their quotas, and not files
+shared with them that originate from other users. For example, if you upload
+files to another user's share, those files count against your quota. If you
+re-share a file that another user shared with you, that file does not count
+against your quota, but the originating user's.
+
+Encrypted files are a little larger than unencrypted files; the unencrypted size
+is calculated against your quota.
+
+Deleted files that are still in the trash bin do not count against quotas. The
+trash bin is set at 50% of quota. Deleted file aging is set at 30 days. When
+deleted files exceed 50% of quota then the oldest files are removed until the
+total is below 50%.
+
+When version control is enabled, the older file versions are not counted against
+quotas.
+
+If you create a public share via URL, and allow uploads, any uploaded files
- count against your quota.
++count against your quota.
diff --cc core/doc/user/_sources/installing_apps.txt
index 0000000,0000000..c0c90e1
new file mode 100644
--- /dev/null
+++ b/core/doc/user/_sources/installing_apps.txt
@@@ -1,0 -1,0 +1,19 @@@
++# Installing Apps in ownCloud
++
++ownCloud functionality can be enhanced by installing apps that run in the server instance and provide additional features such as a music player and server, single file encryption, an RSS aggregator and many more. An app repository can be found at apps.owncloud.com, where apps are listed, ranked, discussed and offered for download. A small subsection of these apps can be downloaded and installed directly from the Apps menu inside ownCloud. The majority of these apps however needs to be [...]
++
++# Security notice
++
++Only apps listed as installable form within ownCloud have undergone extensive security checks. All other apps are installed at the users' own risk. Manually added apps are parsed by a code checker, apps found to request questionable permissions are blocked from being installed. At the moment, there is no user facing message about this - the app just does not appear in the list of available apps.
++
++# Troubleshooting
++
++If a manual app install fails, this could be due to the fact that
++
+++you have downloaded a version incompatible with the ownCloud version in use
++
+++the app has been rejected by the internal app code checker
++
+++there is a genuine bug in the app that prevents it from running.
++
++Please refer to the comment section in apps.owncloud.com to check if others have raised similar problems. Note that the score and download numbers of an app are a helpful, but not a sufficient measure of the quality and security of an app.
diff --cc core/doc/user/files/quota.html
index bc525da,0000000..19e4e24
mode 100644,000000..100644
--- a/core/doc/user/files/quota.html
+++ b/core/doc/user/files/quota.html
@@@ -1,190 -1,0 +1,189 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Storage Quota — ownCloud User Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Managing Big Files" href="configuring_big_file_upload.html" />
+ <link rel="prev" title="Encrypting Your ownCloud Files" href="encryption.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 7.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../whats_new.html">What’s New for Users in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files Using the Web Interface</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing Files Using WebDAV</a></li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="server_to_server_using.html">Using Server-to-Server Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Managing Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Encrypting Your ownCloud Files</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Managing Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Collaborative Document Editing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Setting Your Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">Configuring External Storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="storage-quota">
+<h1>Storage Quota<a class="headerlink" href="#storage-quota" title="Permalink to this headline">¶</a></h1>
+<p>Your ownCloud admin has the option to set a storage quota on users. Look at
+the top of your Personal page to see what your quota is, and how much you have
+used.</p>
+<div class="figure">
+<img alt="../_images/quota1.png" src="../_images/quota1.png" />
+</div>
+<p>It may be helpful to understand how your quota is calculated.</p>
+<p>Metadata (thumbnails, temporary files, cache, and encryption keys) takes up
+about 10% of disk space, but is not counted against user quotas. Some apps
+store information in the database, such as the Calendar and Contacts apps. This
+data is excluded from your quota.</p>
+<p>Only files that originate with users count against their quotas, and not files
+shared with them that originate from other users. For example, if you upload
+files to another user’s share, those files count against your quota. If you
+re-share a file that another user shared with you, that file does not count
+against your quota, but the originating user’s.</p>
+<p>Encrypted files are a little larger than unencrypted files; the unencrypted size
+is calculated against your quota.</p>
+<p>Deleted files that are still in the trash bin do not count against quotas. The
+trash bin is set at 50% of quota. Deleted file aging is set at 30 days. When
+deleted files exceed 50% of quota then the oldest files are removed until the
+total is below 50%.</p>
+<p>When version control is enabled, the older file versions are not counted against
+quotas.</p>
+<p>If you create a public share via URL, and allow uploads, any uploaded files
- count against your quota.
- .. 7.0 replace:: 7.0</p>
++count against your quota.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/installing_apps.html
index 0000000,0000000..d955fcb
new file mode 100644
--- /dev/null
+++ b/core/doc/user/installing_apps.html
@@@ -1,0 -1,0 +1,156 @@@
++
++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
++ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
++
++
++<html xmlns="http://www.w3.org/1999/xhtml">
++ <head>
++ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
++
++ <title><no title> — ownCloud User Manual 7.0 documentation</title>
++
++ <link rel="stylesheet" href="_static/style.css" type="text/css" />
++ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
++ <link rel="stylesheet" href="_static/style.css" type="text/css" />
++ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
++
++ <script type="text/javascript">
++ var DOCUMENTATION_OPTIONS = {
++ URL_ROOT: '',
++ VERSION: '7.0',
++ COLLAPSE_INDEX: false,
++ FILE_SUFFIX: '.html',
++ HAS_SOURCE: true
++ };
++ </script>
++ <script type="text/javascript" src="_static/jquery.js"></script>
++ <script type="text/javascript" src="_static/underscore.js"></script>
++ <script type="text/javascript" src="_static/doctools.js"></script>
++ <script type="text/javascript" src="_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud User Manual 7.0 documentation" href="index.html" />
++<script type="text/javascript">
++(function () {
++ /**
++ * Patch TOC list.
++ *
++ * Will mutate the underlying span to have a correct ul for nav.
++ *
++ * @param $span: Span containing nested UL's to mutate.
++ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
++ */
++ var patchToc = function ($ul, minLevel) {
++ var findA;
++
++ // Find all a "internal" tags, traversing recursively.
++ findA = function ($elem, level) {
++ var level = level || 0,
++ $items = $elem.find("> li > a.internal, > ul, > li > ul");
++
++ // Iterate everything in order.
++ $items.each(function (index, item) {
++ var $item = $(item),
++ tag = item.tagName.toLowerCase(),
++ pad = 15 + ((level - minLevel) * 10);
++
++ if (tag === 'a' && level >= minLevel) {
++ // Add to existing padding.
++ $item.css('padding-left', pad + "px");
++ console.log(level, $item, 'padding-left', pad + "px");
++ } else if (tag === 'ul') {
++ // Recurse.
++ findA($item, level + 1);
++ }
++ });
++ };
++
++ console.log("HERE");
++ findA($ul);
++ };
++
++ $(document).ready(function () {
++ // Add styling, structure to TOC's.
++ $(".dropdown-menu").each(function () {
++ $(this).find("ul").each(function (index, item){
++ var $item = $(item);
++ $item.addClass('unstyled');
++ });
++ $(this).find("li").each(function () {
++ $(this).parent().append(this);
++ });
++ });
++
++ // Patch in level.
++ patchToc($("ul.globaltoc"), 2);
++ patchToc($("ul.localtoc"), 2);
++
++ // Enable dropdown.
++ $('.dropdown-toggle').dropdown();
++ });
++}());
++</script>
++
++ </head>
++ <body>
++
++
++<div class="container">
++ <div class="content">
++ <div class="page-header">
++ <h1><a href="contents.html">ownCloud User Manual</a></h1>
++
++ </div>
++
++ <div class="row">
++ <div class="span3">
++ <div class="sidebar">
++ <div class="well">
++ <div class="menu-support-container">
++ <ul id="menu-support" class="menu">
++ <ul>
++ <li><a href="contents.html">Overview</a></li>
++ </ul>
++ <ul>
++<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 7.0 User Documentation</a></li>
++</ul>
++<ul>
++<li class="toctree-l1"><a class="reference internal" href="whats_new.html">What’s New for Users in ownCloud 7</a></li>
++<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a></li>
++<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a></li>
++<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a></li>
++<li class="toctree-l1"><a class="reference internal" href="documents.html">Collaborative Document Editing</a></li>
++<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a></li>
++<li class="toctree-l1"><a class="reference internal" href="migration.html">User Account Migration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Setting Your Preferences</a></li>
++<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">Configuring External Storage</a></li>
++</ul>
++
++ </ul>
++ </div>
++ </div>
++ </div>
++ </div>
++
++
++ <div class="span9">
++ <div class="page-content">
++
++ <p># Installing Apps in ownCloud</p>
++<p>ownCloud functionality can be enhanced by installing apps that run in the server instance and provide additional features such as a music player and server, single file encryption, an RSS aggregator and many more. An app repository can be found at apps.owncloud.com, where apps are listed, ranked, discussed and offered for download. A small subsection of these apps can be downloaded and installed directly from the Apps menu inside ownCloud. The majority of these apps however needs to [...]
++<p># Security notice</p>
++<p>Only apps listed as installable form within ownCloud have undergone extensive security checks. All other apps are installed at the users’ own risk. Manually added apps are parsed by a code checker, apps found to request questionable permissions are blocked from being installed. At the moment, there is no user facing message about this - the app just does not appear in the list of available apps.</p>
++<p># Troubleshooting</p>
++<p>If a manual app install fails, this could be due to the fact that</p>
++<p>+you have downloaded a version incompatible with the ownCloud version in use</p>
++<p>+the app has been rejected by the internal app code checker</p>
++<p>+there is a genuine bug in the app that prevents it from running.</p>
++<p>Please refer to the comment section in apps.owncloud.com to check if others have raised similar problems. Note that the score and download numbers of an app are a helpful, but not a sufficient measure of the quality and security of an app.</p>
++
++
++ </div>
++ </div>
++ </div>
++
++ </div>
++</div>
++ </body>
++</html>
diff --cc version.php
index c08e1d5,20cc8c9..d4fc67d
--- a/version.php
+++ b/version.php
@@@ -1,6 -1,19 +1,6 @@@
-<?php
-
-// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
-// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
-// when updating major/minor version number.
-$OC_Version=array(7, 0, 3, 1);
-
-// The human readable string
-$OC_VersionString='7.0.3 RC2';
-
-// The ownCloud edition
-$OC_Edition='';
-
-// The ownCloud channel
-$OC_Channel='git';
-
-// The build number
-$OC_Build='';
-
+<?php
- $OC_Version = array(7,0,3,0);
- $OC_VersionString = '7.0.3 RC1';
++$OC_Version = array(7,0,3,1);
++$OC_VersionString = '7.0.3 RC2';
+$OC_Edition = '';
- $OC_Channel = 'daily';
- $OC_Build = '2014-10-24T03:17:43+00:00';
++$OC_Channel = 'testing';
++$OC_Build = '2014-10-29T19:10:33+00:00';
--
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