[Pkg-owncloud-commits] [owncloud] 11/15: Imported Upstream version 7.0.3+dfsg
David Prévot
taffit at moszumanska.debian.org
Thu Nov 13 18:17:35 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 37c1f12552bb64588d0e1d08fae70207c5f6100b
Merge: f7371b8 27c29c0
Author: David Prévot <taffit at debian.org>
Date: Tue Nov 11 10:01:01 2014 -0400
Imported Upstream version 7.0.3+dfsg
apps/activity/lib/display.php | 7 +-
apps/activity/lib/parameterhelper.php | 11 +-
apps/activity/tests/datahelpertest.php | 16 +-
apps/activity/tests/parameterhelpertest.php | 12 +-
apps/documents/ajax/admin.php | 6 +-
apps/documents/appinfo/app.php | 10 +-
apps/documents/js/admin.js | 6 +-
apps/documents/lib/config.php | 2 +-
apps/documents/templates/admin.php | 14 +-
apps/files/tests/js/filelistSpec.js | 14 +-
core/doc/user/_sources/contents.txt | 12 +-
core/doc/user/_sources/index.txt | 33 ++--
core/doc/user/_sources/migration.txt | 19 ---
core/doc/user/bookmarks.html | 3 +-
core/doc/user/contents.html | 18 +--
core/doc/user/documents.html | 1 -
core/doc/user/external_storage/google_drive.html | 1 -
.../user/files/configuring_big_file_upload.html | 1 -
core/doc/user/files/deletedfiles.html | 1 -
core/doc/user/files/encryption.html | 1 -
core/doc/user/files/files.html | 1 -
core/doc/user/files/filesweb.html | 1 -
core/doc/user/files/index.html | 1 -
core/doc/user/files/quota.html | 1 -
core/doc/user/files/server_to_server_using.html | 1 -
core/doc/user/files/sync.html | 1 -
core/doc/user/files/versioncontrol.html | 1 -
core/doc/user/genindex.html | 1 -
core/doc/user/index.html | 40 ++---
core/doc/user/installing_apps.html | 1 -
core/doc/user/migration.html | 174 ---------------------
core/doc/user/objects.inv | Bin 293 -> 296 bytes
core/doc/user/pim/calendar.html | 1 -
core/doc/user/pim/contacts.html | 1 -
core/doc/user/pim/index.html | 1 -
core/doc/user/pim/sync_ios.html | 1 -
core/doc/user/pim/sync_kde.html | 1 -
core/doc/user/pim/sync_osx.html | 1 -
core/doc/user/pim/sync_thunderbird.html | 1 -
core/doc/user/pim/troubleshooting.html | 1 -
core/doc/user/search.html | 1 -
core/doc/user/userpreferences.html | 3 +-
core/doc/user/webinterface.html | 1 -
core/doc/user/whats_new.html | 1 -
core/setup/controller.php | 2 +-
lib/private/connector/sabre/directory.php | 68 ++++----
lib/private/connector/sabre/file.php | 138 +++++++++-------
lib/private/connector/sabre/objecttree.php | 58 ++++---
lib/private/connector/sabre/quotaplugin.php | 8 +-
lib/private/db.php | 5 +-
lib/private/user.php | 3 +
settings/templates/users/part.createuser.php | 2 +-
version.php | 8 +-
53 files changed, 257 insertions(+), 460 deletions(-)
diff --cc apps/activity/lib/display.php
index c4a6b3e,0000000..ec2ef39
mode 100644,000000..100644
--- a/apps/activity/lib/display.php
+++ b/apps/activity/lib/display.php
@@@ -1,78 -1,0 +1,79 @@@
+<?php
+
+/**
+ * ownCloud - Activity App
+ *
+ * @author Joas Schilling
+ * @copyright 2014 Joas Schilling nickvergessen at owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Activity;
+
+/**
+ * Class Display
+ *
+ * @package OCA\Activity
+ */
+class Display
+{
+ /**
+ * Get the template for a specific activity-event in the activities
+ *
+ * @param array $activity An array with all the activity data in it
+ * @param return string
+ */
+ public static function show($activity) {
+ $tmpl = new \OCP\Template('activity', 'activity.box');
+ $tmpl->assign('formattedDate', \OCP\Util::formatDate($activity['timestamp']));
+ $tmpl->assign('formattedTimestamp', \OCP\relative_modified_date($activity['timestamp']));
+ $tmpl->assign('user', $activity['user']);
+ $tmpl->assign('displayName', \OCP\User::getDisplayName($activity['user']));
+
+ if ($activity['app'] === 'files') {
+ // We do not link the subject as we create links for the parameters instead
+ $activity['link'] = '';
+ }
+
+ $tmpl->assign('event', $activity);
+
+ if ($activity['file']) {
+ $rootView = new \OC\Files\View('');
+ $exist = $rootView->file_exists('/' . $activity['user'] . '/files' . $activity['file']);
+ $is_dir = $rootView->is_dir('/' . $activity['user'] . '/files' . $activity['file']);
+ unset($rootView);
+
+ // show a preview image if the file still exists
- if (!$is_dir && $exist) {
++ $mimetype = \OC_Helper::getFileNameMimeType($activity['file']);
++ if (!$is_dir && \OC::$server->getPreviewManager()->isMimeSupported($mimetype) && $exist) {
+ $tmpl->assign('previewLink', \OCP\Util::linkTo('files', 'index.php', array('dir' => dirname($activity['file']))));
+ $tmpl->assign('previewImageLink',
+ \OCP\Util::linkToRoute('core_ajax_preview', array(
+ 'file' => $activity['file'],
+ 'x' => 150,
+ 'y' => 150,
+ ))
+ );
- } else if ($exist) {
++ } else {
+ $tmpl->assign('previewLink', \OCP\Util::linkTo('files', 'index.php', array('dir' => $activity['file'])));
- $tmpl->assign('previewImageLink', \OC_Helper::mimetypeIcon('dir'));
++ $tmpl->assign('previewImageLink', \OC_Helper::mimetypeIcon($is_dir ? 'dir' : $mimetype));
+ $tmpl->assign('previewLinkIsDir', true);
+ }
+ }
+
+ return $tmpl->fetchPage();
+ }
+}
diff --cc apps/activity/lib/parameterhelper.php
index 6b7c9f1,0000000..36042f2
mode 100644,000000..100644
--- a/apps/activity/lib/parameterhelper.php
+++ b/apps/activity/lib/parameterhelper.php
@@@ -1,276 -1,0 +1,279 @@@
+<?php
+
+/**
+ * ownCloud - Activity App
+ *
+ * @author Joas Schilling
+ * @copyright 2014 Joas Schilling nickvergessen at owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Activity;
+
+use \OCP\User;
+use \OCP\Util;
+use \OC\Files\View;
+
+class ParameterHelper
+{
+ /** @var \OC\Files\View */
+ protected $rootView;
+
+ /** @var \OC_L10N */
+ protected $l;
+
+ public function __construct(View $rootView, \OC_L10N $l) {
+ $this->rootView = $rootView;
+ $this->l = $l;
+ }
+
+ /**
+ * Prepares the parameters before we use them in the subject or message
+ * @param array $params
+ * @param array $paramTypes Type of parameters, if they need special handling
+ * @param bool $stripPath Shall we remove the path from the filename
+ * @param bool $highlightParams
+ * @return array
+ */
+ public function prepareParameters($params, $paramTypes = array(), $stripPath = false, $highlightParams = false) {
+ $preparedParams = array();
+ foreach ($params as $i => $param) {
+ if (is_array($param)) {
+ $preparedParams[] = $this->prepareArrayParameter($param, $paramTypes[$i], $stripPath, $highlightParams);
+ } else {
+ $preparedParams[] = $this->prepareStringParameter($param, isset($paramTypes[$i]) ? $paramTypes[$i] : '', $stripPath, $highlightParams);
+ }
+ }
+ return $preparedParams;
+ }
+
+ /**
+ * Prepares a string parameter before we use it in the subject or message
+ *
+ * @param string $param
+ * @param string $paramType Type of parameter, if it needs special handling
+ * @param bool $stripPath Shall we remove the path from the filename
+ * @param bool $highlightParams
+ * @return string
+ */
+ public function prepareStringParameter($param, $paramType, $stripPath, $highlightParams) {
+ if ($paramType === 'file') {
+ return $this->prepareFileParam($param, $stripPath, $highlightParams);
+ } else if ($paramType === 'username') {
+ return $this->prepareUserParam($param, $highlightParams);
+ }
+ return $this->prepareParam($param, $highlightParams);
+ }
+
+ /**
+ * Prepares an array parameter before we use it in the subject or message
+ *
+ * @param array $params
+ * @param string $paramType Type of parameters, if it needs special handling
+ * @param bool $stripPath Shall we remove the path from the filename
+ * @param bool $highlightParams
+ * @return string
+ */
+ public function prepareArrayParameter($params, $paramType, $stripPath, $highlightParams) {
+ $parameterList = $plainParameterList = array();
+ foreach ($params as $parameter) {
+ if ($paramType === 'file') {
+ $parameterList[] = $this->prepareFileParam($parameter, $stripPath, $highlightParams);
+ $plainParameterList[] = $this->prepareFileParam($parameter, false, false);
+ } else {
+ $parameterList[] = $this->prepareParam($parameter, $highlightParams);
+ $plainParameterList[] = $this->prepareParam($parameter, false);
+ }
+ }
+ return $this->joinParameterList($parameterList, $plainParameterList, $highlightParams);
+ }
+
+ /**
+ * Prepares a parameter for usage by adding highlights
+ *
+ * @param string $param
+ * @param bool $highlightParams
+ * @return string
+ */
+ protected function prepareParam($param, $highlightParams) {
+ if ($highlightParams) {
+ return '<strong>' . Util::sanitizeHTML($param) . '</strong>';
+ } else {
+ return $param;
+ }
+ }
+
+ /**
+ * Prepares a user name parameter for usage
+ *
+ * Add an avatar to usernames
+ *
+ * @param string $param
+ * @param bool $highlightParams
+ * @return string
+ */
+ protected function prepareUserParam($param, $highlightParams) {
+ $displayName = User::getDisplayName($param);
+ $param = Util::sanitizeHTML($param);
+ $displayName = Util::sanitizeHTML($displayName);
+
+ if ($highlightParams) {
+ return '<div class="avatar" data-user="' . $param . '"></div>'
+ . '<strong>' . $displayName . '</strong>';
+ } else {
+ return $displayName;
+ }
+ }
+
+ /**
+ * Prepares a file parameter for usage
+ *
+ * Removes the path from filenames and adds highlights
+ *
+ * @param string $param
+ * @param bool $stripPath Shall we remove the path from the filename
+ * @param bool $highlightParams
+ * @return string
+ */
+ protected function prepareFileParam($param, $stripPath, $highlightParams) {
+ $param = $this->fixLegacyFilename($param);
+ $is_dir = $this->rootView->is_dir('/' . User::getUser() . '/files' . $param);
+
+ if ($is_dir) {
- $parent_dir = $param;
++ $fileLink = Util::linkTo('files', 'index.php', array('dir' => $param));
+ } else {
- $parent_dir = (substr_count($param, '/') == 1) ? '/' : dirname($param);
++ $parentDir = (substr_count($param, '/') == 1) ? '/' : dirname($param);
++ $fileName = basename($param);
++ $fileLink = Util::linkTo('files', 'index.php', array(
++ 'dir' => $parentDir,
++ 'scrollto' => $fileName,
++ ));
+ }
+
- $fileLink = Util::linkTo('files', 'index.php', array('dir' => $parent_dir));
+ $param = trim($param, '/');
-
+ list($path, $name) = $this->splitPathFromFilename($param);
+ if (!$stripPath || $path === '') {
+ if (!$highlightParams) {
+ return $param;
+ }
+ return '<a class="filename" href="' . $fileLink . '">' . Util::sanitizeHTML($param) . '</a>';
+ }
+
+ if (!$highlightParams) {
+ return $name;
+ }
+
+ $title = ' title="' . $this->l->t('in %s', array(Util::sanitizeHTML($path))) . '"';
+ return '<a class="filename tooltip" href="' . $fileLink . '"' . $title . '>' . Util::sanitizeHTML($name) . '</a>';
+ }
+
+ /**
+ * Prepend leading slash to filenames of legacy activities
+ * @param string $filename
+ * @return string
+ */
+ protected function fixLegacyFilename($filename) {
+ if (strpos($filename, '/') !== 0) {
+ return '/' . $filename;
+ }
+ return $filename;
+ }
+
+ /**
+ * Split the path from the filename string
+ *
+ * @param string $filename
+ * @return array Array with path and filename
+ */
+ protected function splitPathFromFilename($filename) {
+ if (strrpos($filename, '/') !== false) {
+ return array(
+ trim(substr($filename, 0, strrpos($filename, '/')), '/'),
+ substr($filename, strrpos($filename, '/') + 1),
+ );
+ }
+ return array('', $filename);
+ }
+
+ /**
+ * Returns a list of grouped parameters
+ *
+ * 2 parameters are joined by "and":
+ * => A and B
+ * Up to 5 parameters are joined by "," and "and":
+ * => A, B, C, D and E
+ * More than 5 parameters are joined by "," and trimmed:
+ * => A, B, C and #n more
+ *
+ * @param array $parameterList
+ * @param array $plainParameterList
+ * @param bool $highlightParams
+ * @return string
+ */
+ protected function joinParameterList($parameterList, $plainParameterList, $highlightParams) {
+ if (empty($parameterList)) {
+ return '';
+ }
+
+ $count = sizeof($parameterList);
+ $lastItem = array_pop($parameterList);
+
+ if ($count == 1)
+ {
+ return $lastItem;
+ }
+ else if ($count == 2)
+ {
+ $firstItem = array_pop($parameterList);
+ return $this->l->t('%s and %s', array($firstItem, $lastItem));
+ }
+ else if ($count <= 5)
+ {
+ $list = implode($this->l->t(', '), $parameterList);
+ return $this->l->t('%s and %s', array($list, $lastItem));
+ }
+
+ $firstParams = array_slice($parameterList, 0, 3);
+ $firstList = implode($this->l->t(', '), $firstParams);
+ $trimmedParams = array_slice($plainParameterList, 3);
+ $trimmedList = implode($this->l->t(', '), $trimmedParams);
+ if ($highlightParams) {
+ return $this->l->n(
+ '%s and <strong class="tooltip" title="%s">%n more</strong>',
+ '%s and <strong class="tooltip" title="%s">%n more</strong>',
+ $count - 3,
+ array($firstList, $trimmedList));
+ }
+ return $this->l->n('%s and %n more', '%s and %n more', $count - 3, array($firstList));
+ }
+
+ /**
+ * List with special parameters for the message
+ *
+ * @param string $app
+ * @param string $text
+ * @return array
+ */
+ public function getSpecialParameterList($app, $text) {
+ if ($app === 'files' && $text === 'shared_group_self') {
+ return array(0 => 'file');
+ }
+ else if ($app === 'files') {
+ return array(0 => 'file', 1 => 'username');
+ }
+ return array();
+ }
+}
diff --cc apps/activity/tests/datahelpertest.php
index 5f7251a,0000000..728a28c
mode 100644,000000..100644
--- a/apps/activity/tests/datahelpertest.php
+++ b/apps/activity/tests/datahelpertest.php
@@@ -1,142 -1,0 +1,142 @@@
+<?php
+
+/**
+ * ownCloud - Activity App
+ *
+ * @author Joas Schilling
+ * @copyright 2014 Joas Schilling nickvergessen at owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\Activity\Tests;
+
+class DataHelperTest extends \PHPUnit_Framework_TestCase {
+ protected $originalWEBROOT;
+
+ public function setUp() {
+ parent::setUp();
+ $this->originalWEBROOT =\OC::$WEBROOT;
+ \OC::$WEBROOT = '';
+ }
+
+ public function tearDown() {
+ \OC::$WEBROOT = $this->originalWEBROOT;
+ parent::tearDown();
+ }
+
+ public function translationData() {
+ return array(
+ array(
+ 'created_self', array('/SubFolder/A.txt'), false, false,
+ 'You created SubFolder/A.txt',
+ ),
+ array(
+ 'created_self', array('/SubFolder/A.txt'), true, false,
+ 'You created A.txt',
+ ),
+ array(
+ 'created_self', array('/SubFolder/A.txt'), false, true,
- 'You created <a class="filename" href="/index.php/apps/files?dir=%2FSubFolder">SubFolder/A.txt</a>',
++ 'You created <a class="filename" href="/index.php/apps/files?dir=%2FSubFolder&scrollto=A.txt">SubFolder/A.txt</a>',
+ ),
+ array(
+ 'created_self', array('/SubFolder/A.txt'), true, true,
- 'You created <a class="filename tooltip" href="/index.php/apps/files?dir=%2FSubFolder" title="in SubFolder">A.txt</a>',
++ 'You created <a class="filename tooltip" href="/index.php/apps/files?dir=%2FSubFolder&scrollto=A.txt" title="in SubFolder">A.txt</a>',
+ ),
+
+ array('created_by', array('/SubFolder/A.txt', 'UserB'), false, false, 'UserB created SubFolder/A.txt'),
+ array('created_by', array('/SubFolder/A.txt', 'UserB'), true, false, 'UserB created A.txt'),
+ array(
+ 'created_by', array('/SubFolder/A.txt', 'UserB'), false, true,
+ '<div class="avatar" data-user="UserB"></div><strong>UserB</strong> created '
- . '<a class="filename" href="/index.php/apps/files?dir=%2FSubFolder">SubFolder/A.txt</a>',
++ . '<a class="filename" href="/index.php/apps/files?dir=%2FSubFolder&scrollto=A.txt">SubFolder/A.txt</a>',
+ ),
+ array(
+ 'created_by', array('/SubFolder/A.txt', 'UserB'), true, true,
+ '<div class="avatar" data-user="UserB"></div><strong>UserB</strong> created '
- . '<a class="filename tooltip" href="/index.php/apps/files?dir=%2FSubFolder" title="in SubFolder">A.txt</a>',
++ . '<a class="filename tooltip" href="/index.php/apps/files?dir=%2FSubFolder&scrollto=A.txt" title="in SubFolder">A.txt</a>',
+ ),
+ array(
+ 'created_by', array('/A.txt', 'UserB'), true, true,
+ '<div class="avatar" data-user="UserB"></div><strong>UserB</strong> created '
- . '<a class="filename" href="/index.php/apps/files?dir=%2F">A.txt</a>',
++ . '<a class="filename" href="/index.php/apps/files?dir=%2F&scrollto=A.txt">A.txt</a>',
+ ),
+
+ array(
+ 'created_self',
+ array(array('/SubFolder/A.txt')),
+ false,
+ false,
+ 'You created SubFolder/A.txt',
+ ),
+ array(
+ 'created_self',
+ array(array('/SubFolder/A.txt', '/SubFolder/B.txt')),
+ false,
+ false,
+ 'You created SubFolder/A.txt and SubFolder/B.txt',
+ ),
+ array(
+ 'created_self',
+ array(array('/SubFolder/A.txt', '/SubFolder/B.txt', '/SubFolder/C.txt', '/SubFolder/D.txt', '/SubFolder/E.txt')),
+ false,
+ false,
+ 'You created SubFolder/A.txt, SubFolder/B.txt, SubFolder/C.txt, SubFolder/D.txt and SubFolder/E.txt',
+ ),
+ array(
+ 'created_self',
+ array(array('/SubFolder/A.txt', '/SubFolder/B.txt', '/SubFolder/C.txt', '/SubFolder/D.txt', '/SubFolder/E.txt', '/SubFolder/F.txt')),
+ false,
+ false,
+ 'You created SubFolder/A.txt, SubFolder/B.txt, SubFolder/C.txt and 3 more',
+ ),
+ array(
+ 'created_self',
+ array(array('/SubFolder/A.txt', '/SubFolder/B.txt', '/SubFolder/C.txt', '/SubFolder/D.txt', '/SubFolder/E.txt', '/SubFolder/F.txt')),
+ true,
+ false,
+ 'You created A.txt, B.txt, C.txt and 3 more',
+ ),
+ array(
+ 'created_self',
+ array(array('/SubFolder/A.txt', '/SubFolder/B.txt', '/SubFolder/C.txt', '/SubFolder/D.txt', '/SubFolder/E.txt', '/SubFolder/F.txt')),
+ false,
+ true,
- 'You created <a class="filename" href="/index.php/apps/files?dir=%2FSubFolder">SubFolder/A.txt</a>,'
- . ' <a class="filename" href="/index.php/apps/files?dir=%2FSubFolder">SubFolder/B.txt</a>,'
- . ' <a class="filename" href="/index.php/apps/files?dir=%2FSubFolder">SubFolder/C.txt</a>'
++ 'You created <a class="filename" href="/index.php/apps/files?dir=%2FSubFolder&scrollto=A.txt">SubFolder/A.txt</a>,'
++ . ' <a class="filename" href="/index.php/apps/files?dir=%2FSubFolder&scrollto=B.txt">SubFolder/B.txt</a>,'
++ . ' <a class="filename" href="/index.php/apps/files?dir=%2FSubFolder&scrollto=C.txt">SubFolder/C.txt</a>'
+ . ' and <strong class="tooltip" title="SubFolder/D.txt, SubFolder/E.txt, SubFolder/F.txt">3 more</strong>',
+ ),
+ );
+ }
+
+ /**
+ * @dataProvider translationData
+ */
+ public function testTranslation($text, $params, $stripPath, $highlightParams, $expected) {
+ $dataHelper = new \OCA\Activity\DataHelper(
+ $this->getMock('\OCP\Activity\IManager'),
+ new \OCA\Activity\ParameterHelper(
+ new \OC\Files\View(''),
+ \OCP\Util::getL10N('activity')
+ ),
+ \OCP\Util::getL10N('activity')
+ );
+
+ $this->assertEquals(
+ $expected,
+ (string) $dataHelper->translation('files', $text, $params, $stripPath, $highlightParams)
+ );
+ }
+}
diff --cc apps/activity/tests/parameterhelpertest.php
index 09ca9d4,0000000..84ec999
mode 100644,000000..100644
--- a/apps/activity/tests/parameterhelpertest.php
+++ b/apps/activity/tests/parameterhelpertest.php
@@@ -1,159 -1,0 +1,159 @@@
+<?php
+
+/**
+ * ownCloud - Activity App
+ *
+ * @author Joas Schilling
+ * @copyright 2014 Joas Schilling nickvergessen at owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\Activity\Tests;
+
+class ParameterHelperTest extends \PHPUnit_Framework_TestCase {
+ /** @var string */
+ protected $originalWEBROOT;
+ /** @var \OCA\Activity\ParameterHelper */
+ protected $parameterHelper;
+ /** @var \OC\Files\View */
+ protected $view;
+
+ public function setUp() {
+ parent::setUp();
+ $this->originalWEBROOT =\OC::$WEBROOT;
+ \OC::$WEBROOT = '';
+ $l = \OCP\Util::getL10N('activity');
+ $this->view = new \OC\Files\View('');
+ $this->parameterHelper = new \OCA\Activity\ParameterHelper($this->view, $l);
+ }
+
+ public function tearDown() {
+ \OC::$WEBROOT = $this->originalWEBROOT;
+ parent::tearDown();
+ }
+
+ public function prepareParametersData() {
+ return array(
+ array(array(), false, false, false, array()),
+
+ // No file position: no path strip
+ array(array('/foo/bar.file'), array(), false, false, array('/foo/bar.file')),
+ array(array('/foo/bar.file'), array(), true, false, array('/foo/bar.file')),
+ array(array('/foo/bar.file'), array(), false, true, array('<strong>/foo/bar.file</strong>')),
+ array(array('/foo/bar.file'), array(), true, true, array('<strong>/foo/bar.file</strong>')),
+
+ // Valid file position
+ array(array('/foo/bar.file'), array(0 => 'file'), true, false, array('bar.file')),
+ array(array('/folder/trailingslash/fromsharing/'), array(0 => 'file'), true, false, array('fromsharing')),
+ array(array('/foo/bar.file'), array(0 => 'file'), false, false, array('foo/bar.file')),
+ array(array('/folder/trailingslash/fromsharing/'), array(0 => 'file'), false, false, array('folder/trailingslash/fromsharing')),
+ array(array('/foo/bar.file'), array(0 => 'file'), true, true, array(
- '<a class="filename tooltip" href="/index.php/apps/files?dir=%2Ffoo" title="in foo">bar.file</a>',
++ '<a class="filename tooltip" href="/index.php/apps/files?dir=%2Ffoo&scrollto=bar.file" title="in foo">bar.file</a>',
+ )),
+ array(array('/0/bar.file'), array(0 => 'file'), true, true, array(
- '<a class="filename tooltip" href="/index.php/apps/files?dir=%2F0" title="in 0">bar.file</a>',
++ '<a class="filename tooltip" href="/index.php/apps/files?dir=%2F0&scrollto=bar.file" title="in 0">bar.file</a>',
+ )),
+ array(array('/foo/bar.file'), array(1 => 'file'), true, false, array('/foo/bar.file')),
+ array(array('/foo/bar.file'), array(1 => 'file'), true, true, array('<strong>/foo/bar.file</strong>')),
+
+ // Legacy: stored without leading slash
+ array(array('foo/bar.file'), array(0 => 'file'), false, false, array('foo/bar.file')),
+ array(array('foo/bar.file'), array(0 => 'file'), false, true, array(
- '<a class="filename" href="/index.php/apps/files?dir=%2Ffoo">foo/bar.file</a>',
++ '<a class="filename" href="/index.php/apps/files?dir=%2Ffoo&scrollto=bar.file">foo/bar.file</a>',
+ )),
+ array(array('foo/bar.file'), array(0 => 'file'), true, false, array('bar.file')),
+ array(array('foo/bar.file'), array(0 => 'file'), true, true, array(
- '<a class="filename tooltip" href="/index.php/apps/files?dir=%2Ffoo" title="in foo">bar.file</a>',
++ '<a class="filename tooltip" href="/index.php/apps/files?dir=%2Ffoo&scrollto=bar.file" title="in foo">bar.file</a>',
+ )),
+
+ // Valid file position
+ array(array('UserA', '/foo/bar.file'), array(1 => 'file'), true, false, array('UserA', 'bar.file')),
+ array(array('UserA', '/foo/bar.file'), array(1 => 'file'), true, true, array(
+ '<strong>UserA</strong>',
- '<a class="filename tooltip" href="/index.php/apps/files?dir=%2Ffoo" title="in foo">bar.file</a>',
++ '<a class="filename tooltip" href="/index.php/apps/files?dir=%2Ffoo&scrollto=bar.file" title="in foo">bar.file</a>',
+ )),
+ array(array('UserA', '/foo/bar.file'), array(2 => 'file'), true, false, array('UserA', '/foo/bar.file')),
+ array(array('UserA', '/foo/bar.file'), array(2 => 'file'), true, true, array(
+ '<strong>UserA</strong>',
+ '<strong>/foo/bar.file</strong>',
+ )),
+ array(array('UserA', '/foo/bar.file'), array(0 => 'username'), true, true, array(
+ '<div class="avatar" data-user="UserA"></div><strong>UserA</strong>',
+ '<strong>/foo/bar.file</strong>',
+ )),
+ array(array('U<ser>A', '/foo/bar.file'), array(0 => 'username'), true, true, array(
+ '<div class="avatar" data-user="U<ser>A"></div><strong>U<ser>A</strong>',
+ '<strong>/foo/bar.file</strong>',
+ )),
+
+ array(array('UserA', '/foo/bar.file'), array(0 => 'username', 1 => 'file'), true, true, array(
+ '<div class="avatar" data-user="UserA"></div><strong>UserA</strong>',
- '<a class="filename tooltip" href="/index.php/apps/files?dir=%2Ffoo" title="in foo">bar.file</a>',
++ '<a class="filename tooltip" href="/index.php/apps/files?dir=%2Ffoo&scrollto=bar.file" title="in foo">bar.file</a>',
+ )),
+ array(array('UserA', '/tmp/test'), array(0 => 'username', 1 => 'file'), true, true, array(
+ '<div class="avatar" data-user="UserA"></div><strong>UserA</strong>',
+ '<a class="filename tooltip" href="/index.php/apps/files?dir=%2Ftmp%2Ftest" title="in tmp">test</a>',
+ ), 'tmp/test/'),
+ );
+ }
+
+ /**
+ * @dataProvider prepareParametersData
+ */
+ public function testPrepareParameters($params, $filePosition, $stripPath, $highlightParams, $expected, $createFolder = '') {
+ if ($createFolder !== '') {
+ $this->view->mkdir('/' . \OCP\User::getUser() . '/files/' . $createFolder);
+ }
+ $this->assertEquals(
+ $expected,
+ $this->parameterHelper->prepareParameters($params, $filePosition, $stripPath, $highlightParams)
+ );
+ }
+
+ public function prepareArrayParametersData() {
+ return array(
+ array(array(), 'file', true, true, ''),
+ array(array('A/B.txt', 'C/D.txt'), 'file', true, false, 'B.txt and D.txt'),
+ array(array('A/B.txt', 'C/D.txt'), '', true, false, 'A/B.txt and C/D.txt'),
+ );
+ }
+
+ /**
+ * @dataProvider prepareArrayParametersData
+ */
+ public function testPrepareArrayParameters($params, $paramType, $stripPath, $highlightParams, $expected) {
+ $this->assertEquals(
+ $expected,
+ (string) $this->parameterHelper->prepareArrayParameter($params, $paramType, $stripPath, $highlightParams)
+ );
+ }
+
+ public function getSpecialParameterListData() {
+ return array(
+ array('files', 'shared_group_self', array(0 => 'file')),
+ array('files', 'shared_group', array(0 => 'file', 1 => 'username')),
+ array('files', '', array(0 => 'file', 1 => 'username')),
+ array('calendar', 'shared_group', array()),
+ array('calendar', '', array()),
+ );
+ }
+
+ /**
+ * @dataProvider getSpecialParameterListData
+ */
+ public function testGetSpecialParameterList($app, $text, $expected) {
+ $this->assertEquals($expected, $this->parameterHelper->getSpecialParameterList($app, $text));
+ }
+}
diff --cc apps/documents/ajax/admin.php
index 524b978,0000000..d880a8e
mode 100644,000000..100644
--- a/apps/documents/ajax/admin.php
+++ b/apps/documents/ajax/admin.php
@@@ -1,70 -1,0 +1,72 @@@
+<?php
+
+namespace OCA\Documents;
+
+\OCP\JSON::callCheck();
+\OCP\JSON::checkAdminUser();
+
+$converter = isset($_POST['converter']) ? $_POST['converter'] : null;
+$url = isset($_POST['url']) ? $_POST['url'] : null;
+try {
+ if (!is_null($converter)){
+ Config::setConverter($converter);
+ }
+
+ if (!is_null($url)){
+ Config::setConverterUrl($url);
+ }
+
- if (Config::getConverter()!='local'){
++ $currentConverter = Config::getConverter();
++ //echo $currentConverter;
++ if ($currentConverter == 'external'){
+ if (!Converter::checkConnection()){
+ Helper::warnLog('Bad response from Format Filter Server');
+ \OCP\JSON::error(array( 'data'=>
+ array('message' => Config::getL10n()->t('Format filter server is down or misconfigured') )
+ ));
+ exit();
+ }
- } else {
++ } elseif ($currentConverter == 'local'){
+ $targetFilter = 'odt:writer8';
+ $targetExtension = 'odt';
+ $input = '0M8R4KGxGuEAAAAAAAAAAAAAAAAAAAAAOwADAP7/CQAGAAAAAAAAAAAAAAABAAAAKQAAAAAAAAAAEAAAAgAAAAEAAAD+////AAAAAAAAAAD//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// [...]
+YAXoQAAF2EAABghMQCBiQBAAQAQ0ocAAAALgAIEAEAAgAuAAAACQBIAGUAYQBkAGkAbgBnACAAOAAAAAUACAAGJAEABABDShwASAAJEAEAAgBIAAAACQBIAGUAYQBkAGkAbgBnACAAOQAAAB0ACQASZGQAAAADJAFhJAFehAAAXYQAAGCEAAAGJAEABgA1CAFcCAEAAAAAAAAAAAAALgD+H/L/8QAuAAAACQBXAFcAOABOAHUAbQAxAHoAMAAAAAwAT0oBAFFKAQBeSgEALgD+H/L/AQEuAAAACQBXAFcAOABOAHUAbQAyAHoAMAAAAAwAT0oBAFFKAQBeSgEALgD+H/L/EQEuAAAACQBXAFcAOABOAHUAbQAyAHoAMQAAAAwAT0oGAFFKBgBeSgYALgD+H/L/IQEuAAAACQBXAFcAOABOAHUAbQAyAHoAMgAAAAwAT0oHAFFKBwBeSgcAIgD+H/L/MQEiAAAACQBXAFcAO [...]
+gQUkAAAACgBXAFcAOABOAHUAbQAxADMAegAyAAAAAAAkAP4f8v+RBSQAAAAKAFcAVwA4AE4AdQBtADEAMwB6ADMAAAAAACQA/h/y/6EFJAAAAAoAVwBXADgATgB1AG0AMQAzAHoANAAAAAAAJAD+H/L/sQUkAAAACgBXAFcAOABOAHUAbQAxADMAegA1AAAAAAAkAP4f8v/BBSQAAAAKAFcAVwA4AE4AdQBtADEAMwB6ADYAAAAAACQA/h/y/9EFJAAAAAoAVwBXADgATgB1AG0AMQAzAHoANwAAAAAAJAD+H/L/4QUkAAAACgBXAFcAOABOAHUAbQAxADMAegA4AAAAAAAwAP4f8v/xBTAAAAAKAFcAVwA4AE4AdQBtADEANAB6ADAAAAAMAE9KAQBRSgEAXkoBACQA/h/y/wEGJAAAAAoAVwBXADgATgB1AG0AMQA0AHoAMQAAAAAAJAD+H/L/EQYkAAAACgBXAFcAOAB [...]
+8BBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAA0AAAAAAAAAAAgAAAAAAAAAAAAABQAAAA4AAAAiAAAABAAADgAAAAD/////BAA2DgAAAAD/////BABvDgAAAAD/////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAcAAAAACAAAQggAAAUAAAAACAAARAgAAAYAAAAFAAAACwAAAAwAAAAOAAAAEw0U/xWAAAAAAAcAAAAJAAAADQAAABMhFP8VgA8AAPBAAAAAAAAG8CAAAAABCAAAAwAAAAQAAAACAAAAAQAAAAIAAAACAAAAAgAAAEAAHvEQAAAABAAACAEAAAgCAAAI9wAAEAEPAALw+gAAABAACPAIAAAAA [...]
+AlAEQAMAAlAEEAMAAlAEQAMAAlAEIAOAAlAEQAMQAlADgAMQAlAEQAMQAlADgAMwAlAEQAMAAlAEIARAAlAEQAMAAlAEIARQAlAEQAMAAbAF8AXwBSAGUAZgBIAGUAYQBkAGkAbgBnAF8AXwAxADIANABfADgAMwA0ADEAMAA2ADAAMwA4ABsAXwBfAFIAZQBmAEgAZQBhAGQAaQBuAGcAXwBfADEAMgA2AF8AOAAzADQAMQAwADYAMAAzADgAGwBfAF8AUgBlAGYASABlAGEAZABpAG4AZwBfAF8AMQAyADgAXwA4ADMANAAxADAANgAwADMAOAAbAF8AXwBSAGUAZgBIAGUAYQBkAGkAbgBnAF8AXwAxADMAMABfADgAMwA0ADEAMAA2ADAAMwA4ABsAXwBfAFIAZQBmAEgAZQBhAGQAaQBuAGcAXwBfADEAMwAyAF8AOAAzADQAMQAwADYAMAAzADgAGwBfAF8AUgBlA [...]
+w8AAAEAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAQAABehDcCYIQAABXGBQABNwIGAgAAAC4AAQAAAAAAAQMAAAAAAAAAAAAAAAAAAAAAABAAAF6EOAJghAAAFcYFAAE4AgYEAAAALgABAC4AAQAAAAAAAQMFAAAAAAAAAAAAAAAAAAAAABAAAF6ENwJghAAAFcYFAAE3AgYGAAAALgABAC4AAgAuAAEAAAAAAAEDBQcAAAAAAAAAAAAAAAAAAAAQAABehMAGYIR4/RXGBQABwAYGCAAAAC4AAQAuAAIALgADAC4AAQAAAAAAAQMFBwkAAAAAAAAAAAAAAAAAABAAAF6EuAhghOj8FcYFAAG4CAYKAAAALgABAC4AAgAuAAMALgAEAC4AAQAAAAAAAQMFBwkLAAAAAAAAAAAAAAAAABAAAF6EsApghFj8FcYFAAGwCgYMAAAALgABAC4AAgAuAAMALgAEAC4ABQAuAAEAAAAA [...]
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8DAAAB4AAABgMwAAGAAAAAAAAAAAAAAA6hkAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeDMAAAgAAAAAAAAAAAAAAIAzAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA2QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA [...]
+wAAAQACAAAAAAAAAAAAAAAAAAAAAAACAAAAAtXN1ZwuGxCTlwgAKyz5rkQAAAAF1c3VnC4bEJOXCAArLPmuXAAAABgAAAABAAAAAQAAABAAAAACAAAA6f0AABgAAAABAAAAAQAAABAAAAACAAAA6f0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgBvAG8AdAAgAEUAbgB0AHIAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYABQD//////////wEAAAAGCQIAAAAAAMAAAAAAAABGAAAAAAAAAAAAAAAAAAAAAAAA [...]
+
+ $infile = \OCP\Files::tmpFile();
+ $outdir = \OCP\Files::tmpFolder();
+ $outfile = $outdir . '/' . basename($infile) . '.' . $targetExtension;
+ $cmd = Helper::findOpenOffice();
+
+ $params = ' --headless --convert-to ' . escapeshellarg($targetFilter) . ' --outdir '
+ . escapeshellarg($outdir)
+ . ' --writer '. escapeshellarg($infile)
+ . ' -env:UserInstallation=file://' . escapeshellarg(get_temp_dir()) . ' 2>&1'
+ ;
+ file_put_contents($infile, $input);
+
+ $result = shell_exec($cmd . $params);
+ $exists = file_exists($outfile);
+
+ if (!$exists){
+ Helper::warnLog('Conversion failed. Raw output:' . $result);
+ \OCP\JSON::error(array( 'data'=>
+ array('message' => Config::getL10n()->t('Conversion failed. Check log for details.') )
+ ));
+ exit();
+ } else {
+ unlink($outfile);
+ }
+ }
+
+ \OCP\JSON::success(array( 'data'=>array('message'=>Config::getL10n()->t('Saved')) ));
+} catch (\Exception $e){
+ \OCP\JSON::error(array( 'data'=>
+ array('message' => $e->getMessage() )
+ ));
+}
diff --cc apps/documents/appinfo/app.php
index e2a19d9,0000000..dae291a
mode 100644,000000..100644
--- a/apps/documents/appinfo/app.php
+++ b/apps/documents/appinfo/app.php
@@@ -1,80 -1,0 +1,82 @@@
+<?php
+
+/**
+ * ownCloud - Documents App
+ *
+ * @author Frank Karlitschek
+ * @copyright 2013-2014 Frank Karlitschek karlitschek at kde.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+OCP\App::register(array('order' => 70, 'id' => 'documents', 'name' => 'Documents'));
+//OCP\App::registerAdmin('documents', 'settings');
+\OCP\App::registerAdmin('documents', 'admin');
+OCP\App::registerPersonal('documents', 'personal');
+
+OCP\App::addNavigationEntry(array(
+ 'id' => 'documents_index',
+ 'order' => 2,
+ 'href' => OCP\Util::linkTo('documents', 'index.php'),
+ 'icon' => OCP\Util::imagePath('documents', 'documents.svg'),
+ 'name' => OCA\Documents\Config::getL10n()->t('Documents'))
+);
+
+OC::$CLASSPATH['OCA\Documents\Controller'] = 'documents/ajax/controller.php';
+OC::$CLASSPATH['OCA\Documents\DocumentController'] = 'documents/ajax/documentController.php';
+OC::$CLASSPATH['OCA\Documents\SessionController'] = 'documents/ajax/sessionController.php';
+OC::$CLASSPATH['OCA\Documents\UserController'] = 'documents/ajax/userController.php';
+
+//Script for registering file actions
+OCP\Util::addScript('documents', 'viewer/viewer');
+
- $docFilter = new OCA\Documents\Filter\Office(
++if (OCA\Documents\Config::getConverter() !== 'off'){
++ $docFilter = new OCA\Documents\Filter\Office(
+ array(
+ 'read' =>
+ array (
+ 'target' => 'application/vnd.oasis.opendocument.text',
+ 'format' => 'odt:writer8',
+ 'extension' => 'odt'
+ ),
+ 'write' =>
+ array (
+ 'target' => 'application/msword',
+ 'format' => 'doc',
+ 'extension' => 'doc'
+ )
+ )
- );
++ );
+
- $docxFilter = new OCA\Documents\Filter\Office(
++ $docxFilter = new OCA\Documents\Filter\Office(
+ array (
+ 'read' =>
+ array (
+ 'target' => 'application/vnd.oasis.opendocument.text',
+ 'format' => 'odt:writer8',
+ 'extension' => 'odt'
+ ),
+ 'write' =>
+ array (
+ 'target' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+ 'format' => 'docx',
+ 'extension' => 'docx'
+ )
+ )
- );
++ );
++}
+
+//Listen to delete file signal
+OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Documents\Storage", "onDelete");
diff --cc apps/documents/js/admin.js
index 324d509,0000000..5e9f26b
mode 100644,000000..100644
--- a/apps/documents/js/admin.js
+++ b/apps/documents/js/admin.js
@@@ -1,34 -1,0 +1,34 @@@
+/*global OC, $ */
+
+$(document).ready(function(){
+
+ var documentsSettings = {
+ save : function() {
+ $('#docs_apply').attr('disabled', true);
+ var data = {
+ converter : $('[name="docs_converter"]:checked').val()
+ };
+
- if (data.converter !== 'local'){
++ if (data.converter === 'external'){
+ data.url = $('#docs_url').val();
+ }
+
+ OC.msg.startAction('#documents-admin-msg', t('documents', 'Saving...'));
+ $.post(
+ OC.filePath('documents', 'ajax', 'admin.php'),
+ data,
+ documentsSettings.afterSave
+ );
+ },
+
+ afterSave : function(response){
+ $('#docs_apply').attr('disabled', false);
+ OC.msg.finishedAction('#documents-admin-msg', response);
+ }
+ };
+
- $('#docs_converter_external, #docs_converter_local').on('click', function(){
- $('#docs_extra').toggle($('[name="docs_converter"]:checked').val() !== 'local');
++ $('#docs_converter_external, #docs_converter_local, #docs_converter_off').on('click', function(){
++ $('#docs_extra').toggle($('[name="docs_converter"]:checked').val() === 'external');
+ });
+ $('#docs_apply').on('click', documentsSettings.save);
+});
diff --cc apps/documents/lib/config.php
index 52ee782,0000000..b722cf7
mode 100644,000000..100644
--- a/apps/documents/lib/config.php
+++ b/apps/documents/lib/config.php
@@@ -1,46 -1,0 +1,46 @@@
+<?php
+
+/**
+ * ownCloud - Documents App
+ *
+ * @author Victor Dubiniuk
+ * @copyright 2014 Victor Dubiniuk victor.dubiniuk at gmail.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ */
+
+namespace OCA\Documents;
+
+class Config {
+ const APP_NAME = 'documents';
+
+ public static function getL10n(){
+ return \OCP\Util::getL10N(self::APP_NAME);
+ }
+
+ public static function getConverter(){
- return self::getAppValue('converter', 'local');
++ return self::getAppValue('converter', 'off');
+ }
+
+ public static function setConverter($value){
+ return self::setAppValue('converter', $value);
+ }
+
+ public static function getConverterUrl(){
+ return self::getAppValue('converter_url', 'http://localhost:16080');
+ }
+
+ public static function setConverterUrl($value){
+ return self::setAppValue('converter_url', $value);
+ }
+
+ protected static function getAppValue($key, $default){
+ return \OCP\Config::getAppValue(self::APP_NAME, $key, $default);
+ }
+
+ protected static function setAppValue($key, $value){
+ return \OCP\Config::setAppValue(self::APP_NAME, $key, $value);
+ }
+
+}
diff --cc apps/documents/templates/admin.php
index 6fd9852,0000000..75c1618
mode 100644,000000..100644
--- a/apps/documents/templates/admin.php
+++ b/apps/documents/templates/admin.php
@@@ -1,29 -1,0 +1,33 @@@
- <?php $isLocal = $_['converter']=='local' ?>
+<div class="section" id="documents">
+ <h2><?php p($l->t('Documents')) ?></h2>
+ <p><?php p($l->t('MS Word support (requires openOffice/libreOffice)')) ?></p>
+ <p>
+ <input type="radio" name="docs_converter" value="local" id="docs_converter_local"
- <?php print_unescaped($isLocal ? 'checked="checked"' : '') ?>
++ <?php print_unescaped($_['converter']=='local' ? 'checked="checked"' : '') ?>
+ />
+ <label for="docs_converter_local"><?php p($l->t('Local')) ?></label><br>
+ <em><?php p($l->t('openOffice/libreOffice is installed on this server. Path to binary is provided via preview_libreoffice_path in config.php')) ?></em>
+ </p>
+ <p>
+ <input type="radio" name="docs_converter" value="external" id="docs_converter_external"
- <?php print_unescaped(!$isLocal ? 'checked="checked"' : '') ?>
- />
++ <?php print_unescaped($_['converter']=='external' ? 'checked="checked"' : '') ?>
+ <label for="docs_converter_external"><?php p($l->t('External')) ?></label><br>
+ <em><?php p($l->t('openOffice/libreOffice is installed on external server running a format filter server')) ?></em>
+ </p>
- <div id="docs_extra" <?php print_unescaped($isLocal ? 'style="display:none"' : '') ?>>
++ <p>
++ <input type="radio" name="docs_converter" value="off" id="docs_converter_off"
++ <?php print_unescaped($_['converter']=='off' ? 'checked="checked"' : '') ?> />
++ <label for="docs_converter_off"><?php p($l->t('Disabled')) ?></label><br>
++ <em><?php p($l->t('No MS Word support')) ?></em>
++ </p>
++ <div id="docs_extra" <?php print_unescaped($_['converter']!=='external' ? 'style="display:none"' : '') ?>>
+ <input type="text" name="docs_url" id="docs_url"
+ value="<?php p($_['converter_url'])?>"
+ original-title="<?php p($l->t('scheme://domain.tld[:port]')) ?>"
+ style="width:250px;"
+ />
+ <br /><em><?php p($l->t('Server URL')) ?></em>
+ </div>
+ <br /><button type="button" id="docs_apply"><?php p($l->t('Apply and test')) ?></button>
+ <span id="documents-admin-msg" class="msg"></span>
+</div>
diff --cc core/doc/user/_sources/contents.txt
index 95e056d,0000000..bd35d33
mode 100644,000000..100644
--- a/core/doc/user/_sources/contents.txt
+++ b/core/doc/user/_sources/contents.txt
@@@ -1,30 -1,0 +1,30 @@@
+.. _contents:
+
- ===============================
- ownCloud documentation contents
- ===============================
++====================
++ownCloud User Manual
++====================
+
+.. toctree::
+ :hidden:
+
+ index
+
+.. toctree::
+ :maxdepth: 3
+
+ whats_new
+ webinterface
+ files/index
+ pim/index
+ documents
+ bookmarks
+ migration
+ userpreferences
+ external_storage/google_drive
+
+
+
- Indices and tables
- ==================
++.. Indices and tables
++.. ==================
+
- * :ref:`genindex`
++.. * :ref:`genindex`
diff --cc core/doc/user/_sources/index.txt
index 70656da,0000000..0a77d4f
mode 100644,000000..100644
--- a/core/doc/user/_sources/index.txt
+++ b/core/doc/user/_sources/index.txt
@@@ -1,102 -1,0 +1,91 @@@
+.. _index:
+
+=====================================
+ownCloud |version| User Documentation
+=====================================
+
+**Welcome to ownCloud: your self-hosted file sync and share solution.**
+
+ownCloud is open source file sync and share software for everyone from
+individuals operating the free ownCloud Community Edition, to large enterprises
+and service providers operating the ownCloud Enterprise Edition. ownCloud
+provides a safe, secure, and compliant file synchronization and sharing
+solution on servers that you control.
+
+With ownCloud you can share one or more files and folders on your computer, and
+synchronize them with your ownCloud server. Place files in your local shared
+directories, and those files are immediately synchronized to the server and to
+other devices using the ownCloud Desktop Client. Not near a device running a
+desktop client? No problem! Simply log in using the ownCloud web client and
+manage your files from there. The ownCloud Android and iOS mobile applications
+enable you to browse, download, and upload photos and videos. On Android, you
+can also create, download, edit, and upload any other files, as long as the
+correct software is installed.
+
+Whether you are using a mobile device, a workstation, or a web client, ownCloud
+provides the ability to put the right files in the right hands at the right
+time on any device with one simple-to-use, secure, private and controlled
+solution. After all, with ownCloud, it’s Your Cloud, Your Data, Your Way.
+
+Web Interface
+=============
+The following topic contains a general overview how to access ownCloud from a
+web browser like Firefox, Chrome, or Internet Explorer:
+
+* :doc:`webinterface`
+
+File Access and Management
+==========================
+The following topics contain information about file access and management.
- Access information includes how to access your server using the ownCloud web
- interface or through the use of WebDAV shares (Linux or Mac OSX) or web folders
- (Windows):
+
- * :doc:`files/filesweb`
- * :doc:`files/files`
- * :doc:`files/sync`
- * :doc:`files/server_to_server_using`
- * :doc:`files/versioncontrol`
++* :doc:`files/configuring_big_file_upload`
+* :doc:`files/deletedfiles`
+* :doc:`files/encryption`
++* :doc:`files/files`
++* :doc:`files/filesweb`
+* :doc:`files/quota`
- * :doc:`files/configuring_big_file_upload`
-
++* :doc:`files/server_to_server_using`
++* :doc:`files/sync`
++* :doc:`files/versioncontrol`
+
+Contacts and Calendar
+=====================
- The following topic provides information about the **Contacts** and
- **Calendar** applications including usage instructions as well as how to
++The following topics provide information about the **Contacts** and
++**Calendar** applications, including usage instructions as well as how to
+export, import, and synchronization the ownCloud calendar application with
+different operating system calendars:
+
+* :doc:`pim/calendar`
+* :doc:`pim/contacts`
+* :doc:`pim/sync_ios`
+* :doc:`pim/sync_kde`
+* :doc:`pim/sync_osx`
+
+Documents
+=========
+The following topic describes how to use the **Documents** application to
+enable multiple users to collaboratively edit rich-text documents
+simultaneously.
+
+* :doc:`documents`
+
+Bookmarks
+=========
+The following topic describes how to use the ownCloud **Bookmarks** application
+to manage your bookmarks:
+
+* :doc:`bookmarks`
+
- Backup
- ======
- The following topic describes the ownCloud **User_Migrate** application used to
- import and export user account settings:
-
- * :doc:`migration`
-
+External storage
+================
+Please see ``Configuring External Storage (GUI)`` in the ownCloud
+Administrator's manual:
+
+`Configuring External Storage (GUI)
+<http://doc.owncloud.org/server/7.0/admin_manual/configuration/
+custom_mount_config_gui.html>`_
+
- Indices and tables
- ==================
++.. Indices and tables
++.. ==================
+
- * :ref:`genindex`
++.. * :ref:`genindex`
diff --cc core/doc/user/bookmarks.html
index ba5f99a,0000000..a3113e0
mode 100644,000000..100644
--- a/core/doc/user/bookmarks.html
+++ b/core/doc/user/bookmarks.html
@@@ -1,208 -1,0 +1,207 @@@
+
+<!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>Using the Bookmarks App — 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="next" title="User Account Migration" href="migration.html" />
++ <link rel="next" title="Setting Your Preferences" href="userpreferences.html" />
+ <link rel="prev" title="Collaborative Document Editing" href="documents.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"><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 current"><a class="current reference internal" href="">Using the Bookmarks App</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#the-main-interface">The main interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#add-a-bookmark">Add a bookmark</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#edit-delete-a-bookmark">Edit/Delete a bookmark</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#search">Search</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#the-bookmarklet">The Bookmarklet</a></li>
+</ul>
+</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="using-the-bookmarks-app">
+<h1>Using the Bookmarks App<a class="headerlink" href="#using-the-bookmarks-app" title="Permalink to this headline">¶</a></h1>
+<p>If you want to add a bookmark to the Bookmarks application,
+you can either use the main interface or the bookmarklet.</p>
+<div class="section" id="the-main-interface">
+<h2>The main interface<a class="headerlink" href="#the-main-interface" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="add-a-bookmark">
+<h3>Add a bookmark<a class="headerlink" href="#add-a-bookmark" title="Permalink to this headline">¶</a></h3>
+<p>In the bookmark application, enter a URL into the top-left area of the content section. After adding an address, click on the pencil button to edit fields for the given address.
+The main ownCloud bookmark interface contains 3 fields at the top where
+you can enter the website address (or URL), the title of your bookmark, and
+a set of tags separated from each other by a space.</p>
+<div class="figure">
+<img alt="_images/bookmark_addurl.png" src="_images/bookmark_addurl.png" />
+<p class="caption">Adding a bookmark manually</p>
+</div>
+<p>In this example, we have added the page <cite>http://wikipedia.org</cite> with the title “Wikipedia”
+and some tags describing what Wikipedia is for an easier search later on.</p>
+</div>
+<div class="section" id="edit-delete-a-bookmark">
+<h3>Edit/Delete a bookmark<a class="headerlink" href="#edit-delete-a-bookmark" title="Permalink to this headline">¶</a></h3>
+<p>You also have the possibility to edit or delete a bookmark.</p>
+<p>To edit a bookmark, hover over the bookmark and click on the pencil icon.
+The bookmark details will then be filled into the 3 fields at the top of the screen.
+Modify your bookmark to your needs then click the save button to persist the change.</p>
+<p>To delete a bookmark, hover over the bookmark and click the cross icon.</p>
+</div>
+<div class="section" id="search">
+<h3>Search<a class="headerlink" href="#search" title="Permalink to this headline">¶</a></h3>
+<p>If you click on a tag, ownCloud will only display the bookmarks that
+are described with this tag.</p>
+<p>You can also use the search bar of ownCloud in the top right of your screen.</p>
+<p>Simply click on the “Bookmarks” menu in the sidebar to come back to
+the default view.</p>
+</div>
+</div>
+<div class="section" id="the-bookmarklet">
+<h2>The Bookmarklet<a class="headerlink" href="#the-bookmarklet" title="Permalink to this headline">¶</a></h2>
+<div class="figure">
+<img alt="_images/bookmark_setting.png" src="_images/bookmark_setting.png" />
+<p class="caption">Bookmarklet link</p>
+</div>
+<p>The creator of this app understands that people won’t want to
+open the ownCloud boorkmarks page to add a bookmark every time they see a cool site.
+This is why they have made this cool “bookmarklet”.</p>
+<p>A bookmarklet is small button that you can drag and drop in your bookmarks.
+The next time you see a cool new site, click on this special bookmark
+to add the site to your ownCloud bookmarks.</p>
+<p>To find this bookmark, click on the gear button at the bottom of the bookmarks app.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/contents.html
index a8aa000,0000000..aafe506
mode 100644,000000..100644
--- a/core/doc/user/contents.html
+++ b/core/doc/user/contents.html
@@@ -1,290 -1,0 +1,278 @@@
+
+<!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 User Manual 7.0 documentation</title>
++ <title>ownCloud User Manual — 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="next" title="ownCloud 7.0 User 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="#">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="#">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">
+
- <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="section" id="owncloud-user-manual">
++<span id="contents"></span><h1>ownCloud User Manual<a class="headerlink" href="#owncloud-user-manual" 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.html">What’s New for Users in ownCloud 7</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#no-more-shared-folder">No More Shared Folder</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#selective-sync">Selective Sync</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#server-to-server-sharing">Server to Server Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#file-and-activity-notifications">File and Activity Notifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#owncloud-documents-with-word-conversion">ownCloud Documents with Word Conversion</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#mobile-web-browser-support">Mobile Web Browser Support</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#lazy-loading-files">Lazy Loading Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#change-in-share-expiration-date">Change in Share Expiration Date</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="webinterface.html#accessing-the-owncloud-web-interface">Accessing the ownCloud Web Interface</a></li>
+<li class="toctree-l2"><a class="reference internal" href="webinterface.html#navigating-the-main-user-interface">Navigating the Main User Interface</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="files/filesweb.html">Accessing your Files Using the Web Interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#navigating-inside-your-owncloud">Navigating Inside Your ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#overlay-icons-show-sharing-status">Overlay Icons Show Sharing Status</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#creating-or-uploading-files-and-directories">Creating or Uploading Files and Directories</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#selecting-files-or-folders">Selecting Files or Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#filtering-the-file-application-view">Filtering the File Application View</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#previewing-files">Previewing Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#moving-files">Moving Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#sharing-files-locally">Sharing Files Locally</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#creating-a-public-share">Creating a Public Share</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#change-in-share-expiration-date">Change in Share Expiration Date</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/files.html">Accessing Files Using WebDAV</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#accessing-files-using-linux">Accessing Files Using Linux</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#accessing-files-using-mac-osx">Accessing Files Using MAC OSX</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#accessing-files-using-microsoft-windows">Accessing Files Using Microsoft Windows</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#using-the-desktop-sync-client-to-access-files">Using the Desktop Sync Client to Access Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#using-mobile-apps-to-access-files">Using Mobile Apps to Access Files</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files/server_to_server_using.html">Using Server-to-Server Sharing</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/server_to_server_using.html#creating-a-new-share">Creating a New Share</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/server_to_server_using.html#connecting-to-a-remote-share">Connecting to a Remote Share</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/deletedfiles.html">Managing Deleted Files</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/deletedfiles.html#restoring-files">Restoring Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/deletedfiles.html#deleting-files">Deleting Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/deletedfiles.html#modifying-the-deleted-file-age-out-value">Modifying the Deleted File Age-Out Value</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files/encryption.html">Encrypting Your ownCloud Files</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/encryption.html#using-encryption">Using Encryption</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/encryption.html#sharing-encrypted-files">Sharing Encrypted Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/encryption.html#removing-encryption">Removing Encryption</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/encryption.html#files-not-encrypted">Files Not Encrypted</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files/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><ul>
+<li class="toctree-l2"><a class="reference internal" href="pim/contacts.html">Using the Contacts App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#adding-contacts">Adding Contacts</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#managing-address-books">Managing Address Books</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#adding-an-address-book">Adding an Address Book</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#synchronizing-address-books">Synchronizing Address Books</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#troubleshooting">Troubleshooting</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="pim/calendar.html">Using the Calendar App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#creating-a-new-calendar">Creating a New Calendar</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#managing-calendar-settings">Managing Calendar Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#synchronizing-calendars-using-caldav">Synchronizing Calendars Using CalDAV</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#creating-events">Creating Events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#sharing-events">Sharing Events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#exporting-and-importing-events">Exporting and Importing Events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#deleting-an-event">Deleting an Event</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#calendar-app-faq">Calendar App FAQ</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="pim/sync_ios.html">iOS - Synchronize iPhone/iPad</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/sync_ios.html#calendar">Calendar</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/sync_ios.html#address-book">Address book</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="pim/sync_osx.html">Synchronizing with OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="pim/sync_thunderbird.html">Thunderbird - Synchronize Addressbook</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/sync_thunderbird.html#addressbook">Addressbook</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="pim/sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="pim/troubleshooting.html">Troubleshooting</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/troubleshooting.html#debugging-the-issue">Debugging the issue</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/troubleshooting.html#service-discovery">Service discovery</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/troubleshooting.html#unable-to-update-contacts-or-events">Unable to update Contacts or Events</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Collaborative Document Editing</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="documents.html#the-main-interface">The main interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="documents.html#create-or-upload-a-document">Create or Upload a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="documents.html#edit-a-document">Edit a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="documents.html#delete-a-document">Delete a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="documents.html#share-a-document">Share a Document</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="bookmarks.html#the-main-interface">The main interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="bookmarks.html#add-a-bookmark">Add a bookmark</a></li>
+<li class="toctree-l3"><a class="reference internal" href="bookmarks.html#edit-delete-a-bookmark">Edit/Delete a bookmark</a></li>
+<li class="toctree-l3"><a class="reference internal" href="bookmarks.html#search">Search</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="bookmarks.html#the-bookmarklet">The Bookmarklet</a></li>
+</ul>
+</li>
- <li class="toctree-l1"><a class="reference internal" href="migration.html">User Account Migration</a><ul>
- <li class="toctree-l2"><a class="reference internal" href="migration.html#export">Export</a></li>
- <li class="toctree-l2"><a class="reference internal" href="migration.html#import">Import</a></li>
- </ul>
- </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>
+</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/user/documents.html
index 50431a7,0000000..2f60c1c
mode 100644,000000..100644
--- a/core/doc/user/documents.html
+++ b/core/doc/user/documents.html
@@@ -1,231 -1,0 +1,230 @@@
+
+<!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>Collaborative Document Editing — 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="next" title="Using the Bookmarks App" href="bookmarks.html" />
+ <link rel="prev" title="Troubleshooting" href="pim/troubleshooting.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"><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 current"><a class="current reference internal" href="">Collaborative Document Editing</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#the-main-interface">The main interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#create-or-upload-a-document">Create or Upload a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#edit-a-document">Edit a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#delete-a-document">Delete a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#share-a-document">Share a Document</a></li>
+</ul>
+</li>
+</ul>
+</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="collaborative-document-editing">
+<h1>Collaborative Document Editing<a class="headerlink" href="#collaborative-document-editing" title="Permalink to this headline">¶</a></h1>
+<p>The Documents application supports editing documents within ownCloud, without
+the need to launch an external application. The Documents app supports these
+features:</p>
+<ul class="simple">
+<li>Cooperative edit, with multiple users editing files simultaneously.</li>
+<li>Document creation within ownCloud.</li>
+<li>Document upload.</li>
+<li>Share and edit files in the browser, and then share them inside ownCloud or
+through a public link.</li>
+</ul>
+<p>Supported file formats are <cite>.odt</cite>, <cite>.doc</cite>, and <cite>.docx</cite>.</p>
+<div class="section" id="the-main-interface">
+<h2>The main interface<a class="headerlink" href="#the-main-interface" title="Permalink to this headline">¶</a></h2>
+<img alt="_images/oc_documents.png" src="_images/oc_documents.png" />
+<div class="section" id="create-or-upload-a-document">
+<h3>Create or Upload a Document<a class="headerlink" href="#create-or-upload-a-document" title="Permalink to this headline">¶</a></h3>
+<p>In the Documents application, you can upload an existing document or create a
+new one. The <em>New document</em> button creates a document named “New
+document.odt”. The extension ODT is an OpenDocument format, which is supported
+by most word processors including Microsoft Word, LibreOffice Writer, and
+OpenOffice Writer.</p>
+</div>
+<div class="section" id="edit-a-document">
+<h3>Edit a Document<a class="headerlink" href="#edit-a-document" title="Permalink to this headline">¶</a></h3>
+<p>To edit a document, access the Documents app from your Apps menu at the top
+left of your ownCloud window.</p>
+<img alt="_images/oc_documents_edit.png" src="_images/oc_documents_edit.png" />
+<ol class="arabic simple">
+<li>Click on the file name to change it.</li>
+<li>Share your document (See the <a class="reference internal" href="#share-a-document"><em>Share a document</em></a> section.)</li>
+<li>Formatting toolbar.</li>
+<li>Zoom in/out</li>
+<li>Close and save.</li>
+<li>Users currently editing this document.</li>
+</ol>
+<div class="section" id="collaboratively-editing-a-document">
+<h4>Collaboratively Editing a Document<a class="headerlink" href="#collaboratively-editing-a-document" title="Permalink to this headline">¶</a></h4>
+<p>To edit a file collaboratively, it must be shared with everyone who needs
+editing permissions. Multiple users can edit it at the same time, and changes
+appear as they are made. The cursor of each user is the same color as the
+border color of their user picture.</p>
+<div class="figure">
+<img alt="_images/oc_documents_col_edit.png" src="_images/oc_documents_col_edit.png" />
+</div>
+<p>If a user is not a local user (e.g accessing the file using public link), they
+will be shown as guest in the user list, automatically named Guest 1, Guest 2,
+and so on. Guests can change their nicknames at any time.</p>
+</div>
+</div>
+<div class="section" id="delete-a-document">
+<h3>Delete a Document<a class="headerlink" href="#delete-a-document" title="Permalink to this headline">¶</a></h3>
+<p>You can’t delete a document from inside the Document app, but must go to your
+Files page and delete it from there. You’ll find it in your default documents
+directory, which is configured on your ownCloud Personal page (see
+<a class="reference internal" href="userpreferences.html"><em>Setting Your Preferences</em></a>.)</p>
+</div>
+<div class="section" id="share-a-document">
+<span id="id1"></span><h3>Share a Document<a class="headerlink" href="#share-a-document" title="Permalink to this headline">¶</a></h3>
+<p>Document sharing has the same options as when sharing other files. While editing
+a document, you can use the <em>Share</em> button to enable other users to edit the
+document. This button will display all available options to share:</p>
+<div class="figure">
+<img alt="_images/oc_documents_share.png" src="_images/oc_documents_share.png" />
+</div>
+<p>By default, you can enter local users or groups to share with. Checking <em>Share
+link</em> will enable sharing via a public link. Shares can optionally have an
+expiration date and password. ownCloud will send the public link to users by
+email by typing each email address into the email field. Separate multiple
+email addresses with a space.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/external_storage/google_drive.html
index 7e74b7c,0000000..2660f40
mode 100644,000000..100644
--- a/core/doc/user/external_storage/google_drive.html
+++ b/core/doc/user/external_storage/google_drive.html
@@@ -1,156 -1,0 +1,155 @@@
+
+<!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>Configuring External Storage — 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="prev" title="Setting Your Preferences" href="../userpreferences.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"><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 current"><a class="current reference internal" href="">Configuring External Storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuring-external-storage">
+<h1>Configuring External Storage<a class="headerlink" href="#configuring-external-storage" title="Permalink to this headline">¶</a></h1>
+<p>The External Storage application allows you to mount external storage services, such as Google
+Drive, Dropbox, Amazon S3, SMB/CIFS fileservers, and FTP servers in ownCloud. Your
+ownCloud server administrator controls which of these are available to you. Please see
+<tt class="docutils literal"><span class="pre">Configuring</span> <span class="pre">External</span> <span class="pre">Storage</span> <span class="pre">(GUI)</span></tt> in the ownCloud Administrator’s manual for
+configuration howtos and example:</p>
+<p><a class="reference external" href="http://doc.owncloud.org/server/7.0/admin_manual/configuration/custom_mount_config_gui.html">Configuring External Storage (GUI)</a></p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/configuring_big_file_upload.html
index c7f7908,0000000..5e2ab57
mode 100644,000000..100644
--- a/core/doc/user/files/configuring_big_file_upload.html
+++ b/core/doc/user/files/configuring_big_file_upload.html
@@@ -1,178 -1,0 +1,177 @@@
+
+<!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>Managing Big Files — 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="Contacts & Calendar" href="../pim/index.html" />
+ <link rel="prev" title="Storage Quota" href="quota.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"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">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="managing-big-files">
+<h1>Managing Big Files<a class="headerlink" href="#managing-big-files" title="Permalink to this headline">¶</a></h1>
+<p>There are a few default configuration settings that you will want to change to
+enable ownCloud to operate more effectively as a self-hosted file sync and
+share server.</p>
+<p>When uploading through the web client, ownCloud is governed by PHP and Apache.
+By default, PHP is configured for only 2 megabyte uploads. As this default
+upload limit is not entirely useful, we recommend that you increase the
+ownCloud variables to the sizes you want to support on your server.</p>
+<p>Modifying certain ownCloud variables requires administrative access. If you
+require larger upload limits than have been provided by the default (or already
+set by your administrator):</p>
+<ul class="simple">
+<li>Contact your administrator to request an increase in these variables</li>
+<li>Refer to the section in the <a class="reference external" href="http://doc.owncloud.org/server/6.0/admin_manual/configuration/configuring_big_file_upload.html">Admin Documentation</a>
+that describes how to configure for big files.</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/deletedfiles.html
index 20f4e5e,0000000..8c60f63
mode 100644,000000..100644
--- a/core/doc/user/files/deletedfiles.html
+++ b/core/doc/user/files/deletedfiles.html
@@@ -1,223 -1,0 +1,222 @@@
+
+<!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>Managing Deleted Files — 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="Desktop Synchronization" href="sync.html" />
+ <link rel="prev" title="Using Server-to-Server Sharing" href="server_to_server_using.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 current"><a class="current reference internal" href="">Managing Deleted Files</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#restoring-files">Restoring Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#deleting-files">Deleting Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#modifying-the-deleted-file-age-out-value">Modifying the Deleted File Age-Out Value</a></li>
+</ul>
+</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"><a class="reference internal" href="quota.html">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="managing-deleted-files">
+<h1>Managing Deleted Files<a class="headerlink" href="#managing-deleted-files" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud maintains a copy of deleted files in case you need them again. To
+ensure that individual users do not run out of memory, the Files app manages
+the total memory size of deleted files for each user. When it comes to managing
+deleted files, keep the following in mind:</p>
+<ul class="simple">
+<li>The total memory allocation for deleted files can never exceed more that 50%
+of the currently available free space for each user.</li>
+<li>Once the 50% maximum is reached for deleted files, ownCloud begins to delete files,
+starting with the oldest versions, until it reaches the memory usage limit again.</li>
+</ul>
+<p>You can view all of the deleted files by clicking on the <em class="guilabel">Deleted
+files</em> button in Files app on the web interface.</p>
+<div class="section" id="restoring-files">
+<h2>Restoring Files<a class="headerlink" href="#restoring-files" title="Permalink to this headline">¶</a></h2>
+<p>To restore a deleted file:</p>
+<ol class="arabic">
+<li><p class="first">In the Files app, click the <em class="guilabel">Deleted files</em> button.</p>
+<p>The Files app shows all deleted files.</p>
+<div class="figure">
+<img alt="../_images/deleted_files.png" src="../_images/deleted_files.png" />
+<p class="caption"><strong>Deleted files</strong></p>
+</div>
+</li>
+<li><p class="first">Hover the cursor over the file that you want to restore.</p>
+<p>Task options appear for the file.</p>
+</li>
+<li><p class="first">Click the <em class="guilabel">Restore</em> button.</p>
+<p>The Files app restores the file to its original location on the server.</p>
+</li>
+</ol>
+</div>
+<div class="section" id="deleting-files">
+<h2>Deleting Files<a class="headerlink" href="#deleting-files" title="Permalink to this headline">¶</a></h2>
+<p>To permanently delete a file:</p>
+<ol class="arabic">
+<li><p class="first">In the Files app, click the <em class="guilabel">Deleted files</em> button.</p>
+<p>See the <strong>Deleted files</strong> image above.</p>
+</li>
+<li><p class="first">Hover the cursor over the file that you want to delete.</p>
+<p>Task options appear for the file.</p>
+</li>
+<li><p class="first">Click the <em class="guilabel">Trash can</em> button.</p>
+<p>The Files app permanently removes the file from the server.</p>
+</li>
+</ol>
+</div>
+<div class="section" id="modifying-the-deleted-file-age-out-value">
+<h2>Modifying the Deleted File Age-Out Value<a class="headerlink" href="#modifying-the-deleted-file-age-out-value" title="Permalink to this headline">¶</a></h2>
+<p>Each time a file is added to the deleted files directory, ownCloud checks the
+age of the deleted files. By default, deleted files remain in the deleted files
+directory for 180 days.</p>
+<p>The administrator can adjust the age-out value in the config.php by setting the
+<tt class="docutils literal"><span class="pre">trashbin_retention_obligation</span></tt> value. Files with ages that exceed this value
+are deleted permanently.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/encryption.html
index 8ede74f,0000000..d5586dd
mode 100644,000000..100644
--- a/core/doc/user/files/encryption.html
+++ b/core/doc/user/files/encryption.html
@@@ -1,279 -1,0 +1,278 @@@
+
+<!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>Encrypting Your ownCloud Files — 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="Storage Quota" href="quota.html" />
+ <link rel="prev" title="Desktop Synchronization" href="sync.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 current"><a class="current reference internal" href="">Encrypting Your ownCloud Files</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#using-encryption">Using Encryption</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#sharing-encrypted-files">Sharing Encrypted Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#removing-encryption">Removing Encryption</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#files-not-encrypted">Files Not Encrypted</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">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="encrypting-your-owncloud-files">
+<h1>Encrypting Your ownCloud Files<a class="headerlink" href="#encrypting-your-owncloud-files" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud includes an Encryption app, and when it is enabled by your ownCloud
+administrator all of your ownCloud data files are automatically encrypted.
+Encryption is server-wide, so when it is enabled you cannot choose to keep your
+files unencrypted. You don’t have to do anything special, as it uses your
+ownCloud login as the password for your unique private encryption key. Just log
+in and out and manage and share your files as you normally do, and you can
+still change your password whenever you want.</p>
+<p>Its main purpose is to encrypt files on remote storage services that are
+connected to your ownCloud server, such as Dropbox and Google Drive. This is an
+easy and seamless way to protect your files on remote storage. You can share
+your remote files through ownCloud in the usual way, however you cannot share
+your encrypted files directly from Dropbox, Google Drive, or whatever remote
+service you are using, because the encryption keys are stored on your ownCloud
+server, and are never exposed to outside service providers.</p>
+<p>If your ownCloud server is not connected to any remote storage services, then
+it is better to use some other form of encryption such as file-level or whole
+disk encryption. Because the keys are kept on your ownCloud server, it is
+possible for your ownCloud admin to snoop in your files, and if the server is
+compromised the intruder may get access to your files. (Read
+<a class="reference external" href="https://owncloud.org/blog/how-owncloud-uses-encryption-to-protect-your-data/">How ownCloud uses encryption to protect your data</a>
+to learn more.)</p>
+<div class="section" id="using-encryption">
+<h2>Using Encryption<a class="headerlink" href="#using-encryption" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud encryption is pretty much set it and forget it, but you have a few
+options you can use.</p>
+<p>When your ownCloud admin enables encryption for the first time, you must log
+out and then log back in to create your encryption keys and encrypt your files.
+When encryption has been enabled on your ownCloud server you will see a yellow
+banner on your Files page warning you to log out and then log back in.</p>
+<div class="figure">
+<img alt="../_images/encryption1.png" src="../_images/encryption1.png" />
+</div>
+<p>When you log back it takes a few minutes to work, depending on how many
+files you have, and then you are returned to your default ownCloud page.</p>
+<div class="figure">
+<img alt="../_images/encryption2.png" src="../_images/encryption2.png" />
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You must never lose your ownCloud password, because you will lose
+access to your files. Though there is an optional recovery option that your
+ownCloud administrator may enable; see the Recovery Key Password section to
+learn about this.</p>
+</div>
+</div>
+<div class="section" id="sharing-encrypted-files">
+<h2>Sharing Encrypted Files<a class="headerlink" href="#sharing-encrypted-files" title="Permalink to this headline">¶</a></h2>
+<p>Only users who have private encryption keys have access to shared encrypted
+files and folders. Users who have not yet created their private encryption keys
+will not have access to encrypted shared files; they will see folders and
+filenames, but will not be able to open or download the files. They will see a
+yellow warning banner that says “Encryption App is enabled but your keys are not
+initialized, please log-out and log-in again.”</p>
+<p>Share owners may need to re-share files after encryption is enabled; users
+trying to access the share will see a message advising them to ask the share
+owner to re-share the file with them. For individual shares, un-share and
+re-share the file. For group shares, share with any individuals who can’t access
+the share. This updates the encryption, and then the share owner can remove the
+individual shares.</p>
+<div class="section" id="recovery-key-password">
+<h3>Recovery Key Password<a class="headerlink" href="#recovery-key-password" title="Permalink to this headline">¶</a></h3>
+<p>If your ownCloud administrator has enabled the recovery key feature, you can
+choose to use this feature for your account. If you enable “Password recovery”
+the administrator can read your data with a special password. This feature
+enables the administrator to recover your files in the event you lose your
+ownCloud password. If the recovery key is not enabled, then there is no way to
+restore your files if you lose your login password.</p>
+<div class="figure">
+<img alt="../_images/encryption3.png" src="../_images/encryption3.png" />
+</div>
+</div>
+</div>
+<div class="section" id="removing-encryption">
+<h2>Removing Encryption<a class="headerlink" href="#removing-encryption" title="Permalink to this headline">¶</a></h2>
+<p>If your ownCloud administrator elects to disable the Encryption app, you will
+be prompted to go to your Personal page and enter your password on the
+Encryption form to decrypt your files.</p>
+<div class="figure">
+<img alt="../_images/encryption4.png" src="../_images/encryption4.png" />
+</div>
+<p>If your files decrypt successfully, you can click the <tt class="docutils literal"><span class="pre">Delete</span> <span class="pre">encryption</span>
+<span class="pre">keys</span></tt> button. There is no reason to save them after disabling decryption,
+because if encryption is enabled again you’ll generate a new set of keys. Your
+keys are preserved in case something goes wrong with the decryption and you
+need your keys to access your files. Which is not likely to happen.</p>
+</div>
+<div class="section" id="files-not-encrypted">
+<h2>Files Not Encrypted<a class="headerlink" href="#files-not-encrypted" title="Permalink to this headline">¶</a></h2>
+<p>Only the data in your files is encrypted, and not the filenames or folder
+structures. These files are never encrypted:</p>
+<ul class="simple">
+<li>Old files in the trash bin.</li>
+<li>Image thumbnails from the Gallery app.</li>
+<li>Previews from the Files app.</li>
+<li>The search index from the full text search app.</li>
+<li>Third-party app data</li>
+</ul>
+<p>There may be other files that are not encrypted; only files that are exposed to
+third-party storage providers are guaranteed to be encrypted.</p>
+<div class="section" id="change-private-key-password">
+<h3>Change Private Key Password<a class="headerlink" href="#change-private-key-password" title="Permalink to this headline">¶</a></h3>
+<p>This option is only available if your log-in password, but not your encryption
+password, was changed by your administrator. This can occur if your ownCloud
+provider uses a external user back-end (for example, LDAP) and changed your
+login password using that back-end configuration. In this case, you can set
+your encryption password to your new login password by providing your old and
+new login password. The Encryption app works only if your login password and
+your encryption password are identical.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/files.html
index c0f4949,0000000..7bea848
mode 100644,000000..100644
--- a/core/doc/user/files/files.html
+++ b/core/doc/user/files/files.html
@@@ -1,469 -1,0 +1,468 @@@
+
+<!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>Accessing Files Using WebDAV — 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="Version Control" href="versioncontrol.html" />
+ <link rel="prev" title="Accessing your Files Using the Web Interface" href="filesweb.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 current"><a class="current reference internal" href="">Accessing Files Using WebDAV</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#accessing-files-using-linux">Accessing Files Using Linux</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#accessing-files-using-mac-osx">Accessing Files Using MAC OSX</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#accessing-files-using-microsoft-windows">Accessing Files Using Microsoft Windows</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#using-the-desktop-sync-client-to-access-files">Using the Desktop Sync Client to Access Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#using-mobile-apps-to-access-files">Using Mobile Apps to Access Files</a></li>
+</ul>
+</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"><a class="reference internal" href="quota.html">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="accessing-files-using-webdav">
+<h1>Accessing Files Using WebDAV<a class="headerlink" href="#accessing-files-using-webdav" title="Permalink to this headline">¶</a></h1>
+<p>Web Distributed Authoring and Versioning (WebDAV) is a Hypertext Transfer
+Protocol (HTTP) extension that facilitates collaboration between users in
+editing and managing documents and files stored on web servers. Using WebDAV,
+you can access your ownCloud instance on every platform using the web
+interface. You can also optionally integrate your ownCloud access with your
+desktop.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">In the following examples, You must adjust <strong>example.org/</strong> to the
+URL of your ownCloud server installation.</p>
+</div>
+<div class="section" id="accessing-files-using-linux">
+<h2>Accessing Files Using Linux<a class="headerlink" href="#accessing-files-using-linux" title="Permalink to this headline">¶</a></h2>
+<p>You can access files in Linux operating systems using the following methods:</p>
+<div class="section" id="accessing-files-with-gnome-3-and-nautilus-file-manager">
+<h3>Accessing Files with Gnome 3 and Nautilus File Manager<a class="headerlink" href="#accessing-files-with-gnome-3-and-nautilus-file-manager" title="Permalink to this headline">¶</a></h3>
+<p>The URL that you have to use to connect to the ownCloud installation using
+Nautilus File Manager is:</p>
+<div class="highlight-python"><pre>davs://example.org/owncloud/remote.php/webdav</pre>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If your server connection is not HTTPS-secured, use <cite>dav://</cite> instead of <cite>davs://</cite>.</p>
+</div>
+<img alt="../_images/gnome3_nautilus_webdav.png" src="../_images/gnome3_nautilus_webdav.png" />
+</div>
+<div class="section" id="accessing-files-with-kde-and-dolphin-file-manager">
+<h3>Accessing Files with KDE and Dolphin File Manager<a class="headerlink" href="#accessing-files-with-kde-and-dolphin-file-manager" title="Permalink to this headline">¶</a></h3>
+<p>To access Files using KDE:</p>
+<p>Click in the address area and enter:</p>
+<div class="highlight-python"><pre>webdav://example.org/owncloud/remote.php/webdav</pre>
+</div>
+<img alt="../_images/dolphin_webdav.png" src="../_images/dolphin_webdav.png" />
+<p>To access files using Dolphin File Manager:</p>
+<ol class="arabic simple">
+<li>Open Dolphin and click “Network” in the left hand “Places” column.</li>
+<li>Click on the icon labeled <strong>Add a Network Folder</strong>.
+The resulting dialog should appear with WebDAV already selected.</li>
+<li>If WebDav is not selected, select it.</li>
+<li>Click <strong>Next</strong>.</li>
+<li>Enter the following settings:
+* Name: The name you want to see in the <strong>Places</strong> bookmark, for example ownCloud.
+* User: The ownCloud username you used to log in, for example admin.
+* Server: The ownCloud domain name, for example <strong>example.org</strong> (without <strong>http://</strong> before or directories afterwards).
+* Folder – Enter the path <tt class="docutils literal"><span class="pre">owncloud/remote.php/webdav</span></tt>.</li>
+<li>(Optional) Check the “Create icon checkbox” for a bookmark to appear in the Places column.</li>
+<li>(Optional) Provide any special settings or an SSL certificate in the “Port & Encrypted” checkbox.</li>
+</ol>
+</div>
+<div class="section" id="mounting-the-file-system-and-accessing-with-a-command-line">
+<h3>Mounting the File System and Accessing with a Command Line<a class="headerlink" href="#mounting-the-file-system-and-accessing-with-a-command-line" title="Permalink to this headline">¶</a></h3>
+<p>To mount the file system and access files using a command line:</p>
+<ol class="arabic">
+<li><p class="first">Install the WebDAV support using the davfs package. For example, on Debian/Ubuntu, you can use:</p>
+<div class="highlight-python"><pre>sudo apt-get install davfs2</pre>
+</div>
+</li>
+<li><p class="first">Reconfigure davfs2 to allow access to normal users (select Yes when prompted):</p>
+<div class="highlight-python"><pre>sudo dpkg-reconfigure davfs2</pre>
+</div>
+</li>
+<li><p class="first">Specify any users that you want to have mount and share privileges in the davfs2 group:</p>
+<div class="highlight-python"><pre>sudo usermod -aG davfs2 <user></pre>
+</div>
+</li>
+<li><p class="first">Edit the <tt class="file docutils literal"><span class="pre">/etc/fstab</span></tt> file and add the following line for each user for whom you want to give mount privileges for the folder:</p>
+<div class="highlight-python"><pre>example.org/owncloud/remote.php/webdav /home/<username>/owncloud davfs user,rw,noauto 0 0</pre>
+</div>
+</li>
+</ol>
+<blockquote>
+<div><p>For each user for whom you wants to give mount privileges:</p>
+<ol class="arabic">
+<li><p class="first">Create the folders <tt class="docutils literal"><span class="pre">owncloud/</span></tt> and <tt class="docutils literal"><span class="pre">.davfs2/</span></tt> in your home directory.</p>
+</li>
+<li><p class="first">Create the file <tt class="docutils literal"><span class="pre">secrets</span></tt> inside the <tt class="docutils literal"><span class="pre">.davfs2/</span></tt> folder and populate it with the following:</p>
+<div class="highlight-python"><pre>example.org/owncloud/remote.php/webdav <username> <password></pre>
+</div>
+</li>
+</ol>
+</div></blockquote>
+<ol class="arabic" start="4">
+<li><p class="first">Ensure that the file is writable by only you by using the file manager or by issuing the following command:</p>
+<div class="highlight-python"><pre>``chmod 600 ~/.davfs2/secrets``</pre>
+</div>
+</li>
+<li><p class="first">Run the following command:</p>
+<div class="highlight-python"><pre>``mount ~/owncloud``</pre>
+</div>
+</li>
+<li><p class="first">To automatically mount the folder on login, add the <tt class="docutils literal"><span class="pre">mount</span> <span class="pre">~/owncloud</span></tt> command to the <tt class="file docutils literal"><span class="pre">./.bashrc</span></tt> file.</p>
+</li>
+</ol>
+<div class="section" id="known-issues">
+<h4>Known Issues<a class="headerlink" href="#known-issues" title="Permalink to this headline">¶</a></h4>
+<p><strong>Problem:</strong> Resource temporarily unavailable</p>
+<p><strong>Solution:</strong> If you experience trouble when you create a file in the directory, edit <tt class="file docutils literal"><span class="pre">/etc/davfs2/davfs2.conf</span></tt> and add:</p>
+<div class="highlight-python"><pre>use_locks 0</pre>
+</div>
+<p><strong>Problem:</strong> Certificate warnings</p>
+<p><strong>Solution:</strong> If you use a self-signed certificate, you will get a warning. To change this, you need to adress the “pem”-file of your certificate.
+At first copy <tt class="docutils literal"><span class="pre">mycertificate.pem</span></tt> to - for example - <tt class="docutils literal"><span class="pre">/etc/davfs2/certs/</span></tt>. After that edit <tt class="file docutils literal"><span class="pre">/etc/davfs2/davfs2.conf</span></tt> and uncomment the line <tt class="docutils literal"><span class="pre">servercert</span></tt> (or add it).
+Now add the path of your certificate. In this this example:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">servercert</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">davfs2</span><span class="o">/</span><span class="n">certs</span><span class="o">/</span><span class="n">mycertificate</span><span class="o">.</span><span class="n">pem</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+<div class="section" id="accessing-files-using-mac-osx">
+<h2>Accessing Files Using MAC OSX<a class="headerlink" href="#accessing-files-using-mac-osx" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The MAC OSX Finder suffers from a <a class="reference external" href="http://sabre.io/dav/clients/finder/">series of implementation problems</a> and should only be used if the ownCloud server runs on <strong>Apache</strong> and <strong>mod_php</strong>.</p>
+</div>
+<p>To access files through the MAC OSX Finder:</p>
+<ol class="arabic simple">
+<li>Choose <strong>Go > Connect to Server</strong>.</li>
+</ol>
+<blockquote>
+<div>The “Connect to Server” window opens.</div></blockquote>
+<ol class="arabic simple" start="2">
+<li>Specify the address of the server in the <strong>Server Address</strong> field.</li>
+</ol>
+<blockquote>
+<div><img alt="../_images/osx_webdav1.png" src="../_images/osx_webdav1.png" />
+<p>For example, the URL address used to connect to the ownCloud installation from the MAC OSX Finder is:</p>
+<div class="highlight-python"><pre>http://example.org/owncloud/remote.php/webdav</pre>
+</div>
+<img alt="../_images/osx_webdav2.png" src="../_images/osx_webdav2.png" />
+</div></blockquote>
+<ol class="arabic simple" start="3">
+<li>Click <strong>Connect</strong>.</li>
+</ol>
+<blockquote>
+<div>The device connects to the server.</div></blockquote>
+<p>For added details about how to connect to an external server using MAC OSX, check the respective <a class="reference external" href="http://docs.info.apple.com/article.html?path=Mac/10.6/en/8160.html">vendor documentation</a> .</p>
+</div>
+<div class="section" id="accessing-files-using-microsoft-windows">
+<h2>Accessing Files Using Microsoft Windows<a class="headerlink" href="#accessing-files-using-microsoft-windows" title="Permalink to this headline">¶</a></h2>
+<p>When using Microsoft Windows, a separate WebDAV client is recommended to access
+the files from your server.You can choose a suitable WebDav client from the
+<a class="reference external" href="http://www.webdav.org/projects/">WebDav Project page</a> .</p>
+<p>If you must use the native implementation, you can map ownCloud to a new drive.
+Mapping to a drive enables you to browse files stored on an ownCloudserver the
+way you would files stored in a mapped network drive.</p>
+<p>Using this feature requires network connectivity. If you want to store your
+files offline, use the ownCloud Client to sync all files on your ownCloud to
+one or more directories of your local hard drive.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Prior to mapping your drive, you must permit the use of Basic
+Authentication in the Windows Registry. The procedure is documented in
+<a class="reference external" href="http://support.microsoft.com/kb/841215">KB841215</a> and differs between Windows XP/Server 2003 and Windows Vista/7.
+Please follow the Knowledge Base article before proceeding, and follow the
+Vista instructions if you run Windows 7.</p>
+</div>
+<div class="section" id="mapping-drives-with-the-command-line">
+<h3>Mapping Drives With the Command Line<a class="headerlink" href="#mapping-drives-with-the-command-line" title="Permalink to this headline">¶</a></h3>
+<p>The following example shows how to map a drive using the command line. To map the drive:</p>
+<ol class="arabic">
+<li><p class="first">Open a command prompt in Windows.</p>
+</li>
+<li><p class="first">Enter the following line in the command prompt to map to the computer Z drive:</p>
+<div class="highlight-python"><pre>net use Z: https://<drive_path>/remote.php/webdav /user:youruser yourpassword</pre>
+</div>
+</li>
+</ol>
+<blockquote>
+<div><p>where <drive_path> is <strong>example.org/owncloud</strong></p>
+<p>For example: <tt class="docutils literal"><span class="pre">net</span> <span class="pre">use</span> <span class="pre">Z:</span> <span class="pre">https://example.org/owncloud/remote.php/webdav</span> <span class="pre">/user:youruser</span> <span class="pre">yourpassword</span></tt></p>
+<p>The computer maps the files of your ownCloud account to the drive letter Z.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Though not recommended, you can also mount the ownCloud server
+using HTTP, leaving the connection unencrypted. If you plan to use HTTP
+connections on devices while in public place, we strongly recommend using a VPN
+tunnel to provide the necessary security.</p>
+</div>
+</div></blockquote>
+<p>An alternative command syntax is:</p>
+<blockquote>
+<div><tt class="docutils literal"><span class="pre">net</span> <span class="pre">use</span> <span class="pre">Z:</span> <span class="pre">\\example.org@ssl\owncloud\remote.php\webdav</span> <span class="pre">/user:youruser</span> <span class="pre">yourpassword</span></tt></div></blockquote>
+<p>Appending <strong>/persistent</strong> makes the connection persistent across reboots. <strong>(??Example??)</strong></p>
+<p>You can also mount your ownCloud via HTTP, leaving the connection unencrypted.</p>
+</div>
+<div class="section" id="mapping-drives-with-windows-explorer">
+<h3>Mapping Drives With Windows Explorer<a class="headerlink" href="#mapping-drives-with-windows-explorer" title="Permalink to this headline">¶</a></h3>
+<p>To map a drive using the Microsoft Windows Explorer:</p>
+<ol class="arabic simple">
+<li>Migrate to your computer in Windows Explorer.</li>
+<li>Right-click on <strong>Computer</strong> entry and select <strong>Map network drive...</strong> from the drop-down menu.</li>
+<li>Choose a local network drive to which you want to map ownCloud.</li>
+<li>Specify the address to your ownCloud instance, followed by <strong>/remote.php/webdav</strong>.</li>
+</ol>
+<blockquote>
+<div><p>For example:</p>
+<div class="highlight-python"><pre>https://example.org/owncloud/remote.php/webdav</pre>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">For SSL protected servers, check <strong>Reconnect at logon</strong> to ensure
+that the mapping is persistent upon subsequent reboots. If you want to connect
+to the ownCloud server as a different user, check <strong>Connect using different
+credentials</strong>.</p>
+</div>
+<div class="figure">
+<a class="reference internal image-reference" href="../_images/explorer_webdav.png"><img alt="../_images/explorer_webdav.png" src="../_images/explorer_webdav.png" style="width: 502.4px; height: 366.4px;" /></a>
+<p class="caption"><strong>Mapping WebDAV on Windows Explorer</strong></p>
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="5">
+<li>Click the <tt class="docutils literal"><span class="pre">Finish</span></tt> button.</li>
+</ol>
+<blockquote>
+<div>Windows Explorer maps the network drive, making your ownCloud instance available.</div></blockquote>
+</div>
+<div class="section" id="accessing-files-using-cyberduck">
+<h3>Accessing Files Using Cyberduck<a class="headerlink" href="#accessing-files-using-cyberduck" title="Permalink to this headline">¶</a></h3>
+<p>Cyberduck is an open source FTP and SFTP, WebDAV, OpenStack Swift, and Amazon S3 browser designed for file transfers.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This example uses Cyberduck version 4.2.1.</p>
+</div>
+<p>To use Cyberduck:</p>
+<ol class="arabic simple">
+<li>Specify a server without any leading protocol information. For example:</li>
+</ol>
+<blockquote>
+<div><tt class="docutils literal"><span class="pre">example.org</span></tt></div></blockquote>
+<p>2. Specify the appropriate port. The port you choose depends on whether or not
+your ownCloud server supports SSL. Cyberduck requires that you select a
+different connection type if you plan to use SSL. For example:</p>
+<blockquote>
+<div>80 (for WebDAV)
+443 (for WebDAV (HTTPS/SSL))</div></blockquote>
+<ol class="arabic simple" start="3">
+<li>Use the ‘More Options’ drop-down menu to add the rest of your WebDAV URL into the ‘Path’ field. For example:</li>
+</ol>
+<blockquote>
+<div><p><tt class="docutils literal"><span class="pre">remote.php/webdav</span></tt></p>
+<p>Cyberduck enables file access to the ownCloud server.</p>
+</div></blockquote>
+</div>
+<div class="section" id="known-problems">
+<h3>Known Problems<a class="headerlink" href="#known-problems" title="Permalink to this headline">¶</a></h3>
+<dl class="docutils">
+<dt><strong>Problem</strong></dt>
+<dd>Windows does not connect using HTTPS.</dd>
+<dt><strong>Solution</strong></dt>
+<dd>The Windows WebDAV Client might not support Server Name Indication (SNI) on
+encrypted connections. If you encounter an error mounting an SSL-encrypted
+ownCloud instance, contact your provider about assigning a dedicated IP address
+for your SSL-based server.</dd>
+<dt><strong>Problem</strong></dt>
+<dd>You receive the following error message:
+<strong>Error 0x800700DF: The file size exceeds the limit allowed and cannot be saved.</strong></dd>
+<dt><strong>Solution</strong></dt>
+<dd><p class="first">Windows limits the maximum size a file transferred from or to a WebDAV share
+may have. You can increase the value <strong>FileSizeLimitInBytes</strong> in
+<strong>HKEY_LOCAL_MACHINESYSTEMCurrentControlSetServicesWebClientParameters</strong>
+by clicking on <strong>Modify</strong>.</p>
+<p class="last">To increase the limit to the maximum value of 4GB, select <strong>Decimal</strong>, enter
+a value of <strong>4294967295</strong>, and reboot Windows or restart the <strong>WebClient</strong>
+service.</p>
+</dd>
+</dl>
+<div class="admonition-todo admonition" id="index-0">
+<p class="first admonition-title">Todo</p>
+<p class="last">document registry keys on file size limit and not complaining in no network cases</p>
+</div>
+</div>
+</div>
+<div class="section" id="using-the-desktop-sync-client-to-access-files">
+<h2>Using the Desktop Sync Client to Access Files<a class="headerlink" href="#using-the-desktop-sync-client-to-access-files" title="Permalink to this headline">¶</a></h2>
+<p>Some applications enable you to only save to a local folder. To circumvent this issue, you can install the <a class="reference external" href="http://owncloud.org/documentation/sync-clients/">ownCloud sync clients</a>.</p>
+</div>
+<div class="section" id="using-mobile-apps-to-access-files">
+<h2>Using Mobile Apps to Access Files<a class="headerlink" href="#using-mobile-apps-to-access-files" title="Permalink to this headline">¶</a></h2>
+<div class="admonition-todo admonition" id="index-1">
+<p class="first admonition-title">Todo</p>
+<p class="last">Needs updating</p>
+</div>
+<p>To connect to your ownCloud server with any <strong>ownCloud</strong> mobile apps, use the base URL and folder only:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">example</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">owncloud</span>
+</pre></div>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">There is no need to add remote.php/webdav as you do for other WebDAV clients.</p>
+</div>
+<p>Mobile apps currently exist for both <a class="reference external" href="http://github.com/owncloud/android">Android</a> and <a class="reference external" href="http://github.com/owncloud/webos">webOS</a>. Feel free to <a class="reference external" href="/contribute/">contribute, if you can</a>!</p>
+<p>In addition to the mobile apps provided by ownCloud, you can use other apps to connect to ownCloud from your mobile device using WebDAV. <a class="reference external" href="http://seanashton.net/webdav/">WebDAV Navigator</a> is a
+good (proprietary) app for <a class="reference external" href="https://play.google.com/store/apps/details?id=com.schimera.webdavnavlite">Android devices</a>, <a class="reference external" href="https://itunes.apple.com/app/webdav-navigator/id382551345">iPhones</a>, and <a class="reference external" href="http://appworld.blackberry.com/webstore/content/46816">BlackBerry devices</a>.</p>
+<p>The URL for these is:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">example</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">owncloud</span><span class="o">/</span><span class="n">remote</span><span class="o">.</span><span class="n">php</span><span class="o">/</span><span class="n">webdav</span>
+</pre></div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/filesweb.html
index 69603e1,0000000..90774bf
mode 100644,000000..100644
--- a/core/doc/user/files/filesweb.html
+++ b/core/doc/user/files/filesweb.html
@@@ -1,371 -1,0 +1,370 @@@
+
+<!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>Accessing your Files Using the Web Interface — 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="Accessing Files Using WebDAV" href="files.html" />
+ <link rel="prev" title="Files & Synchronization" 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 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 current"><a class="current reference internal" href="">Accessing your Files Using the Web Interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#navigating-inside-your-owncloud">Navigating Inside Your ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#overlay-icons-show-sharing-status">Overlay Icons Show Sharing Status</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-or-uploading-files-and-directories">Creating or Uploading Files and Directories</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#selecting-files-or-folders">Selecting Files or Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#filtering-the-file-application-view">Filtering the File Application View</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#previewing-files">Previewing Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#moving-files">Moving Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#sharing-files-locally">Sharing Files Locally</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-a-public-share">Creating a Public Share</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#change-in-share-expiration-date">Change in Share Expiration Date</a></li>
+</ul>
+</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"><a class="reference internal" href="quota.html">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="accessing-your-files-using-the-web-interface">
+<h1>Accessing your Files Using the Web Interface<a class="headerlink" href="#accessing-your-files-using-the-web-interface" title="Permalink to this headline">¶</a></h1>
+<p>You can access your ownCloud files with the ownCloud web interface and create,
+preview, edit, delete, share, and re-share files. Your ownCloud administrator
+has the option to disable these features, so if any of them are missing on your
+system ask your server administrator.</p>
+<div class="figure">
+<img alt="../_images/users-files.png" src="../_images/users-files.png" />
+<p class="caption"><strong>ownCloud web interface Files app</strong></p>
+</div>
+<p>ownCloud version 7 can display thumbnail previews for image files, MP3 covers,
+and text files, if this enabled by your server administrator. Hover your cursor
+over a file or folder to expose the controls for the following operations:</p>
+<dl class="docutils">
+<dt>Pencil icon</dt>
+<dd>Rename a file or folder. This does not alter the filename on the original
+document.</dd>
+<dt>Download</dt>
+<dd>Download the file to your computer.</dd>
+<dt>Versions</dt>
+<dd>Displays older versions, if there are any, and you can revert to an older
+file version.</dd>
+<dt>Edit</dt>
+<dd>The Edit button appears on files that are editable inside ownCloud, in the
+Documents app. Supported file formats are <tt class="docutils literal"><span class="pre">.odt</span></tt>, <tt class="docutils literal"><span class="pre">.doc</span></tt>, and <tt class="docutils literal"><span class="pre">.docx</span></tt>.</dd>
+<dt>Share</dt>
+<dd>Share the file or folder with a group or other users, and create public
+shares with hyperlinks.</dd>
+<dt>Trash</dt>
+<dd>Delete the selected file or folder, or unshare a shared file or folder.</dd>
+</dl>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The Shared folder has been removed from new installations of ownCloud
+7. Shares now appear in the top level of your file tree on your Files page.
+If you are upgrading from older ownCloud versions you will still have your
+old Shared folder. Your server administrator has the option to change this in
+the server’s <tt class="docutils literal"><span class="pre">config.php</span></tt> file with the <tt class="docutils literal"><span class="pre">'share_folder'</span> <span class="pre">=></span></tt> directive.</p>
+</div>
+<div class="section" id="navigating-inside-your-owncloud">
+<h2>Navigating Inside Your ownCloud<a class="headerlink" href="#navigating-inside-your-owncloud" title="Permalink to this headline">¶</a></h2>
+<p>Navigating through folders in ownCloud is as simple as clicking on a folder to
+open it and using the back button on your browser to move to a previous level.
+ownCloud also provides a navigation bar at the top of the Files field for quick
+navigation.</p>
+<div class="figure">
+<img alt="../_images/oc_filesweb_navigate.png" src="../_images/oc_filesweb_navigate.png" />
+<p class="caption"><strong>Navigation bar</strong></p>
+</div>
+<p>The navigation bar functions as a “breadcrumb” locator. It displays your
+current directory and enables you to migrate back to one of the upper
+directories or, using the home icon, to navigate back into your root folder.</p>
+</div>
+<div class="section" id="overlay-icons-show-sharing-status">
+<h2>Overlay Icons Show Sharing Status<a class="headerlink" href="#overlay-icons-show-sharing-status" title="Permalink to this headline">¶</a></h2>
+<p>Any folder that has been shared is marked with the <tt class="docutils literal"><span class="pre">Shared</span></tt> overlay icon.
+Public link shares are marked with a chain link. Un-shared folders are blank.</p>
+<div class="figure">
+<img alt="../_images/users-overlays.png" src="../_images/users-overlays.png" />
+</div>
+<p>If your ownCloud server is the Enterprise edition, you may also have access to
+Sharepoint and Windows Network Drive file shares. These also have special
+overlay icons, and a red plugin means you have to enter a login to
+get access to the share.</p>
+<div class="figure">
+<img alt="../_images/users-overlays-win-net-drive.png" src="../_images/users-overlays-win-net-drive.png" />
+</div>
+<div class="figure">
+<img alt="../_images/users-overlays-sharepoint.png" src="../_images/users-overlays-sharepoint.png" />
+</div>
+</div>
+<div class="section" id="creating-or-uploading-files-and-directories">
+<h2>Creating or Uploading Files and Directories<a class="headerlink" href="#creating-or-uploading-files-and-directories" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud enables you to create new files or folders directly in an ownCloud
+folder by clicking on the <em>New</em> button in the Files app.</p>
+<div class="figure">
+<img alt="../_images/oc_filesweb_new.png" src="../_images/oc_filesweb_new.png" />
+<p class="caption"><strong>New button options</strong></p>
+</div>
+<p>The <em>New</em> button provides the following three options from which to choose:</p>
+<dl class="docutils">
+<dt>Text file</dt>
+<dd>Creates a simple text file and adds the file to your current folder.</dd>
+<dt>Folder</dt>
+<dd>Creates a new folder in the current folder.</dd>
+<dt>From link</dt>
+<dd>Downloads a file from a URL that you type or copy into the form field, and
+places it into the current folder.</dd>
+<dt>Up arrow</dt>
+<dd>The upward-point arrow is for uploading files from your computer into
+ownCloud.</dd>
+</dl>
+<p>You can also upload files by dragging and dropping them from your file manager.</p>
+</div>
+<div class="section" id="selecting-files-or-folders">
+<h2>Selecting Files or Folders<a class="headerlink" href="#selecting-files-or-folders" title="Permalink to this headline">¶</a></h2>
+<p>You can select one or more files or folders by clicking on the small thumbnails
+or icons that represent them. When you select a file or folder, a small
+checkbox is populated with a check to indicate that it is selected. To select
+all files in the current directory, you can click on the checkbox located at
+the top of the Files app field, above the first file or folder on the list.</p>
+<p>If you select multiple files, you can delete all of the selected files or
+download them as a ZIP file by using the <tt class="docutils literal"><span class="pre">Delete</span></tt> or <tt class="docutils literal"><span class="pre">Download</span></tt> buttons at
+the top right side of the Files app field.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If the <tt class="docutils literal"><span class="pre">Download</span></tt> button is not visible, the administrator has
+disabled this feature. Contact your administrator for further guidance.</p>
+</div>
+</div>
+<div class="section" id="filtering-the-file-application-view">
+<h2>Filtering the File Application View<a class="headerlink" href="#filtering-the-file-application-view" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud enables you to view files in the File Application View using filter
+options located in the Apps Information Field. This feature enables you to
+quickly and easily view and manage files based on their share status.</p>
+<p>You can click on any of the filter options to view the files as follows:</p>
+<dl class="docutils">
+<dt>All files</dt>
+<dd>The default view; displays all files that you have access to.</dd>
+<dt>Shared with you</dt>
+<dd>Displays all files shared with you by another user or group.</dd>
+<dt>Shared with others</dt>
+<dd>Displays all files that you have shared with other users or groups.</dd>
+<dt>Shared by link</dt>
+<dd>Displays all files that are shared by you via public link.</dd>
+<dt>External Storage</dt>
+<dd>Files that you have access to on external storage devices and services such
+as Dropbox, Google, and Amazon S3.</dd>
+</dl>
+</div>
+<div class="section" id="previewing-files">
+<h2>Previewing Files<a class="headerlink" href="#previewing-files" title="Permalink to this headline">¶</a></h2>
+<p>You can display uncompressed text files, OpenDocument files, and image
+files from the ownCloud server by clicking on the file name. There may be
+other file types you can preview if your ownCloud administrator has enabled
+them. If ownCloud cannot display a file, it starts a download process and
+downloads the file to your computer.</p>
+</div>
+<div class="section" id="moving-files">
+<h2>Moving Files<a class="headerlink" href="#moving-files" title="Permalink to this headline">¶</a></h2>
+<p>Using the ownCloud web interface, you can move files and folders by dragging
+and dropping them into any directory.</p>
+</div>
+<div class="section" id="sharing-files-locally">
+<h2>Sharing Files Locally<a class="headerlink" href="#sharing-files-locally" title="Permalink to this headline">¶</a></h2>
+<p>When enabled by your administrator, you can share files or folders on ownCloud
+with a local user, group, or any person online with a public link. Shared files
+and folders are labeled with the triangular share icon, and the status <em>Shared</em>
+in the file or folder row.</p>
+<p>To create a local share with other users or groups on your ownCloud server:</p>
+<ol class="arabic simple">
+<li>Hover your cursor over an item on the Files page</li>
+<li>Click the <strong>Share</strong> icon</li>
+</ol>
+<p>The Share dialog box opens to show the following options:</p>
+<div class="figure">
+<img alt="../_images/users-share-local.png" src="../_images/users-share-local.png" />
+<p class="caption"><strong>Share dialog box</strong></p>
+</div>
+<p>Type the name of the user or group that you want to share with. If you want to
+share with more than one, you have to create each share separately. Check the
+permissions you want the user or group to have, and optionally send them an
+email notification.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Users must enter their email addresses on their Personal pages for
+email notifications to work</p>
+</div>
+<p>Your new share appears on user’s Files pages marked with a Share icon, and the
+name of the file owner.</p>
+<div class="figure">
+<img alt="../_images/users-share-local2.png" src="../_images/users-share-local2.png" />
+<p class="caption"><strong>Shared file</strong></p>
+</div>
+<p>When you want to revoke a share, simply click the Trashcan icon next to the
+name of the appropriate user or group in the Shared dialog.</p>
+</div>
+<div class="section" id="creating-a-public-share">
+<h2>Creating a Public Share<a class="headerlink" href="#creating-a-public-share" title="Permalink to this headline">¶</a></h2>
+<p>You can share files outside of your organization with people who are not users
+on your ownCloud server by creating a public share link. Open the Share dialog
+and check Share Link.</p>
+<div class="figure">
+<img alt="../_images/users-share-public.png" src="../_images/users-share-public.png" />
+<p class="caption"><strong>Public share box</strong></p>
+</div>
+<p>This creates a public URL that anyone can use to access the share. You have the
+options to send an email notification, protect it with a password, and put an
+expiration date on it. Your ownCloud administrator has the option to require
+passwords and expiration dates.</p>
+</div>
+<div class="section" id="change-in-share-expiration-date">
+<h2>Change in Share Expiration Date<a class="headerlink" href="#change-in-share-expiration-date" title="Permalink to this headline">¶</a></h2>
+<p>In older versions of ownCloud, you could set an expiration date on both local
+and public shares. Now you can set an expiration date only on public shares,
+and local shares do not expire when public shares expire. The only way to
+“expire” a local share is to click the trash can icon to un-share your files.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/index.html
index c31a397,0000000..7cb59a1
mode 100644,000000..100644
--- a/core/doc/user/files/index.html
+++ b/core/doc/user/files/index.html
@@@ -1,175 -1,0 +1,174 @@@
+
+<!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>Files & Synchronization — 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="next" title="Accessing your Files Using the Web Interface" href="filesweb.html" />
+ <link rel="prev" title="The ownCloud Web Interface" href="../webinterface.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="current reference internal" href="">Files & Synchronization</a><ul>
+<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"><a class="reference internal" href="quota.html">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="files-synchronization">
+<h1>Files & Synchronization<a class="headerlink" href="#files-synchronization" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="filesweb.html">Accessing your Files Using the Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="files.html">Accessing Files Using WebDAV</a></li>
+<li class="toctree-l1"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l1"><a class="reference internal" href="server_to_server_using.html">Using Server-to-Server Sharing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="deletedfiles.html">Managing Deleted Files</a></li>
+<li class="toctree-l1"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="encryption.html">Encrypting Your ownCloud Files</a></li>
+<li class="toctree-l1"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuring_big_file_upload.html">Managing Big Files</a></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/quota.html
index 19e4e24,0000000..8a67a72
mode 100644,000000..100644
--- a/core/doc/user/files/quota.html
+++ b/core/doc/user/files/quota.html
@@@ -1,189 -1,0 +1,188 @@@
+
+<!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.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/server_to_server_using.html
index e22a39f,0000000..3a39e17
mode 100644,000000..100644
--- a/core/doc/user/files/server_to_server_using.html
+++ b/core/doc/user/files/server_to_server_using.html
@@@ -1,232 -1,0 +1,231 @@@
+
+<!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>Using Server-to-Server Sharing — 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 Deleted Files" href="deletedfiles.html" />
+ <link rel="prev" title="Version Control" href="versioncontrol.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 current"><a class="current reference internal" href="">Using Server-to-Server Sharing</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#creating-a-new-share">Creating a New Share</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#connecting-to-a-remote-share">Connecting to a Remote Share</a></li>
+</ul>
+</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"><a class="reference internal" href="quota.html">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="using-server-to-server-sharing">
+<h1>Using Server-to-Server Sharing<a class="headerlink" href="#using-server-to-server-sharing" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud 7 introduces a powerful new feature, server-to-server sharing. With
+just a few clicks you can easily access shares from other ownCloud 7 servers,
+link them to your account, and create your own shares. This feature enables you
+to:</p>
+<ul class="simple">
+<li>Selectively share files or directories.</li>
+<li>Combine two private clouds into a single public cloud.</li>
+<li>Eliminate the need to create user accounts on multiple ownCloud servers.</li>
+<li>View files in a Web browser or ownCloud client.</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Server-to-server sharing requires that both servers are running
+versions of ownCloud that support this feature; currently this is ownCloud 7.</p>
+</div>
+<div class="section" id="creating-a-new-share">
+<h2>Creating a New Share<a class="headerlink" href="#creating-a-new-share" title="Permalink to this headline">¶</a></h2>
+<p>Server-to-server sharing is enabled on new or upgraded ownCloud 7 installations
+by default. (See “Configuring Server-to-Server Sharing” in the Administrators
+Manual.) Follow these steps to create a new share:</p>
+<p>1. Go to your <tt class="docutils literal"><span class="pre">Files</span></tt> page and hover your cursor over the file or directory
+you want to share to expose your administration options. Check the <tt class="docutils literal"><span class="pre">Share</span>
+<span class="pre">Link</span></tt> checkbox to create the share, and to expose all of your sharing options.</p>
+<p>2. Set any options that you want to apply to your new share: send an email
+notification, add password protection, allow users to upload files to the share,
+or set an expiration date. If you check <strong>Allow Public Upload</strong> then other
+users can overwrite, rename and delete files in the share.</p>
+<blockquote>
+<div><div class="figure">
+<img alt="../_images/s2s-create_public_share.png" src="../_images/s2s-create_public_share.png" />
+</div>
+</div></blockquote>
+<p>And that’s all there is to it. Your new public share is labeled with a chain
+link. If you do not protect it with a password, it is visible to anyone who has
+the URL. (ownCloud server admins have the option of requiring users to set
+passwords on shares in <tt class="docutils literal"><span class="pre">Admin</span> <span class="pre">></span> <span class="pre">Sharing.</span></tt>)</p>
+</div>
+<div class="section" id="connecting-to-a-remote-share">
+<h2>Connecting to a Remote Share<a class="headerlink" href="#connecting-to-a-remote-share" title="Permalink to this headline">¶</a></h2>
+<ol class="arabic">
+<li><p class="first">Open the share link in your Web browser.</p>
+<div class="figure">
+<img alt="../_images/s2s-connect-to-remote-share.png" src="../_images/s2s-connect-to-remote-share.png" />
+</div>
+</li>
+</ol>
+<p>2. Click the <tt class="docutils literal"><span class="pre">Add</span> <span class="pre">to</span> <span class="pre">your</span> <span class="pre">ownCloud</span></tt> button, and enter the URL of your ownCloud
+server. If you are not already logged in you will get a login window.</p>
+<p>3. After logging in you will see a dialogue asking you <tt class="docutils literal"><span class="pre">"Do</span> <span class="pre">you</span> <span class="pre">want</span> <span class="pre">to</span> <span class="pre">add</span> <span class="pre">the</span>
+<span class="pre">remote</span> <span class="pre">share</span> <span class="pre">[share</span> <span class="pre">name]</span> <span class="pre">from</span> <span class="pre">[remote</span> <span class="pre">server</span> <span class="pre">name]?"</span></tt></p>
+<blockquote>
+<div><div class="figure">
+<img alt="../_images/s2s-add-remote-share.png" src="../_images/s2s-add-remote-share.png" />
+</div>
+</div></blockquote>
+<p>4. Click the <tt class="docutils literal"><span class="pre">Add</span> <span class="pre">Remote</span> <span class="pre">Share</span></tt> button, and enjoy your new share. It is marked
+with a share icon, and the name of the share’s owner and originating server.</p>
+<blockquote>
+<div><div class="figure">
+<img alt="../_images/s2s-remote-share-labeled.png" src="../_images/s2s-remote-share-labeled.png" />
+</div>
+</div></blockquote>
+<p>Remove your linked share anytime by clicking the trash can icon. This only
+unlinks the share, and does not delete any files.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/sync.html
index bf8b4af,0000000..0b09234
mode 100644,000000..100644
--- a/core/doc/user/files/sync.html
+++ b/core/doc/user/files/sync.html
@@@ -1,175 -1,0 +1,174 @@@
+
+<!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>Desktop Synchronization — 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="Encrypting Your ownCloud Files" href="encryption.html" />
+ <link rel="prev" title="Managing Deleted Files" href="deletedfiles.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 current"><a class="current reference internal" href="">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"><a class="reference internal" href="quota.html">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="desktop-synchronization">
+<h1>Desktop Synchronization<a class="headerlink" href="#desktop-synchronization" title="Permalink to this headline">¶</a></h1>
+<p>For synchronizing files with your desktop computer, we recommend using the
+<a class="reference external" href="http://owncloud.org/sync-client/">ownCloud Client</a> for Windows, Mac OS X and Linux.</p>
+<p>The ownCloud Desktop Client enables you to connect to your private ownCloud Server.
+You can create folders in your home directory, and keep the contents of those
+folders synced with your ownCloud server. Simply copy a file into the directory
+and the ownCloud desktop client does the rest. Make a change to the files on one
+computer, it will flow across the others using these desktop sync clients. Always
+have your latest files with you wherever you are.</p>
+<p>Its usage is documented separately in the <a class="reference external" href="http://doc.owncloud.org/desktop">ownCloud Desktop Client Manual</a>.</p>
+<p>Furthermore, it is possible to synchronize your ownCloud calendar and your address book
+with a variety of different operating systems and devices. It is also possible to
+mount your ownCloud storage via WebDAV, which is also documented in the next chapters.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/versioncontrol.html
index e15b634,0000000..1b0816c
mode 100644,000000..100644
--- a/core/doc/user/files/versioncontrol.html
+++ b/core/doc/user/files/versioncontrol.html
@@@ -1,193 -1,0 +1,192 @@@
+
+<!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>Version Control — 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="Using Server-to-Server Sharing" href="server_to_server_using.html" />
+ <link rel="prev" title="Accessing Files Using WebDAV" href="files.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 current"><a class="current reference internal" href="">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"><a class="reference internal" href="quota.html">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="version-control">
+<h1>Version Control<a class="headerlink" href="#version-control" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud supports simple version control for files. Versioning creates backups
+of files which are accessible via the Versions link. This link contains the
+history of the file where you can roll back a file to any previous version. Changes
+made at intervals greater than two minutes are saved in data/[user]/versions,
+and made accessible using the above pages.</p>
+<p>To restore a specific version of a file, hover your cursor on a file and click
+<em>Versions</em> link. If any version is available, you should see a list like the image
+below:</p>
+<div class="figure">
+<img alt="../_images/files_versioning.png" src="../_images/files_versioning.png" />
+</div>
+<p>Clicking on <em>Restore</em> next to any version will revert the file to that
+version back.</p>
+<p>The versioning app expires old versions automatically to make sure that
+the user doesn’t run out of space. Following pattern is used to delete
+old versions:</p>
+<ul class="simple">
+<li>For the first second we keep one version</li>
+<li>For the first 10 seconds ownCloud keeps one version every 2 seconds</li>
+<li>For the first minute ownCloud keeps one version every 10 seconds</li>
+<li>For the first hour ownCloud keeps one version every minute</li>
+<li>For the first 24 hours ownCloud keeps one version every hour</li>
+<li>For the first 30 days ownCloud keeps one version every day</li>
+<li>After the first 30 days ownCloud keeps one version every week</li>
+</ul>
+<p>The versions are adjusted along this pattern every time a new version gets
+created.</p>
+<p>Beside that the version app takes care to never use more that 50% of the users
+currently available free space. If the stored versions exceed this limit, ownCloud
+deletes the oldest versions until it meets the disk space limit again.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/genindex.html
index 2206060,0000000..fabdfb3
mode 100644,000000..100644
--- a/core/doc/user/genindex.html
+++ b/core/doc/user/genindex.html
@@@ -1,154 -1,0 +1,153 @@@
+
+
+
+<!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>Index — 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">
+
+
+<h1 id="index">Index</h1>
+
+<div class="genindex-jumpbox">
+
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/index.html
index 5ead61e,ede62f0..c4786f4
--- a/core/doc/user/index.html
+++ b/core/doc/user/index.html
@@@ -1,257 -1,2 +1,237 @@@
-Here goes the user documentation
-In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
+
+<!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 7.0 User Documentation — 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="#" />
+ <link rel="next" title="What’s New for Users in ownCloud 7" href="whats_new.html" />
- <link rel="prev" title="ownCloud documentation contents" href="contents.html" />
++ <link rel="prev" title="ownCloud User Manual" href="contents.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 class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">ownCloud 7.0 User Documentation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#web-interface">Web Interface</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#file-access-and-management">File Access and Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#contacts-and-calendar">Contacts and Calendar</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#documents">Documents</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#bookmarks">Bookmarks</a></li>
- <li class="toctree-l2"><a class="reference internal" href="#backup">Backup</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#external-storage">External storage</a></li>
- <li class="toctree-l2"><a class="reference internal" href="#indices-and-tables">Indices and tables</a></li>
+</ul>
+</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">
+
+ <div class="section" id="owncloud-version-user-documentation">
+<span id="index"></span><h1>ownCloud 7.0 User Documentation<a class="headerlink" href="#owncloud-version-user-documentation" title="Permalink to this headline">¶</a></h1>
+<p><strong>Welcome to ownCloud: your self-hosted file sync and share solution.</strong></p>
+<p>ownCloud is open source file sync and share software for everyone from
+individuals operating the free ownCloud Community Edition, to large enterprises
+and service providers operating the ownCloud Enterprise Edition. ownCloud
+provides a safe, secure, and compliant file synchronization and sharing
+solution on servers that you control.</p>
+<p>With ownCloud you can share one or more files and folders on your computer, and
+synchronize them with your ownCloud server. Place files in your local shared
+directories, and those files are immediately synchronized to the server and to
+other devices using the ownCloud Desktop Client. Not near a device running a
+desktop client? No problem! Simply log in using the ownCloud web client and
+manage your files from there. The ownCloud Android and iOS mobile applications
+enable you to browse, download, and upload photos and videos. On Android, you
+can also create, download, edit, and upload any other files, as long as the
+correct software is installed.</p>
+<p>Whether you are using a mobile device, a workstation, or a web client, ownCloud
+provides the ability to put the right files in the right hands at the right
+time on any device with one simple-to-use, secure, private and controlled
+solution. After all, with ownCloud, it’s Your Cloud, Your Data, Your Way.</p>
+<div class="section" id="web-interface">
+<h2>Web Interface<a class="headerlink" href="#web-interface" title="Permalink to this headline">¶</a></h2>
+<p>The following topic contains a general overview how to access ownCloud from a
+web browser like Firefox, Chrome, or Internet Explorer:</p>
+<ul class="simple">
+<li><a class="reference internal" href="webinterface.html"><em>The ownCloud Web Interface</em></a></li>
+</ul>
+</div>
+<div class="section" id="file-access-and-management">
+<h2>File Access and Management<a class="headerlink" href="#file-access-and-management" title="Permalink to this headline">¶</a></h2>
- <p>The following topics contain information about file access and management.
- Access information includes how to access your server using the ownCloud web
- interface or through the use of WebDAV shares (Linux or Mac OSX) or web folders
- (Windows):</p>
++<p>The following topics contain information about file access and management.</p>
+<ul class="simple">
- <li><a class="reference internal" href="files/filesweb.html"><em>Accessing your Files Using the Web Interface</em></a></li>
- <li><a class="reference internal" href="files/files.html"><em>Accessing Files Using WebDAV</em></a></li>
- <li><a class="reference internal" href="files/sync.html"><em>Desktop Synchronization</em></a></li>
- <li><a class="reference internal" href="files/server_to_server_using.html"><em>Using Server-to-Server Sharing</em></a></li>
- <li><a class="reference internal" href="files/versioncontrol.html"><em>Version Control</em></a></li>
++<li><a class="reference internal" href="files/configuring_big_file_upload.html"><em>Managing Big Files</em></a></li>
+<li><a class="reference internal" href="files/deletedfiles.html"><em>Managing Deleted Files</em></a></li>
+<li><a class="reference internal" href="files/encryption.html"><em>Encrypting Your ownCloud Files</em></a></li>
++<li><a class="reference internal" href="files/files.html"><em>Accessing Files Using WebDAV</em></a></li>
++<li><a class="reference internal" href="files/filesweb.html"><em>Accessing your Files Using the Web Interface</em></a></li>
+<li><a class="reference internal" href="files/quota.html"><em>Storage Quota</em></a></li>
- <li><a class="reference internal" href="files/configuring_big_file_upload.html"><em>Managing Big Files</em></a></li>
++<li><a class="reference internal" href="files/server_to_server_using.html"><em>Using Server-to-Server Sharing</em></a></li>
++<li><a class="reference internal" href="files/sync.html"><em>Desktop Synchronization</em></a></li>
++<li><a class="reference internal" href="files/versioncontrol.html"><em>Version Control</em></a></li>
+</ul>
+</div>
+<div class="section" id="contacts-and-calendar">
+<h2>Contacts and Calendar<a class="headerlink" href="#contacts-and-calendar" title="Permalink to this headline">¶</a></h2>
- <p>The following topic provides information about the <strong>Contacts</strong> and
- <strong>Calendar</strong> applications including usage instructions as well as how to
++<p>The following topics provide information about the <strong>Contacts</strong> and
++<strong>Calendar</strong> applications, including usage instructions as well as how to
+export, import, and synchronization the ownCloud calendar application with
+different operating system calendars:</p>
+<ul class="simple">
+<li><a class="reference internal" href="pim/calendar.html"><em>Using the Calendar App</em></a></li>
+<li><a class="reference internal" href="pim/contacts.html"><em>Using the Contacts App</em></a></li>
+<li><a class="reference internal" href="pim/sync_ios.html"><em>iOS - Synchronize iPhone/iPad</em></a></li>
+<li><a class="reference internal" href="pim/sync_kde.html"><em>Synchronizing with KDE SC</em></a></li>
+<li><a class="reference internal" href="pim/sync_osx.html"><em>Synchronizing with OS X</em></a></li>
+</ul>
+</div>
+<div class="section" id="documents">
+<h2>Documents<a class="headerlink" href="#documents" title="Permalink to this headline">¶</a></h2>
+<p>The following topic describes how to use the <strong>Documents</strong> application to
+enable multiple users to collaboratively edit rich-text documents
+simultaneously.</p>
+<ul class="simple">
+<li><a class="reference internal" href="documents.html"><em>Collaborative Document Editing</em></a></li>
+</ul>
+</div>
+<div class="section" id="bookmarks">
+<h2>Bookmarks<a class="headerlink" href="#bookmarks" title="Permalink to this headline">¶</a></h2>
+<p>The following topic describes how to use the ownCloud <strong>Bookmarks</strong> application
+to manage your bookmarks:</p>
+<ul class="simple">
+<li><a class="reference internal" href="bookmarks.html"><em>Using the Bookmarks App</em></a></li>
+</ul>
+</div>
- <div class="section" id="backup">
- <h2>Backup<a class="headerlink" href="#backup" title="Permalink to this headline">¶</a></h2>
- <p>The following topic describes the ownCloud <strong>User_Migrate</strong> application used to
- import and export user account settings:</p>
- <ul class="simple">
- <li><a class="reference internal" href="migration.html"><em>User Account Migration</em></a></li>
- </ul>
- </div>
+<div class="section" id="external-storage">
+<h2>External storage<a class="headerlink" href="#external-storage" title="Permalink to this headline">¶</a></h2>
+<p>Please see <tt class="docutils literal"><span class="pre">Configuring</span> <span class="pre">External</span> <span class="pre">Storage</span> <span class="pre">(GUI)</span></tt> in the ownCloud
+Administrator’s manual:</p>
+<p><a class="reference external" href="http://doc.owncloud.org/server/7.0/admin_manual/configuration/custom_mount_config_gui.html">Configuring External Storage (GUI)</a></p>
+</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/user/installing_apps.html
index d955fcb,0000000..3d9a4c3
mode 100644,000000..100644
--- a/core/doc/user/installing_apps.html
+++ b/core/doc/user/installing_apps.html
@@@ -1,156 -1,0 +1,155 @@@
+
+<!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 core/doc/user/objects.inv
index 6ab91a1,0000000..ab59816
mode 100644,000000..100644
Binary files differ
diff --cc core/doc/user/pim/calendar.html
index 5f7cb40,0000000..e149935
mode 100644,000000..100644
--- a/core/doc/user/pim/calendar.html
+++ b/core/doc/user/pim/calendar.html
@@@ -1,475 -1,0 +1,474 @@@
+
+<!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>Using the Calendar App — 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="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="iOS - Synchronize iPhone/iPad" href="sync_ios.html" />
+ <link rel="prev" title="Using the Contacts App" href="contacts.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"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Using the Calendar App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#creating-a-new-calendar">Creating a New Calendar</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#managing-calendar-settings">Managing Calendar Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#synchronizing-calendars-using-caldav">Synchronizing Calendars Using CalDAV</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-events">Creating Events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#sharing-events">Sharing Events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#exporting-and-importing-events">Exporting and Importing Events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#deleting-an-event">Deleting an Event</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#calendar-app-faq">Calendar App FAQ</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="sync_ios.html">iOS - Synchronize iPhone/iPad</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Addressbook</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+</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="using-the-calendar-app">
+<h1>Using the Calendar App<a class="headerlink" href="#using-the-calendar-app" title="Permalink to this headline">¶</a></h1>
+<p>The ownCloud Calendar app enables you to create and edit events, synchronize to
+other calendars you might use, and create new, personalized calendars.</p>
+<p>By default, when you access the Calendar app for the first time, you get a
+“Personal” calendar that you can use or modify as you like.</p>
+<div class="figure">
+<img alt="../_images/calendar_default.png" src="../_images/calendar_default.png" />
+<p class="caption"><strong>Calendar app (default)</strong></p>
+</div>
+<p>The Calendar app contains the following fields and controls:</p>
+<ul class="simple">
+<li>Calendar Date Field – Provides the current date or enables you to select a
+date that you want to view.</li>
+<li>Calendar View Options – Enables you to choose between a day, week, or month
+view for the main Calendar app window. Also provides a quick jump button to
+access the current day (Today).</li>
+<li>Calendar Selection – Enables you to choose the calendar that you want to view.</li>
+<li>Calendar Controls – Provides controls for each individual calendar. These
+controls include sharing, obtaining an external URL link to the calendar, an
+export function, an edit function, and a delete (trash) button.</li>
+<li>Calendar Settings – Provides access to the calendar-specific settings. These
+settings include the calendar timezone selection, time format selection, week
+start day, cache setting, primary CalDAV address, and iOS/OS X CalDAV address
+settings.</li>
+</ul>
+<div class="section" id="creating-a-new-calendar">
+<h2>Creating a New Calendar<a class="headerlink" href="#creating-a-new-calendar" title="Permalink to this headline">¶</a></h2>
+<p>The ownCloud Calendar app enables you to create new calendars for work or other
+activities that you want to keep separated. You can manage each calendar
+separately.</p>
+<p>To create a new calendar:</p>
+<ol class="arabic simple">
+<li>Access the Calendar app.</li>
+<li>Click the <tt class="docutils literal"><span class="pre">+</span> <span class="pre">New</span> <span class="pre">Calendar</span></tt> field.</li>
+</ol>
+<blockquote>
+<div>A dialog opens to enable you to create a new calendar.</div></blockquote>
+<div class="figure">
+<img alt="../_images/calendar_create_new.png" src="../_images/calendar_create_new.png" />
+<p class="caption"><strong>New calendar</strong></p>
+</div>
+<ol class="arabic simple" start="3">
+<li>Specify a name for the new calendar.</li>
+<li>(Optional) Specify a color for the new calendar.</li>
+<li>Click the blue checkbox.</li>
+</ol>
+<blockquote>
+<div>The Calendar app creates a new calendar using the name and color specified.</div></blockquote>
+</div>
+<div class="section" id="managing-calendar-settings">
+<h2>Managing Calendar Settings<a class="headerlink" href="#managing-calendar-settings" title="Permalink to this headline">¶</a></h2>
+<p>The Calendar app settings provides global configuration that applies to all
+calendars that you have created in the Calendar app.</p>
+<blockquote>
+<div><div class="figure">
+<img alt="../_images/calendar_settings.png" src="../_images/calendar_settings.png" />
+<p class="caption"><strong>Calendar app settings</strong></p>
+</div>
+</div></blockquote>
+<p>In the Calendar app settings, you can modify the following:</p>
+<ul class="simple">
+<li>Timezone – Provides an alphabetical listing of all available countries
+categorized by continent.</li>
+<li>Time format – Provides the option of using 24 hour or 12 hour time format.</li>
+<li>Start day – Provides the option of starting the calendar week on Monday,
+Sunday, or Saturday.</li>
+<li>Primary CalDAV address – Provides the primary CalDAV link URL.</li>
+<li>iOS/OS X CalDAV address – Provides the iOS/OS X CalDAV link URL.</li>
+</ul>
+</div>
+<div class="section" id="synchronizing-calendars-using-caldav">
+<h2>Synchronizing Calendars Using CalDAV<a class="headerlink" href="#synchronizing-calendars-using-caldav" title="Permalink to this headline">¶</a></h2>
+<p><em>Calendaring Extensions to WebDAV</em>, referred to as <em>CalDAV</em>, enables clients to
+access scheduling information on remote servers. As an extension to WebDAV,
+CalDAV (defined by RFC 4791) uses the iCalendar format to manage calendar data.
+CalDAV enables multiple clients to access the same information for use in
+cooperative planning and information sharing.</p>
+<p>The Calendar app provides both the Primary CalDAV address and the iOS/OSX CalDAV
+address. Using these addresses, you can use CalDAV-compatible programs (for
+example, Kontact, Evolution, or Thunderbird) using the address provided.</p>
+<p>To better understand the URL creation, consider the following examples:</p>
+<p>Let’s assume you access your ownCloud web interface using the following address:</p>
+<div class="highlight-python"><pre>http://ADDRESS</pre>
+</div>
+<p>To access your ownCloud calendars using CalDAV-compatible programs like
+Kontact, Evolution, or Thunderbird, you would use the following URL:</p>
+<div class="highlight-python"><pre>http://ADDRESS/remote.php/caldav</pre>
+</div>
+<p>To access your ownCloud calendars using Apple iCal you would use the following
+URL, making sure to include the final slash:</p>
+<div class="highlight-python"><pre>http://ADDRESS/remote.php/caldav/principals/username/</pre>
+</div>
+<p>To access your ownCloud calendars using Mozilla Lightning you would use the
+following URL:</p>
+<div class="highlight-python"><pre>https://ADDRESS/remote.php/caldav/calendars/USERNAME/CALENDARNAME</pre>
+</div>
+<p>The following is an example showing the completed URL where the calendar name is
+<tt class="docutils literal"><span class="pre">defaultcalendar</span></tt> and the username is <tt class="docutils literal"><span class="pre">test</span></tt>:</p>
+<div class="highlight-python"><pre>https://localhost/owncloud/remote.php/caldav/calendars/test/defaultcalendar</pre>
+</div>
+</div>
+<div class="section" id="creating-events">
+<h2>Creating Events<a class="headerlink" href="#creating-events" title="Permalink to this headline">¶</a></h2>
+<p>The Calendar app enables you to create new events.</p>
+<p>To create a new event:</p>
+<ol class="arabic">
+<li><p class="first">Click a date in the month view or a time in either the week or day views.</p>
+<p>The <tt class="docutils literal"><span class="pre">Create</span> <span class="pre">a</span> <span class="pre">new</span> <span class="pre">event</span></tt> dialog box opens.</p>
+<div class="figure">
+<img alt="../_images/calendar_create_event.png" src="../_images/calendar_create_event.png" />
+<p class="caption"><strong>Create a new event dialog box</strong></p>
+</div>
+</li>
+<li><p class="first">Specify a title for the event.</p>
+</li>
+<li><p class="first">Specify a date and time duration for the event.</p>
+</li>
+<li><p class="first">(Optional) Provide advanced option details. These details can include the
+event location, the event category, and an event description.</p>
+<div class="figure">
+<img alt="../_images/calendar_create_event.png" src="../_images/calendar_create_event.png" />
+<p class="caption"><strong>Create a new event dialog box</strong></p>
+</div>
+</li>
+<li><p class="first">(Optional) Click the Repeating tab to define any repeat settings for the event.</p>
+<div class="figure">
+<img alt="../_images/calendar_create_event_repeat.png" src="../_images/calendar_create_event_repeat.png" />
+<p class="caption"><strong>Event Repeating tab</strong></p>
+</div>
+<p>The Repeating tab provides the option of not repeating the event(default) or
+repeating the event daily, weekly, every weekday, biweekly, monthly, or yearly.
+In addition, by selecting the <tt class="docutils literal"><span class="pre">Advanced</span></tt> button in the Repeating tab, each
+repeat option provides different levels of customization to better define your
+repeat requirements for the event.</p>
+<p>The following table helps to define the options for each repeat rule:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="17%" />
+<col width="83%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head"><p class="first last">Repeat Rule</p>
+</th>
+<th class="head"><p class="first last">Options</p>
+</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td><p class="first last">Does not repeat</p>
+</td>
+<td><p class="first last">n/a</p>
+</td>
+</tr>
+<tr class="row-odd"><td><p class="first last">Daily</p>
+</td>
+<td><p class="first last">Interval - Interval at which the event is repeated
+End - never, by occurrences, by date</p>
+</td>
+</tr>
+<tr class="row-even"><td><p class="first last">Weekly</p>
+</td>
+<td><p class="first last">Select weekdays - Weekday(s) on which the event is repeated
+Interval - Interval at which the event is repeated
+End - never, by occurrences, by date</p>
+</td>
+</tr>
+<tr class="row-odd"><td><p class="first last">Every Weekday</p>
+</td>
+<td><p class="first last">Interval - Interval at which the event is repeated
+End - never, by occurrences, by date</p>
+</td>
+</tr>
+<tr class="row-even"><td><p class="first last">Bi-Weekly</p>
+</td>
+<td><p class="first last">Interval - Interval at which the event is repeated
+End - never, by occurrences, by date</p>
+</td>
+</tr>
+<tr class="row-odd"><td><p class="first last">Monthly</p>
+</td>
+<td><p class="first last">Day choice – by monthday or by weekday
+Events week of month - Weekday selection only; week of month on which event occurs
+Select weekdays - Weekday(s) on which the event is repeated
+Interval - Interval at which the event is repeated
+End - never, by occurrences, by date</p>
+</td>
+</tr>
+<tr class="row-even"><td><p class="first last">Yearly</p>
+</td>
+<td><p class="first last">Date option - by event’s date, by year days, by week number, by day and month
+Interval - Interval at which the event is repeated
+End - never, by occurrences, by date</p>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ol>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you choose all days (Monday through Friday) in the weekview menu,
+the repeating option automatically sets the repeat rule to “every weekday.” If
+you can divide the interval of the weekview by two, the repeating option
+automatically sets the repeat rule to “Bi-Weekly”.</p>
+</div>
+</div>
+<div class="section" id="sharing-events">
+<h2>Sharing Events<a class="headerlink" href="#sharing-events" title="Permalink to this headline">¶</a></h2>
+<p>Once an event has been saved, a new tab appears for the event that enables you
+to share it.</p>
+<div class="figure">
+<img alt="../_images/calendar_create_event_share.png" src="../_images/calendar_create_event_share.png" />
+<p class="caption"><strong>Event Share tab</strong></p>
+</div>
+<p>The options available in the Share tab include the following:</p>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">Share</span> <span class="pre">with</span> <span class="pre">user</span> <span class="pre">or</span> <span class="pre">group</span></tt> field – Enables you to specify users or groups with whom you want to
+share the event.</li>
+<li>Share visibility pulldown menu – Enables you to specify the level of
+information that is shared. The possible levels include:<ul>
+<li>Show full event – Displays full event details to those with whom the
+event is shared.</li>
+<li>Show only busy – Displays only that you are busy during this event; no
+event details are provided.</li>
+<li>Hide event – Hides the event from the users or groups specified.</li>
+</ul>
+</li>
+</ul>
+<p>To share an event:</p>
+<ol class="arabic">
+<li><p class="first">Specify the users or groups with whom you want to share (or hide) the event.</p>
+</li>
+<li><p class="first">Define the level of visibility that you want the users or groups to have.</p>
+</li>
+<li><p class="first">(Optional) Click the <tt class="docutils literal"><span class="pre">Send</span> <span class="pre">Email</span></tt> button to share the event details using an email.</p>
+</li>
+<li><p class="first">Click the <tt class="docutils literal"><span class="pre">Save</span> <span class="pre">event</span></tt> button to save your changes.</p>
+<p>The Calendar app saves and closes the event window.</p>
+</li>
+</ol>
+</div>
+<div class="section" id="exporting-and-importing-events">
+<h2>Exporting and Importing Events<a class="headerlink" href="#exporting-and-importing-events" title="Permalink to this headline">¶</a></h2>
+<p>The Calendar app enables you to export and import event or entire calendars to
+or from other calendars.</p>
+<div class="section" id="exporting-events-and-calendar">
+<h3>Exporting Events and Calendar<a class="headerlink" href="#exporting-events-and-calendar" title="Permalink to this headline">¶</a></h3>
+<div class="figure">
+<img alt="../_images/event_export.png" src="../_images/event_export.png" />
+<p class="caption"><strong>Exporting an event</strong></p>
+</div>
+<p>You can export either a single event or an entire calendar. If you want to export
+a single event, click on the event, select “Advanced” and press the “Export Event” button in the bottom left
+corner. If you want to export an entire calendar, use the <img alt="download" src="../_images/download.png" /> icon next to the calendar name as
+shown in the figure below:</p>
+<div class="figure">
+<img alt="../_images/calendar_export.png" src="../_images/calendar_export.png" />
+<p class="caption"><strong>Exporting calendar</strong></p>
+</div>
+</div>
+<div class="section" id="importing-events">
+<h3>Importing Events<a class="headerlink" href="#importing-events" title="Permalink to this headline">¶</a></h3>
+<div class="figure">
+<img alt="../_images/calendar_import.png" src="../_images/calendar_import.png" />
+<p class="caption"><strong>Importing events</strong></p>
+</div>
+<p>You can import your calendar as an iCal file using the Files app. The Calendar app
+enables you to import the calendar into a new calendar or into an already existing calendar.</p>
+<p>To import your calendar, click the calendar file to open the import dialog.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If the progress bar does not work properly, the folder
+<tt class="docutils literal"><span class="pre">apps/calendar/import_tmp/</span></tt> might not have write permission.</p>
+</div>
+</div>
+</div>
+<div class="section" id="deleting-an-event">
+<h2>Deleting an Event<a class="headerlink" href="#deleting-an-event" title="Permalink to this headline">¶</a></h2>
+<p>The Calendar app enables you to delete any event that you create. To delete a
+calendar event:</p>
+<ol class="arabic">
+<li><p class="first">Click the event in the Calendar app.</p>
+<p>The Edit event dialog box opens.</p>
+<div class="figure">
+<img alt="../_images/calendar_edit_event.png" src="../_images/calendar_edit_event.png" />
+<p class="caption"><strong>Edit event dialog box</strong></p>
+</div>
+</li>
+<li><p class="first">Click the <tt class="docutils literal"><span class="pre">Delete</span> <span class="pre">event</span></tt> button.</p>
+<p>The Calendar app deletes the event.</p>
+</li>
+</ol>
+</div>
+<div class="section" id="calendar-app-faq">
+<h2>Calendar App FAQ<a class="headerlink" href="#calendar-app-faq" title="Permalink to this headline">¶</a></h2>
+<p><strong>Question:</strong> Why does the Calendar app request my current location?</p>
+<div class="figure">
+<img alt="../_images/calendar_newtimezone1.png" src="../_images/calendar_newtimezone1.png" />
+<p class="caption"><strong>Timezone set notification</strong></p>
+</div>
+<p><strong>Answer:</strong> The calendar needs your current position to detect your timezone.
+Without the correct timezone, a time offset exists between the events in the
+ownCloud calendar and the desktop calendar to which you are synchronizing. You
+can also set the timezone manually in the personal settings.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/contacts.html
index 02c6467,0000000..0b18440
mode 100644,000000..100644
--- a/core/doc/user/pim/contacts.html
+++ b/core/doc/user/pim/contacts.html
@@@ -1,476 -1,0 +1,475 @@@
+
+<!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>Using the Contacts App — 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="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="Using the Calendar App" href="calendar.html" />
+ <link rel="prev" title="Contacts & Calendar" 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 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"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2 current"><a class="current reference internal" href="">Using the Contacts App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#adding-contacts">Adding Contacts</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#managing-address-books">Managing Address Books</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#adding-an-address-book">Adding an Address Book</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#synchronizing-address-books">Synchronizing Address Books</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#troubleshooting">Troubleshooting</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_ios.html">iOS - Synchronize iPhone/iPad</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Addressbook</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+</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="using-the-contacts-app">
+<h1>Using the Contacts App<a class="headerlink" href="#using-the-contacts-app" title="Permalink to this headline">¶</a></h1>
+<p>The ownCloud Contacts app is similar to other mobile contact applications, but
+with more functionality. When you first access the Contacts app, a default
+address book becomes available.</p>
+<div class="figure">
+<img alt="../_images/contacts_empty.png" src="../_images/contacts_empty.png" />
+<p class="caption"><strong>Contacts app (empty)</strong></p>
+</div>
+<p>In the Apps Information field for the Contacts app, you can choose to create a
+new contact or a new group. This field also enables you to filter your contacts
+based on grouped or ungrouped contacts.</p>
+<div class="section" id="adding-contacts">
+<h2>Adding Contacts<a class="headerlink" href="#adding-contacts" title="Permalink to this headline">¶</a></h2>
+<p>You can add contacts using one of the following methods:</p>
+<ul class="simple">
+<li>Import contacts using a Variant Call Format (VCF) file</li>
+<li>Add contacts manually</li>
+</ul>
+<div class="section" id="importing-contacts">
+<h3>Importing Contacts<a class="headerlink" href="#importing-contacts" title="Permalink to this headline">¶</a></h3>
+<p>The fastest way to add contacts is through the use of a Variant Call Format
+(VCF) file.</p>
+<p>To import contacts using a VCF file:</p>
+<ol class="arabic simple">
+<li>At the bottom of the Contacts app information field, locate the gear button.</li>
+</ol>
+<blockquote>
+<div><div class="figure">
+<img alt="../_images/contact_bottombar.png" src="../_images/contact_bottombar.png" />
+<p class="caption"><strong>Contact settings gear button</strong></p>
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="2">
+<li>Click the gear button. The Contacts app upload field opens.</li>
+</ol>
+<blockquote>
+<div><div class="figure">
+<img alt="../_images/contact_uploadbutton.png" src="../_images/contact_uploadbutton.png" />
+<p class="caption"><strong>Contacts app upload field</strong></p>
+</div>
+</div></blockquote>
+<p>3. Choose an address book to which you want to import contacts by clicking the
+checkbox next to the address book.</p>
+<p>4. Select one of the options from the Import pulldown menu. These options
+include the following:</p>
+<blockquote>
+<div><ul class="simple">
+<li>Automatic format – Any VCF file. ownCloud determines the file format and
+imports accordingly.</li>
+<li>Gmail CSV – The comma-separated values file from your Gmail account.</li>
+<li>Outlook CSV – The comma-separated values file from your Outlook account.</li>
+<li>Thunderbird CSV – The comma-separated values file from your Thunderbird
+account.</li>
+<li>Yahoo CSV – The comma-separated values file from your Yahoo account.</li>
+<li>PHPLdapAdmin Idif Export – The export record from your LDAP configuration.</li>
+<li>Gmail VCard – The VCard files from your Gmail account.</li>
+<li>Standard VCard – The VCard files from your Standard account.</li>
+<li>Yahoo VCard – The VCard files from your Yahoo account.</li>
+</ul>
+</div></blockquote>
+<ol class="arabic simple" start="5">
+<li>Click the upload arrow to the right of the import option that you select.</li>
+</ol>
+<blockquote>
+<div>An Upload File window opens.</div></blockquote>
+<ol class="arabic simple" start="6">
+<li>Navigate to the appropriate file on your system and select it for upload.</li>
+</ol>
+<blockquote>
+<div><div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You can upload files individually or, by selecting multiple files
+using the CTRL button and selecting them, you can upload multiple files at
+one time.</p>
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="7">
+<li>Once you have selected the appropriate files, click the <cite>Open`</cite> button.</li>
+</ol>
+<blockquote>
+<div><div class="figure">
+<img alt="../_images/contact_vcfpick.jpg" src="../_images/contact_vcfpick.jpg" />
+<p class="caption"><strong>Selecting VCF files</strong></p>
+<div class="legend">
+The interface automatically places your contacts into ownCloud.</div>
+</div>
+</div></blockquote>
+</div>
+<div class="section" id="creating-contacts-manually">
+<h3>Creating Contacts Manually<a class="headerlink" href="#creating-contacts-manually" title="Permalink to this headline">¶</a></h3>
+<p>The Contacts app enables you to create contacts manually.</p>
+<p>To create a new contact:</p>
+<ol class="arabic">
+<li><p class="first">Click the <tt class="docutils literal"><span class="pre">+New</span> <span class="pre">contact</span></tt> option in the Contacts information field.</p>
+<p>An empty new contact configuration opens in the Application View field.</p>
+</li>
+</ol>
+<blockquote>
+<div><div class="figure">
+<img alt="../_images/contact_new.png" src="../_images/contact_new.png" />
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="2">
+<li>Specify the new contact information as follows:</li>
+</ol>
+<blockquote>
+<div><ul class="simple">
+<li>Name – The name of the contact. This field provides the option of
+specifying added information for the user by clicking the pen button to the
+right of the Name field.</li>
+<li>Organization – The organization for the contact.</li>
+<li>Email – The email address for the contact. This field defaults to the work
+email address for the contact. However, you can specify a different email
+designation by clicking the <tt class="docutils literal"><span class="pre">Work</span></tt> designation to the left of the email
+field.</li>
+<li>Phone – The phone number for the contact. This field defaults to the home
+phone number for the contact. However, you can specify a different phone
+designation by clicking the <tt class="docutils literal"><span class="pre">Home</span></tt> designation to the left of the phone
+field.</li>
+<li>Address – The address for the contact. This field defaults to the work
+address for the contact. However, you can specify a different address
+designation by clicking the <tt class="docutils literal"><span class="pre">Work</span></tt> designation to the left of the address
+field.</li>
+<li>Notes – Any notes you want to add about the contact.</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The Email, Phone, and Address fields provide the option of
+specifying a contact method as “preferred.”</p>
+</div>
+</div></blockquote>
+</div>
+<div class="section" id="editing-contact-information">
+<h3>Editing Contact Information<a class="headerlink" href="#editing-contact-information" title="Permalink to this headline">¶</a></h3>
+<p>The Contacts app enables you to edit or remove contact information.</p>
+<p>To edit contact information:</p>
+<ol class="arabic simple">
+<li>Navigate to the specific contact that you want to modify.</li>
+<li>Select the information in the field that you want to edit.</li>
+<li>Make your modifications.</li>
+</ol>
+<blockquote>
+<div>Changes that you make to any contact information are implemented immediately.</div></blockquote>
+</div>
+<div class="section" id="removing-contact-information">
+<h3>Removing Contact Information<a class="headerlink" href="#removing-contact-information" title="Permalink to this headline">¶</a></h3>
+<p>The Contacts app enables you to remove contact information.</p>
+<p>To remove contact information:</p>
+<ol class="arabic simple">
+<li>Navigate to the specific contact that you want to modify.</li>
+<li>Locate the contact information field that you want to remove.</li>
+<li>Click the trash bin to the right of the contact information.</li>
+</ol>
+<blockquote>
+<div>Changes that you make to any contact information are implemented immediately.</div></blockquote>
+</div>
+<div class="section" id="defining-a-contact-avatar">
+<h3>Defining a Contact Avatar<a class="headerlink" href="#defining-a-contact-avatar" title="Permalink to this headline">¶</a></h3>
+<p>By default, new contacts receive a letter avatar (picture) of “U” (for “User”).</p>
+<div class="figure">
+<img alt="../_images/contact_picture_default.png" src="../_images/contact_picture_default.png" />
+<p class="caption"><strong>Contact picture (default)</strong></p>
+</div>
+<p>When you specify the name of a contact, the avatar reflects the name by adopting
+the first letter of the name you provide. For example, if you were to specify
+the name of “Frederick,” the avatar would dynamically change to “F” for that
+contact. If you provide multiple contacts with the same name, or with names
+that start with the same first letter, the avatar uses the same letter but
+changes color to indicate the difference.</p>
+<div class="figure">
+<img alt="../_images/contact_picture.png" src="../_images/contact_picture.png" />
+<p class="caption"><strong>Contact picture (dynamic change)</strong></p>
+</div>
+</div>
+<div class="section" id="customizing-an-avatar">
+<h3>Customizing an Avatar<a class="headerlink" href="#customizing-an-avatar" title="Permalink to this headline">¶</a></h3>
+<p>In addition to dynamically altering the avatar for each contact, the Contacts
+app enables you to customize the avatar. You can specify an avatar in one of the
+two following ways:</p>
+<ul class="simple">
+<li>Upload new image – By selecting this option, ownCloud opens a File Upload
+window. You can choose a new image by navigating to the image, selecting it,
+and clicking <tt class="docutils literal"><span class="pre">Open</span></tt>.</li>
+<li>Select image from Files – By selecting this option, ownCloud opens the Files
+dialog on the ownCloud server. You can choose an image by navigating to the image
+in the ownCloud directory, selecting it, and clicking <tt class="docutils literal"><span class="pre">Choose.</span></tt></li>
+</ul>
+</div>
+<div class="section" id="cropping-an-avatar-image">
+<h3>Cropping an Avatar Image<a class="headerlink" href="#cropping-an-avatar-image" title="Permalink to this headline">¶</a></h3>
+<p>After you have selected an image for your contact, the Contacts app enables you
+to crop the picture.</p>
+<div class="figure">
+<img alt="../_images/contact_crop.jpg" src="../_images/contact_crop.jpg" />
+<p class="caption"><strong>Cropping contact image</strong></p>
+</div>
+<p>To crop the image:</p>
+<ol class="arabic simple">
+<li>Move the image crop box to the desired location and resize the box any way
+you like.</li>
+<li>Click <tt class="docutils literal"><span class="pre">Crop</span> <span class="pre">Picture</span></tt> in the crop image dialog box.</li>
+</ol>
+<blockquote>
+<div>The Contacts app crops the image and replaces whatever image was originally
+used for the contact.</div></blockquote>
+</div>
+</div>
+<div class="section" id="managing-address-books">
+<h2>Managing Address Books<a class="headerlink" href="#managing-address-books" title="Permalink to this headline">¶</a></h2>
+<p>Clicking on the settings (gear) button at the bottom of the Apps Information
+field provides access to the Contact app settings. This field shows all
+available address books, certain options for each address book, and enables you
+to create new address books.</p>
+<div class="figure">
+<img alt="../_images/contacts_settings.png" src="../_images/contacts_settings.png" />
+<p class="caption"><strong>Contacts settings</strong></p>
+</div>
+<p>The Contacts settings enables you to share, export, edit, and delete address
+books.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Hover your cursor over each icon to see a brief pop-up description.</p>
+</div>
+</div>
+<div class="section" id="adding-an-address-book">
+<h2>Adding an Address Book<a class="headerlink" href="#adding-an-address-book" title="Permalink to this headline">¶</a></h2>
+<p>To add an address book:</p>
+<ol class="arabic simple">
+<li>Click the <tt class="docutils literal"><span class="pre">+</span> <span class="pre">Add</span> <span class="pre">Address</span> <span class="pre">Book</span></tt> option in the Contacts settings field.</li>
+</ol>
+<blockquote>
+<div><p>A field opens requesting you to enter a display name for the new address book.</p>
+<div class="figure">
+<img alt="../_images/contact_address_book_add.png" src="../_images/contact_address_book_add.png" />
+<p class="caption"><strong>Adding an address book</strong></p>
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="2">
+<li>Specify a display name for the address book.</li>
+<li>Click the checkbox icon to create the new address book.</li>
+</ol>
+</div>
+<div class="section" id="synchronizing-address-books">
+<h2>Synchronizing Address Books<a class="headerlink" href="#synchronizing-address-books" title="Permalink to this headline">¶</a></h2>
+<p>One of the most important features in any contact application is the ability to
+keep it in sync. The ownCloud Contacts app enables you to sync your address
+books to external devices that use the Android or Apple iOS operating systems.</p>
+<div class="section" id="synchronizing-with-android">
+<h3>Synchronizing With Android<a class="headerlink" href="#synchronizing-with-android" title="Permalink to this headline">¶</a></h3>
+<p>To synchronize with an Android device:</p>
+<ol class="arabic simple">
+<li>Install CardDAV- Sync free from the Google play store by visiting <a class="reference external" href="https://play.google.com/store/apps/details?id=org.dmfs.carddav.sync">this link</a>.
+This app supports auto-configuration.</li>
+</ol>
+<blockquote>
+<div><div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Following the installing, visit carddavs://example.org/remote.php/carddav/ to auto-configure the app.</p>
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="3">
+<li>Enter your login details.</li>
+<li>After the app has checked your login details, select the <tt class="docutils literal"><span class="pre">Sync</span> <span class="pre">from</span> <span class="pre">server</span> <span class="pre">to</span> <span class="pre">phone</span> <span class="pre">only</span></tt> option.</li>
+</ol>
+<div class="figure">
+<img alt="../_images/contact_syncopt.jpg" src="../_images/contact_syncopt.jpg" />
+</div>
+</div>
+<div class="section" id="synchronizing-with-apple-ios">
+<h3>Synchronizing With Apple iOS<a class="headerlink" href="#synchronizing-with-apple-ios" title="Permalink to this headline">¶</a></h3>
+<p>To synchronize with an Apple iOS device:</p>
+<ol class="arabic simple">
+<li>Open the settings application.</li>
+<li>Select Mail > Contacts > Calendars.</li>
+<li>Select <tt class="docutils literal"><span class="pre">Add</span> <span class="pre">Account</span></tt>.</li>
+<li>Select <tt class="docutils literal"><span class="pre">other</span></tt> as the account type.</li>
+<li>Select <tt class="docutils literal"><span class="pre">Add</span> <span class="pre">CardDAV</span> <span class="pre">account</span></tt>.</li>
+<li>For <tt class="docutils literal"><span class="pre">server</span></tt>, enter <a class="reference external" href="http://example.org/remote.php/carddav/principals/username">http://example.org/remote.php/carddav/principals/username</a></li>
+<li>Specify your username and password.</li>
+<li>Select Next.</li>
+<li>If your server does not support SSL, a warning is displayed. Select <tt class="docutils literal"><span class="pre">Continue</span></tt>.</li>
+<li>If the iPhone is unable to verify the account information, perform the following:</li>
+</ol>
+<blockquote>
+<div><ol class="loweralpha simple">
+<li>Click <tt class="docutils literal"><span class="pre">OK</span></tt>.</li>
+<li>Select <tt class="docutils literal"><span class="pre">advanced</span> <span class="pre">settings</span></tt>.</li>
+<li>Make sure <tt class="docutils literal"><span class="pre">Use</span> <span class="pre">SSL</span></tt> is set to “OFF”.</li>
+<li>Change the port to <tt class="docutils literal"><span class="pre">80</span></tt>.</li>
+<li>Return to “account information” and click <tt class="docutils literal"><span class="pre">Save</span></tt>.</li>
+</ol>
+<p>Your contacts appear in the address book of your iPhone.</p>
+</div></blockquote>
+</div>
+<div class="section" id="using-other-synchronization-options">
+<h3>Using Other Synchronization Options<a class="headerlink" href="#using-other-synchronization-options" title="Permalink to this headline">¶</a></h3>
+<p>ownCloud provides the following alternative synchronization options:</p>
+<ul class="simple">
+<li>For Android devices, you can use an official Android app. You can find this
+app <a class="reference external" href="https://owncloud.org/install/">here</a>.</li>
+<li>For iOS (iPhone and iPad) devices, you can use their official app. You can
+find this app <a class="reference external" href="https://owncloud.org/install/">here</a>.</li>
+</ul>
+</div>
+</div>
+<div class="section" id="troubleshooting">
+<h2>Troubleshooting<a class="headerlink" href="#troubleshooting" title="Permalink to this headline">¶</a></h2>
+<p>Are you having problems using the app? Have a look at the <a class="reference internal" href="troubleshooting.html"><em>Troubleshooting</em></a> guide.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/index.html
index 2d39c66,0000000..c5c4526
mode 100644,000000..100644
--- a/core/doc/user/pim/index.html
+++ b/core/doc/user/pim/index.html
@@@ -1,171 -1,0 +1,170 @@@
+
+<!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>Contacts & Calendar — 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="next" title="Using the Contacts App" href="contacts.html" />
+ <link rel="prev" title="Managing Big Files" href="../files/configuring_big_file_upload.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"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Contacts & Calendar</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_ios.html">iOS - Synchronize iPhone/iPad</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Addressbook</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+</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="contacts-calendar">
+<h1>Contacts & Calendar<a class="headerlink" href="#contacts-calendar" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="sync_ios.html">iOS - Synchronize iPhone/iPad</a></li>
+<li class="toctree-l1"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
+<li class="toctree-l1"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Addressbook</a></li>
+<li class="toctree-l1"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l1"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/sync_ios.html
index b4087dc,0000000..30e4f2f
mode 100644,000000..100644
--- a/core/doc/user/pim/sync_ios.html
+++ b/core/doc/user/pim/sync_ios.html
@@@ -1,217 -1,0 +1,216 @@@
+
+<!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>iOS - Synchronize iPhone/iPad — 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="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="Synchronizing with OS X" href="sync_osx.html" />
+ <link rel="prev" title="Using the Calendar App" href="calendar.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"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">iOS - Synchronize iPhone/iPad</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#calendar">Calendar</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#address-book">Address book</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Addressbook</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+</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="ios-synchronize-iphone-ipad">
+<h1>iOS - Synchronize iPhone/iPad<a class="headerlink" href="#ios-synchronize-iphone-ipad" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="calendar">
+<h2>Calendar<a class="headerlink" href="#calendar" title="Permalink to this headline">¶</a></h2>
+<ol class="arabic simple">
+<li>Open the settings application.</li>
+<li>Select Mail, Contacts, Calendars.</li>
+<li>Select Add Account.</li>
+<li>Select Other as account type.</li>
+<li>Select Add CalDAV account.</li>
+<li>For server, type <tt class="docutils literal"><span class="pre">ADDRESS/remote.php/caldav/principals/username</span></tt></li>
+<li>Enter your user name and password.</li>
+<li>Select Next.</li>
+<li>If your server does not support SSL, a warning will be displayed.
+Select Continue.</li>
+<li>If the iPhone is unable to verify the account information perform the
+following steps:<ul>
+<li>Select OK.</li>
+<li>Select advanced settings.</li>
+<li>Make sure Use SSL is set to OFF.</li>
+<li>Change port to 80.</li>
+<li>Go back to account information and hit Save.</li>
+</ul>
+</li>
+</ol>
+<p>Your calendar will now be visible in the Calendar application</p>
+</div>
+<div class="section" id="address-book">
+<h2>Address book<a class="headerlink" href="#address-book" title="Permalink to this headline">¶</a></h2>
+<ol class="arabic simple">
+<li>Open the settings application.</li>
+<li>Select Mail, Contacts, Calendars.</li>
+<li>Select Add Account.</li>
+<li>Select Other as account type.</li>
+<li>Select Add CardDAV account.</li>
+<li>For server, type <tt class="docutils literal"><span class="pre">ADDRESS/remote.php/carddav/principals/username</span></tt></li>
+<li>Enter your user name and password.</li>
+<li>Select Next.</li>
+<li>If your server does not support SSL, a warning will be displayed.
+Select Continue.</li>
+<li>If the iPhone is unable to verify the account information perform the
+following:<ul>
+<li>Select OK.</li>
+<li>Select advanced settings.</li>
+<li>Make sure Use SSL is set to OFF.</li>
+<li>Change port to 80.</li>
+<li>Go back to account information and hit Save.</li>
+</ul>
+</li>
+</ol>
+<p>Now should now find your contacts in the address book of your
+iPhone.
+If it’s still not working, have a look at the <a class="reference internal" href="troubleshooting.html"><em>Troubleshooting</em></a> guide.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/sync_kde.html
index 53997dd,0000000..8e5a811
mode 100644,000000..100644
--- a/core/doc/user/pim/sync_kde.html
+++ b/core/doc/user/pim/sync_kde.html
@@@ -1,185 -1,0 +1,184 @@@
+
+<!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>Synchronizing with KDE SC — 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="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="Troubleshooting" href="troubleshooting.html" />
+ <link rel="prev" title="Thunderbird - Synchronize Addressbook" href="sync_thunderbird.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"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_ios.html">iOS - Synchronize iPhone/iPad</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Addressbook</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+</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="synchronizing-with-kde-sc">
+<h1>Synchronizing with KDE SC<a class="headerlink" href="#synchronizing-with-kde-sc" title="Permalink to this headline">¶</a></h1>
+<img alt="../_images/kdes1.png" src="../_images/kdes1.png" />
+<p>From KDE SC 4.8 and forward setting up ownCloud is very easy. From System
+Settings Personal Information/Akonadi Resources Configuration select DAV
+Groupware resource.</p>
+<img alt="../_images/kdes2.png" src="../_images/kdes2.png" />
+<p>Enter your ownCloud username and password and click “Next”.</p>
+<img alt="../_images/kdes3.png" src="../_images/kdes3.png" />
+<p>Select ownCloud in the drop down list and click “Next”.</p>
+<img alt="../_images/kdes4.png" src="../_images/kdes4.png" />
+<p>Enter the host name and installation path. If you do not use SSL
+remember to de-select “Use secure connection”.</p>
+<img alt="../_images/kdes5.png" src="../_images/kdes5.png" />
+<p>Test the connection. If everything went well you should see a message
+like the one below.</p>
+<img alt="../_images/kdes6.png" src="../_images/kdes6.png" />
+<p>Click “Finish” and you will be able to change the display name and
+refresh interval.</p>
+<img alt="../_images/kdes7.png" src="../_images/kdes7.png" />
+<p>Now you should see the Akonadi resource doing the first
+synchronization.</p>
+<p>You can find the Contacts and Calendars in Kontact (or
+KOrganizer/KAddressbook if you run the programs separately.)</p>
+<img alt="../_images/kdes9.png" src="../_images/kdes9.png" />
+<img alt="../_images/kdes.png" src="../_images/kdes.png" />
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/sync_osx.html
index 7980cfb,0000000..ec13281
mode 100644,000000..100644
--- a/core/doc/user/pim/sync_osx.html
+++ b/core/doc/user/pim/sync_osx.html
@@@ -1,197 -1,0 +1,196 @@@
+
+<!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>Synchronizing with OS X — 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="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="Thunderbird - Synchronize Addressbook" href="sync_thunderbird.html" />
+ <link rel="prev" title="iOS - Synchronize iPhone/iPad" href="sync_ios.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"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_ios.html">iOS - Synchronize iPhone/iPad</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Synchronizing with OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Addressbook</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+</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="synchronizing-with-os-x">
+<h1>Synchronizing with OS X<a class="headerlink" href="#synchronizing-with-os-x" title="Permalink to this headline">¶</a></h1>
+<p>To use ownCloud with iCal you will need to use the following URL:</p>
+<div class="highlight-python"><pre>http://ADDRESS/remote.php/caldav/principals/username/</pre>
+</div>
+<p>The setup is basically the same as with iOS using the path <strong>ADDRESS/remote.php/caldav/principals/username/</strong> to sync with ownCloud. For OS X 10.7 Lion and 10.8 Mountain Lion everything works fine, but OS X 10.6 (Snow Leopard) and older needs some fiddling to work. A user contributed the following:</p>
+<ol class="arabic">
+<li><p class="first">Make sure, addressbook is not running. If it is, select the windows and press Command + Q to terminate it.</p>
+</li>
+<li><p class="first">Navigate to <strong>/Users/YOUR_USERNAME/Library/Application Support/AddressBook/Sources</strong>. If you have all ready some kind of addressbook setup, it is likely you will see some folders named like this <strong>BEA92826-FBF3-4E53-B5C6-ED7C2B454430</strong>. Note down what folders there are now and leave the window open.</p>
+</li>
+<li><p class="first">Open addressbook and try to add a new CardDav addressbook. At this point, it does not matter what information you enter. It will come up with the same error message you mentioned before when you click “Create”. Ignore it and click “Create” again. A non-functional addressbook will be added.</p>
+</li>
+<li><p class="first">Close addressbook again using Command + Q</p>
+</li>
+<li><p class="first">Go back to the folder window from step 2. You will now see a newly created folder with another long string as its name.</p>
+</li>
+<li><p class="first">Navigate to the newly created folder and edit the <strong>Configuration.plist</strong> with your favorite text editor.</p>
+</li>
+<li><p class="first">Search for a section looking like this:</p>
+<div class="highlight-python"><pre><key>servername</key> <string>http://:0(null)</string> <key>username</key> <string>Whatever_you_entered_before</string></pre>
+</div>
+</li>
+</ol>
+<ol class="arabic" start="8">
+<li><p class="first">Make it look like this. Please note that the :80 after <strong>YOUR_DOMAIN</strong> is important:</p>
+<div class="highlight-python"><pre><key>servername</key <string>http://YOUR_DOMAIN:80/owncloud/remote.php/carddav/principals/username</string> <key>username</key <string>username</string></pre>
+</div>
+</li>
+<li><p class="first">Save the file and open addressbook again. It will not work yet.</p>
+</li>
+<li><p class="first">Open the preferences for your ownCloud CardDAV-Account and enter your password.</p>
+</li>
+<li><p class="first">You may have to restart addressbook once more. After this, it should work.</p>
+</li>
+</ol>
+<p>If it’s still not working, have a look at the <a class="reference internal" href="troubleshooting.html"><em>Troubleshooting</em></a> guide.</p>
+<p>There is also an easy <a class="reference external" href="http://forum.owncloud.org/viewtopic.php?f=3&t=132">HOWTO</a> in the forum.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/sync_thunderbird.html
index 0cc35fe,0000000..afc37bd
mode 100644,000000..100644
--- a/core/doc/user/pim/sync_thunderbird.html
+++ b/core/doc/user/pim/sync_thunderbird.html
@@@ -1,199 -1,0 +1,198 @@@
+
+<!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>Thunderbird - Synchronize Addressbook — 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="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="Synchronizing with KDE SC" href="sync_kde.html" />
+ <link rel="prev" title="Synchronizing with OS X" href="sync_osx.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"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_ios.html">iOS - Synchronize iPhone/iPad</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Thunderbird - Synchronize Addressbook</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#addressbook">Addressbook</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+</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="thunderbird-synchronize-addressbook">
+<h1>Thunderbird - Synchronize Addressbook<a class="headerlink" href="#thunderbird-synchronize-addressbook" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="addressbook">
+<h2>Addressbook<a class="headerlink" href="#addressbook" title="Permalink to this headline">¶</a></h2>
+<p>As someone who is new to ownCloud, New to SoGo Connector, and new to Thunderbird Addressbook... here is what you need in excruciating pithy detail you need to make this work (for all the other lost souls out there):</p>
+<ol class="arabic simple">
+<li><a class="reference external" href="http://www.mozilla.org/en-US/thunderbird/">Thunderbird</a> for your OS unless it comes with your OS distribution (Linux)</li>
+<li><a class="reference external" href="http://www.sogo.nu/english/downloads/frontends.html">Sogo Connector</a> (latest release)</li>
+<li><a class="reference external" href="https://addons.mozilla.org/en-US/thunderbird/addon/lightning/">Lightning</a> (a Thunderbird calendar add-on. At the time (Aug 14), syncing your contacts only works with this add-on installed.)</li>
+</ol>
+<p>With an installed Thunderbird mailtool, an installed SoGo Connector, and an installed Lightning add-on:</p>
+<ol class="arabic simple">
+<li>Thunderbird Addressbook is in the Thunderbird “Tools” Menu</li>
+<li>In the Thunderbird Addressbook application:<ul>
+<li>“File > New > <strong>Remote Addressbook</strong>” (SoGo Connector added this)</li>
+<li>“<strong>Name:</strong>” is the name you want to give your Addressbook in the Thunderbird addressbook bar area</li>
+<li>“<strong>URL:</strong>” is found in your ownCloud Contacts area, that little Gear symbol</li>
+</ul>
+</li>
+</ol>
+<img alt="../_images/contact_thunderbird-Symbol_Gear.jpg" src="../_images/contact_thunderbird-Symbol_Gear.jpg" />
+<p>in the -bottom left- of the Contacts View (same symbol as found in the -top right- in the Calendar view). Then look for a little impeller symbol</p>
+<img alt="../_images/contact_thunderbird-Symbol_Impeller.jpg" src="../_images/contact_thunderbird-Symbol_Impeller.jpg" />
+<p>which will display the URL you need for your installation to work.</p>
+<img alt="../_images/contact_thunderbird-URL_config.jpg" src="../_images/contact_thunderbird-URL_config.jpg" />
+<p>Once installed, synchronize (right click on your newly made remote address book and select “Synchronize”).
+You’ll see your address book populate from ownCloud! Don’t click “read only” above unless you don’t want to
+modify your ownCloud server addressbook, like it contains a listing of corporate contacts and is shared with
+lots of people, and you don’t want a new user dragging it somewhere unintended.</p>
+<p>The rest of the details of dealing with Thunderbird addressbook are left to the reader... First thing I learned
+is dragging a contact to a different addressbook is a “move” operation. If you are worried about losing the
+contact, save it to a VCF file using ownCloud (Or LDIF using Thunderbird Addressbook) first! Like dragging
+from “ownCloud Addressbook” to “Personal Address Book” removes the contact from ownCloud Server
+(<em>deleting it from all the other synchronized installations</em>) and puts it in your Local Machine -only-
+Address Book. So be careful or you’ll have unintended consequences where you might have intended a “copy” operation.</p>
+<p>Contact <em>Pictures</em> are also sync’ed!</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/troubleshooting.html
index acac9f7,0000000..83bd1c6
mode 100644,000000..100644
--- a/core/doc/user/pim/troubleshooting.html
+++ b/core/doc/user/pim/troubleshooting.html
@@@ -1,235 -1,0 +1,234 @@@
+
+<!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>Troubleshooting — 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="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="Collaborative Document Editing" href="../documents.html" />
+ <link rel="prev" title="Synchronizing with KDE SC" href="sync_kde.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"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_ios.html">iOS - Synchronize iPhone/iPad</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Addressbook</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Troubleshooting</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#debugging-the-issue">Debugging the issue</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#service-discovery">Service discovery</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#unable-to-update-contacts-or-events">Unable to update Contacts or Events</a></li>
+</ul>
+</li>
+</ul>
+</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="troubleshooting">
+<h1>Troubleshooting<a class="headerlink" href="#troubleshooting" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="debugging-the-issue">
+<h2>Debugging the issue<a class="headerlink" href="#debugging-the-issue" title="Permalink to this headline">¶</a></h2>
+<p>In a standard ownCloud installation the log level is set to “Normal”. to find any issues
+you need to raise the log level to “All” from the Admin page.
+Some logging - for example JavaScript console logging - needs manually editing the
+configuration file.
+Edit <tt class="file docutils literal"><span class="pre">config/config.php</span></tt> and add <tt class="docutils literal"><span class="pre">define('DEBUG',</span> <span class="pre">true);</span></tt>:</p>
+<div class="highlight-python"><pre><?php
+define('DEBUG',true);
+$CONFIG = array (
+ ... configuration goes here ...
+);</pre>
+</div>
+<p>For JavaScript issues you will also need to view the javascript console. All major browsers
+have decent developer tools for viewing the console, and you usually access them by
+pressing F-12. For Firefox it is recommended to install the <a class="reference external" href="https://getfirebug.com/">Firebug extension</a>.</p>
+</div>
+<div class="section" id="service-discovery">
+<h2>Service discovery<a class="headerlink" href="#service-discovery" title="Permalink to this headline">¶</a></h2>
+<p>Some clients - especially iOS - have problems finding the proper sync URL, even when explicitly
+configured to use it.</p>
+<p>There are several techniques to remedy this, which are described extensively at the
+<a class="reference external" href="http://sabre.io/dav/service-discovery/">Sabre DAV website</a>.</p>
+<div class="section" id="apple-ios">
+<h3>Apple iOS<a class="headerlink" href="#apple-ios" title="Permalink to this headline">¶</a></h3>
+<p>Below is what have proven to work with iOS including iOS 7.</p>
+<p>If your ownCloud instance is installed in a subfolder under the web server’s document root and
+the client has difficulties finding the Cal- or CardDAV end-points, configure your web server to
+redirect from a “well-know” URL to the one used by ownCloud.
+When using the Apache web server this is easily achieved using a <tt class="file docutils literal"><span class="pre">.htaccess</span></tt> file in the document
+root of your site.</p>
+<p>Say your instance is located in the <tt class="docutils literal"><span class="pre">owncloud</span></tt> folder, so the URL to it is <tt class="docutils literal"><span class="pre">ADDRESS/owncloud</span></tt>,
+create or edit the <tt class="file docutils literal"><span class="pre">.htaccess</span></tt> file and add the following lines:</p>
+<div class="highlight-python"><pre>Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav
+Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav</pre>
+</div>
+<p>If you use Nginx as web server, the setting looks something like:</p>
+<div class="highlight-python"><pre>url.redirect = (
+ "^/.well-known/carddav" => "/owncloud/remote.php/carddav",
+ "^/.well-known/caldav" => "/owncloud/remote.php/caldav",
+)</pre>
+</div>
+<p>Now change the URL in the client settings to just use <tt class="docutils literal"><span class="pre">ADDRESS</span></tt> instead of e.g. <tt class="docutils literal"><span class="pre">ADDRESS/remote.php/carddav/principals/username</span></tt>.</p>
+<p>This problem is being discussed in the <a class="reference external" href="http://forum.owncloud.org/viewtopic.php?f=3&t=71&p=2211#p2197">forum</a>.</p>
+</div>
+<div class="section" id="blackberry-os-10-2">
+<h3>BlackBerry OS 10.2<a class="headerlink" href="#blackberry-os-10-2" title="Permalink to this headline">¶</a></h3>
+<p>BlackBerry OS up to 10.2.2102 does not accept a URL with protocol <tt class="docutils literal"><span class="pre">https://</span></tt> in front of the server address.
+It will always tell you, that it cannot login on your server. So instead of writing</p>
+<blockquote>
+<div><a class="reference external" href="https://address/remote.php/carddav/principals/username">https://address/remote.php/carddav/principals/username</a></div></blockquote>
+<p>in the server address field, you have to write</p>
+<blockquote>
+<div>address/remote.php/carddav/principals/username</div></blockquote>
+</div>
+</div>
+<div class="section" id="unable-to-update-contacts-or-events">
+<h2>Unable to update Contacts or Events<a class="headerlink" href="#unable-to-update-contacts-or-events" title="Permalink to this headline">¶</a></h2>
+<p>If you get an error like <tt class="docutils literal"><span class="pre">PATCH</span> <span class="pre">https://ADDRESS/some_url</span> <span class="pre">HTTP/1.0</span> <span class="pre">501</span> <span class="pre">Not</span> <span class="pre">Implemented</span></tt> it is
+likely caused by one of the following reasons:</p>
+<dl class="docutils">
+<dt>Outdated lighttpd web server</dt>
+<dd>lighttpd in debian wheezy (1.4.31) doesn’t support the PATCH HTTP verb.
+Upgrade to lighttpd >= 1.4.33.</dd>
+<dt>Using Pound reverse-proxy/load balancer</dt>
+<dd>As of writing this Pound doesn’t support the HTTP/1.1 verb.
+Pound is easily <a class="reference external" href="http://www.apsis.ch/pound/pound_list/archive/2013/2013-08/1377264673000">patched</a> to support HTTP/1.1.</dd>
+</dl>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/search.html
index 82c507b,0000000..6063b82
mode 100644,000000..100644
--- a/core/doc/user/search.html
+++ b/core/doc/user/search.html
@@@ -1,174 -1,0 +1,173 @@@
+
+<!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>Search — 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/searchtools.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">
+ jQuery(function() { Search.loadIndex("searchindex.js"); });
+ </script>
+
+<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">
+
+ <h1 id="search-documentation">Search</h1>
+ <div id="fallback" class="admonition warning">
+ <script type="text/javascript">$('#fallback').hide();</script>
+ <p>
+ Please activate JavaScript to enable the search
+ functionality.
+ </p>
+ </div>
+ <p>
+ From here you can search these documents. Enter your search
+ words into the box below and click "search". Note that the search
+ function will automatically search for all of the words. Pages
+ containing fewer words won't appear in the result list.
+ </p>
+ <form action="" method="get">
+ <input type="text" name="q" value="" />
+ <input type="submit" value="search" />
+ <span id="search-progress" style="padding-left: 10px"></span>
+ </form>
+
+ <div id="search-results">
+
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/userpreferences.html
index 8bc4fa7,0000000..2c5596c
mode 100644,000000..100644
--- a/core/doc/user/userpreferences.html
+++ b/core/doc/user/userpreferences.html
@@@ -1,264 -1,0 +1,263 @@@
+
+<!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>Setting Your Preferences — 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="next" title="Configuring External Storage" href="external_storage/google_drive.html" />
- <link rel="prev" title="User Account Migration" href="migration.html" />
++ <link rel="prev" title="Using the Bookmarks App" href="bookmarks.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"><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 current"><a class="current reference internal" href="">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="setting-your-preferences">
+<h1>Setting Your Preferences<a class="headerlink" href="#setting-your-preferences" title="Permalink to this headline">¶</a></h1>
+<p>As a user, you can manage your personal settings.</p>
+<p>To access your personal settings:</p>
+<ol class="arabic">
+<li><p class="first">Clicking on your username in the top, right corner of your ownCloud instance.</p>
+<p>The Personal Settings Menu opens.</p>
+<div class="figure">
+<img alt="_images/oc_personal_settings_dropdown.png" src="_images/oc_personal_settings_dropdown.png" />
+</div>
+<p><strong>Personal Settings Menu</strong></p>
+</li>
+<li><p class="first">Choose <em>Personal</em> from the drop down menu.</p>
+<p>The Personal Settings Page opens in the main viewing window.</p>
+<div class="figure">
+<img alt="_images/personal_settings.png" src="_images/personal_settings.png" />
+</div>
+</li>
+</ol>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you are an administrator, you can also manage users and administer
+the server by using the related links in the Personal Settings Menu.
+However, these links do not appear to a normal user.</p>
+</div>
+<p>The options listed in the Personal Settings Page depend on the applications that
+are enabled by the administrator. However, some of the default settings for
+this page include the following:</p>
+<ul>
+<li><p class="first">Usage and available quota – Appearing at the top of the page, this
+information provides the amount of space used and available for the user (in
+Megabytes).</p>
+<blockquote>
+<div><div class="figure">
+<img alt="_images/usage_indicator.png" src="_images/usage_indicator.png" />
+</div>
+</div></blockquote>
+</li>
+<li><p class="first">Password – Enables you to change your password. To change your password, you
+must provide your current password along with your new password. When
+creating a new password, ownCloud provides a dynamic password strength
+indicator for your assistance.</p>
+<div class="figure">
+<img alt="_images/password_change.png" src="_images/password_change.png" />
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you would like the ability to recover your password through
+e-mail, specify your email address in the Email field (see below).</p>
+</div>
+</li>
+<li><p class="first">Full Name – Enables you to specify your full name. This name appears at the
+top of the Personal Settings Menu.</p>
+<blockquote>
+<div><div class="figure">
+<img alt="_images/full_name.png" src="_images/full_name.png" />
+</div>
+</div></blockquote>
+</li>
+<li><p class="first">Email – Enables you to specify an email address for use by the ownCloud
+server and administrator in sending you notifications. For information about
+setting email notifications, see “Notifications” below.</p>
+<blockquote>
+<div><div class="figure">
+<img alt="_images/email_address_personal_settings.png" src="_images/email_address_personal_settings.png" />
+</div>
+</div></blockquote>
+</li>
+</ul>
+<blockquote>
+<div><ul>
+<li><p class="first">Profile picture – Enables you to specify a new avatar (profile image) that
+identifies you on the ownCloud server. By default, the profile picture is
+the first initial of your username. You can choose to keep the letter
+designation, upload a new image from an external source, or select an image
+from any existing images in your ownCloud folders.</p>
+<div class="figure">
+<img alt="_images/profile_picture_personal_settings.png" src="_images/profile_picture_personal_settings.png" />
+</div>
+</li>
+</ul>
+</div></blockquote>
+<ul>
+<li><p class="first">Language – Enables you to change your web interface language, if you want to
+override the browser settings.</p>
+<blockquote>
+<div><div class="figure">
+<img alt="_images/language_personal_settings.png" src="_images/language_personal_settings.png" />
+</div>
+</div></blockquote>
+</li>
+<li><p class="first">Notifications – Enables you to specify what notifications you receive for
+activities on your ownCloud instance. You can choose to receive messages
+through an email notification or online stream notification. In addition,
+the Notifications settings enable you to exclude changes that you make
+yourself and obtain only changes made by others on your account. You can
+obtain notifications hourly, daily, or weekly.</p>
+<blockquote>
+<div><div class="figure">
+<img alt="_images/notifications_personal_settings.png" src="_images/notifications_personal_settings.png" />
+</div>
+</div></blockquote>
+</li>
+<li><p class="first">Documents – Enables you to specify a location (folder) to which newly created
+documents are saved.</p>
+<blockquote>
+<div><div class="figure">
+<img alt="_images/documents_personal_settings.png" src="_images/documents_personal_settings.png" />
+</div>
+</div></blockquote>
+</li>
+<li><p class="first">Version – Specifies the ownCloud software version that you are using along
+with links to the ownCloud community, source code, and licensing information.</p>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/webinterface.html
index 27376d0,0000000..65641c7
mode 100644,000000..100644
--- a/core/doc/user/webinterface.html
+++ b/core/doc/user/webinterface.html
@@@ -1,280 -1,0 +1,279 @@@
+
+<!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>The ownCloud Web Interface — 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="next" title="Files & Synchronization" href="files/index.html" />
+ <link rel="prev" title="What’s New for Users in ownCloud 7" href="whats_new.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 current"><a class="current reference internal" href="">The ownCloud Web Interface</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#accessing-the-owncloud-web-interface">Accessing the ownCloud Web Interface</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#navigating-the-main-user-interface">Navigating the Main User Interface</a></li>
+</ul>
+</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">
+
+ <div class="section" id="the-owncloud-web-interface">
+<h1>The ownCloud Web Interface<a class="headerlink" href="#the-owncloud-web-interface" title="Permalink to this headline">¶</a></h1>
+<p>You can connect to your ownCloud server using any web browser. To access the
+ownCloud server using a web browser, specify the uniform resource link (URL)
+address of the server in the browser navigation bar. This can be the URL
+address of your personal ownCloud setup or a URL address that you have received
+from your company or your service provider.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you are administering the server yourself, we recommend that you
+read the <a class="reference external" href="http://doc.owncloud.org/server/7.0/admin_manual/">ownCloud Administrators Guide</a>.</p>
+</div>
+<div class="section" id="accessing-the-owncloud-web-interface">
+<h2>Accessing the ownCloud Web Interface<a class="headerlink" href="#accessing-the-owncloud-web-interface" title="Permalink to this headline">¶</a></h2>
+<p>To access the ownCloud web interface:</p>
+<p>1. Enter the URL address of the ownCloud server into your browser navigation
+bar.</p>
+<blockquote>
+<div><p>The ownCloud login window opens.</p>
+<div class="figure">
+<a class="reference internal image-reference" href="_images/oc_connect.png"><img alt="_images/oc_connect.png" src="_images/oc_connect.png" style="width: 325.5px; height: 321.75px;" /></a>
+<p class="caption"><strong>ownCloud login window</strong></p>
+</div>
+</div></blockquote>
+<ol class="arabic" start="2">
+<li><p class="first">Enter your valid username and password.</p>
+<p>The username and password combination can be those that you set up yourself
+when creating your ownCloud server setup or those provided by your company or
+your service provider.</p>
+<p>If you have set up the server yourself or are administering the server, you
+can add additional users by configuring a user backend (for example, LDAP).</p>
+</li>
+<li><p class="first">Click the <em class="guilabel">Log in</em> button.</p>
+<p>The ownCloud main interface opens.</p>
+<div class="figure">
+<img alt="_images/oc_main_web.png" src="_images/oc_main_web.png" />
+<p class="caption"><strong>ownCloud main user interface</strong></p>
+</div>
+</li>
+</ol>
+</div>
+<div class="section" id="navigating-the-main-user-interface">
+<h2>Navigating the Main User Interface<a class="headerlink" href="#navigating-the-main-user-interface" title="Permalink to this headline">¶</a></h2>
+<p>Once you have accessed the ownCloud Server main web interface you can add files,
+remove files, and make changes based on the access privileges set by you
+(if you are administering the server) or by your server administrator.</p>
+<div class="figure">
+<img alt="_images/oc_main_web_labelled.png" src="_images/oc_main_web_labelled.png" />
+<p class="caption"><strong>Navigating the main user interface</strong></p>
+</div>
+<p>The ownCloud Main User Interface contains the following fields and functions:</p>
+<ul class="simple">
+<li><strong>Apps Selection Menu</strong>: Located in the upper left corner of the user
+interface, this bar contains apps that are configured on the ownCloud server.
+The icons in this bar enable you to launch the different apps available and
+navigate between them within the ownCloud user interface.</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">ownCloud supports a number of apps that can be installed and used for
+various features and functions. Not all apps are installed and enabled by
+default. For example, the <em class="guilabel">Apps</em> button is visible only to
+administrators. This button allows administrators to enable or disable
+installed applications.</p>
+</div>
+<ul class="simple">
+<li><strong>Apps Information</strong> field: Located in the left side bar, this field provides
+filters and tasks associated with the chosen app. For example, using the
+Files app, you can use the filters in the apps information field to view only
+files that have been shared with you, files that you have shared with others,
+files that you have shared through the use of a link, or an option to delete
+files. Other app-specific information fields might provide tasks for creating
+new documents or modifying calendar entries.</li>
+<li><strong>Application View</strong>: The main, central field in the ownCloud user interface.
+This field displays the contents or user features of the app selected in the
+Navigation Bar. By default, this field shows the files and directory
+(“Files” view) of your user account.</li>
+<li><strong>Navigation Bar</strong>: Located over the main viewing window (the Application
+View), this bar provides a type of breadcrumbs navigation that enables you to
+migrate to higher levels of the folder hierarchy up to the root level (home)
+of your ownCloud instance.</li>
+<li><strong>New</strong> button: Located in the Navigation Bar, the <em class="guilabel">New</em> button
+enables you to create new files, new folders, or upload existing files from a
+specified link.</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You can also drag and drop files from your file manager (e.g. Windows
+Explorer or your Mac OS X Finder) into the ownCloud Files Application
+View to upload them to ownCloud.</p>
+</div>
+<ul>
+<li><p class="first"><strong>Upload</strong> button: Located next to the <em class="guilabel">New</em> button in the
+Navigation Bar, the <em class="guilabel">Upload</em> button enables you to upload files
+from your system to the ownCloud server. Clicking this button launches a
+file picker (e.g. Windows Explorer or Mac OS X Finder) window with which you
+can choose files for uploading.</p>
+</li>
+<li><p class="first"><strong>Search</strong> field: Residing in the upper right hand corner of the Main User
+Interface window, the Search field enables you to search for files and
+folders stored in ownCloud. The ownCloud search function provides a full text
+search. However, for searching to function, administrators must enable the app
+in the search app settings.</p>
+</li>
+<li><p class="first"><strong>Personal Settings</strong> menu: Located to the right of the Search field, the
+Personal Settings dropdown menu provides access to your personal settings
+page and the ability to log out of your ownCloud user session. The personal
+settings page provides access to the following:</p>
+<ul class="simple">
+<li>Activity notifications</li>
+<li>Server usage and space availability</li>
+<li>Password management</li>
+<li>Name, email, and profile picture settings</li>
+<li>Interface language settings</li>
+<li>WebDAV URL for receiving files using WebDAV (see next chapter).</li>
+<li>Mozilla Sync information for creating a synchronization to a Mozilla
+(Firefox) account.</li>
+<li>ownCloud Version information</li>
+</ul>
+<p>You can see <a class="reference internal" href="userpreferences.html"><em>Setting Your Preferences</em></a> section to learn more about those settings.</p>
+</li>
+</ul>
+<p>In addition to these standard settings, administrators have access to user
+management (<em class="guilabel">Users</em>), apps settings (<em class="guilabel">Apps</em>), and
+administrative settings (<em class="guilabel">Admin</em>) including access to the ownCloud
+log files.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/whats_new.html
index 817ae72,0000000..6bbde13
mode 100644,000000..100644
--- a/core/doc/user/whats_new.html
+++ b/core/doc/user/whats_new.html
@@@ -1,214 -1,0 +1,213 @@@
+
+<!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>What’s New for Users in ownCloud 7 — 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="next" title="The ownCloud Web Interface" href="webinterface.html" />
+ <link rel="prev" title="ownCloud 7.0 User 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 class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">What’s New for Users in ownCloud 7</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#no-more-shared-folder">No More Shared Folder</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#selective-sync">Selective Sync</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#server-to-server-sharing">Server to Server Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#file-and-activity-notifications">File and Activity Notifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#owncloud-documents-with-word-conversion">ownCloud Documents with Word Conversion</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#mobile-web-browser-support">Mobile Web Browser Support</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#lazy-loading-files">Lazy Loading Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#change-in-share-expiration-date">Change in Share Expiration Date</a></li>
+</ul>
+</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">
+
+ <div class="section" id="what-s-new-for-users-in-owncloud-7">
+<h1>What’s New for Users in ownCloud 7<a class="headerlink" href="#what-s-new-for-users-in-owncloud-7" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="no-more-shared-folder">
+<h2>No More Shared Folder<a class="headerlink" href="#no-more-shared-folder" title="Permalink to this headline">¶</a></h2>
+<p>The Shared folder has been removed from ownCloud 7. If you are upgrading
+from older ownCloud versions you will still have your old Shared folder,
+but new shares will appear in the top-level of your Files page, and the Shared
+folder is no longer required. You can now create your own folders for
+storing shared files, and organize and move them around like any other files.</p>
+</div>
+<div class="section" id="selective-sync">
+<h2>Selective Sync<a class="headerlink" href="#selective-sync" title="Permalink to this headline">¶</a></h2>
+<p>The desktop client now makes it easier for users to configure which folders
+on their ownCloud instances should be syncing with the desktop, and can easily
+make changes for special circumstances such as travel and special projects.</p>
+</div>
+<div class="section" id="server-to-server-sharing">
+<h2>Server to Server Sharing<a class="headerlink" href="#server-to-server-sharing" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud 7 servers can now connect shares directly with each other. With just a
+few clicks you can easily and securely connect to public shares on other
+ownCloud servers, and optionally create public shares for sharing your own files
+if your admin allows it.</p>
+</div>
+<div class="section" id="file-and-activity-notifications">
+<h2>File and Activity Notifications<a class="headerlink" href="#file-and-activity-notifications" title="Permalink to this headline">¶</a></h2>
+<p>In ownCloud 7 you can set up automatic notifications on your ownCloud
+Personal page of tracked activities such as new shares, and changed or deleted
+files.</p>
+</div>
+<div class="section" id="owncloud-documents-with-word-conversion">
+<h2>ownCloud Documents with Word Conversion<a class="headerlink" href="#owncloud-documents-with-word-conversion" title="Permalink to this headline">¶</a></h2>
+<p>You can convert Word documents on the fly: open them in ownCloud for
+editing, and live editing with other users, and when you close it reverts
+to its original Word format with all of your changes embedded.</p>
+</div>
+<div class="section" id="mobile-web-browser-support">
+<h2>Mobile Web Browser Support<a class="headerlink" href="#mobile-web-browser-support" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud 7 is friendly to small screens, and can be used on most tablet and
+mobile browsers without requiring the use of a native mobile app. This provides
+support for devices that do not have a native app, like Microsoft and
+Blackberry.</p>
+</div>
+<div class="section" id="lazy-loading-files">
+<h2>Lazy Loading Files<a class="headerlink" href="#lazy-loading-files" title="Permalink to this headline">¶</a></h2>
+<p>Viewing your Files page is faster now thanks to “lazy loading”, which loads
+files as you scroll down the page instead of loading all of them when you open
+the page.</p>
+</div>
+<div class="section" id="change-in-share-expiration-date">
+<h2>Change in Share Expiration Date<a class="headerlink" href="#change-in-share-expiration-date" title="Permalink to this headline">¶</a></h2>
+<p>In older versions of ownCloud, you could set an expiration date on both local
+and public shares. Now you can set an expiration date only on public shares,
+and local shares do not expire when public shares expire. The only way to
+“expire” a local share is to click the trash can icon to un-share your files.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc version.php
index 6222485,1afefc7..e5a5a87
--- 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, 4);
-
-// The human readable string
-$OC_VersionString='7.0.3';
-
-// The ownCloud edition
-$OC_Edition='';
-
-// The ownCloud channel
-$OC_Channel='git';
-
-// The build number
-$OC_Build='';
-
+<?php
- $OC_Version = array(7,0,3,2);
- $OC_VersionString = '7.0.3 RC3';
++$OC_Version = array(7,0,3,4);
++$OC_VersionString = '7.0.3';
+$OC_Edition = '';
- $OC_Channel = 'testing';
- $OC_Build = '2014-11-06T13:54:48+00:00';
++$OC_Channel = 'stable';
++$OC_Build = '2014-11-10T16:19:38+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