mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 21:15:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
18417 commits 473 branches 255 tags 510 MiB
Commit graph

501 commits

Author SHA1 Message Date
Marius Blüm
78bfae45ae
Mac OS X is now macOS 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2018-06-04 11:44:03 +02:00
Christian Kamm
5f7fd7c551
Excludes: Expand doc, Desktop.ini only in root folder 
The Desktop.ini exclude was added for 2.4 because we add such a file to
the synced folder on Windows. It doesn't need to cover subdirectories.
 2018-05-16 20:29:12 +02:00
Oleg Solovyov
66eeb96c54
- doc: linux-only setting 2018-05-15 18:25:27 +02:00
Oleg Solovyov
09ade2b892
- add description for moveToTrash variable 2018-05-15 18:22:36 +02:00
Julius Härtl
16f53da9ae
Remove configure_file for non-existing documentation config file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-22 19:30:05 +01:00
Morris Jobke
5db7f60179
Fix CMake failure 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-01 16:08:33 +01:00
Morris Jobke
545a406997
Latest refinements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-01 15:57:37 +01:00
Marius Blüm
d75b32156f Brand Screenshots 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2018-02-01 14:23:38 +01:00
Morris Jobke
a7e1003c41
Add shared_assets 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-29 01:19:51 +01:00
Morris Jobke
fe102f359c
Build current documentation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-29 01:19:47 +01:00
Roeland Jago Douma
fe4bb52a6d
Merge remote-tracking branch 'oc/master' into oc_up 2017-12-14 10:27:11 +01:00
Olivier Goffart
e0a14cac5b ConfigFile: use QStandardPaths::AppConfigLocation for the config file 
Also use appName instead of appNameGui in order to compute the path

Issue: #2245

The reason is to respect the XDG spec on Unix (#1601) and might help
on windows roaming profiles (#684)
 2017-12-07 17:39:16 +01:00
Olivier Goffart
ed5385faa3 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libsync/connectionvalidator.cpp
     	src/libsync/networkjobs.cpp
 2017-12-05 15:58:13 +01:00
Hefee
1a1ab92ed9 make doc-man working again. 2017-12-04 12:37:30 +01:00
Terence Eden
e6be710cdb
Typo in documentation 
Fixes #63
 2017-11-25 10:03:36 +00:00
Christian Kamm
aafe7c4732 Merge remote-tracking branch 'origin/2.4' 2017-11-20 11:54:56 +01:00
Michael Stingl
d832312acc Add 2.3.3 System Requirements to client repo (#5996) 
I would like to maintain the System Requirements in the client repo.
 2017-11-17 15:05:42 +01:00
Matthew Setter
b13fd786b6 Fix broken download link 2017-11-14 12:25:48 +01:00
Matthew Setter
89d55d0af8 Fix broken images in the FAQ 2017-11-14 12:25:48 +01:00
Matthew Setter
d46335aba1 Minor formatting fixes 
Fix broken header and table
 2017-11-14 12:25:48 +01:00
Matthew Setter
e417a4b159 Fix title casing to match style guide 2017-11-14 12:25:48 +01:00
Christian Kamm
05c1bfb6cf Merge remote-tracking branch 'origin/2.4' 2017-10-27 10:29:31 +02:00
Christian Kamm
e85a339d94 Local discovery: Use db instead of filesystem 
We mostly trust the file watchers meaning that we don't re-scan the
local tree if we have done that recently and no file watcher events
have arrived. If the file watchers invalidate a subtree, we rescan
only that subtree.

Since we're not entirely sure the file watchers are reliable, we still
do full local discoveries regularly (1h by default). There is a config
file setting as well as an environment variable to control the interval.
 2017-10-24 10:00:20 +02:00
Dominik Schmidt
7f51803d04 Only use $(MAKE) in doc target if make is used as generator 
The old behavior broke builds with other CMake generators like Ninja as it obviously has no concept of $(MAKE)
 2017-10-17 12:50:34 +02:00
Christian Kamm
096cd348f0 Doc: Update FAQ entry on deeply nested directories #1067 2017-10-11 16:01:46 +02:00
Christian Kamm
82e87805c3 Packaging: Change directory for docs #5957 
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
 2017-09-27 09:13:44 +02:00
Olivier Goffart
8f5110900c Gui: Allow to add multiple sync folder connection of the same folder 
... or child folders

There is also no real reason to forbid the user from syncing the same
folder to multiple location on its hardrive.
A real use case is when the user uncheck a big directory using "choose
what to sync", but would still like to sync a folder within this disabled
tree. The user can now do this with the "add folder" feature

Since 2.3, we even support syncing the same local folder to multiple
remote folder, so why not allow syncing the same remote folder several
times?

Relates to issue #3645
 2017-09-18 15:17:06 +02:00
Jocelyn Turcotte
013eba0e79 Update sync-algorithm.md 
The rbtree was replaced by a std::map.
 2017-09-18 14:00:52 +02:00
Matthew Setter
ab8061a57f Fix link to download the ownCloud client 
This was requested in https://github.com/owncloud/documentation/issues/3354.
 2017-09-06 09:09:14 +02:00
Matthew Setter
f414355680 Fix broken images in FAQ 
This relates to https://github.com/owncloud/documentation/issues/3354.
 2017-09-06 09:08:53 +02:00
Martin
6e47d9a2e5 Documentation improvement for #5969 2017-08-20 18:17:58 +02:00
Matthew Setter
119ecb4259 Merge pull request #5762 from owncloud/update-docs-to-2.3.2 
Update client docs version string to 2.3.2
 2017-08-03 13:56:39 +02:00
Matthew Setter
8bd047174a Update client docs version string to 2.4.0 
Need to update this to match the latest version.
 2017-08-01 17:28:50 +02:00
Matthew Setter
3731eba9b6 Clean up the client docs removing old, outdated, content 
This makes changes as suggested by @michaelstingl in
https://github.com/owncloud/documentation/issues/3240.
 2017-07-31 14:04:02 +02:00
Olivier Goffart
075c423c62 buildint.rst: Put back reference to openssl on windows 
OpenSSL might no longer be needed to build the client, but we still need
it to run it.

That reverts part of commit 6e57b0219e for
this file.

Fix #5858
Reported in https://central.owncloud.org/t/locally-built-client-error-creating-ssl-context/8264
 2017-07-21 08:57:57 +02:00
Jürgen Weigert
186f16e688 Update building.rst 2017-07-07 16:01:20 +02:00
Olivier Goffart
6e57b0219e Don't link dirrectly against openssl 
All our crypto code is handled by qt nodaways.
No need to carry this dependency.

Especially since it causes warnings on system where there are
twp openssl version installed:
/usr/bin/ld: warning: libcrypto.so.1.0.0, needed by /usr/lib/libQt5Network.so.5.9.0, may conflict with libcrypto.so.1.1
 2017-06-13 11:27:23 +02:00
Christian Kamm
5eaae83a01 Merge remote-tracking branch 'origin/2.3' 2017-05-17 13:10:19 +02:00
Matthew Setter
84e9400742 Add explanation of how to replace local sync folder to FAQ 
This fixes owncloud/documentation/issues/2923.

(cherry picked from commit 6580af65c1)
 2017-05-11 12:07:33 +02:00
Matthew Setter
3185b0940b Increase the clarity of the checksum statements 
This comes after discussion and feedback with @phil-davis.
 2017-05-03 13:17:09 +02:00
Matthew Setter
013a0e25d5 Document the checksums addition in 10.0 
This commit documents the new checksums addition in 10.0, specifically
in the desktop client. This fixes owncloud/documentation/issues/2964.
 2017-05-02 12:48:08 +02:00
Olivier Goffart
1ed4eb46f2 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	VERSION.cmake
 2017-04-13 10:19:35 +02:00
Christian Kamm
29e34bd2c0 Doc: Update to new sync journal db name #5662 2017-04-04 10:49:26 +02:00
Christian Kamm
2841714817 owncloudcmd docs: Mention required sync-exclude.lst #5679 2017-04-04 09:38:23 +02:00
Samuel Alfageme
ae018eab42 Fixing a duplicate in the build instructions 
- The duplicate and some typos were introduced in 42aed56a5a 
- Also fixes some minor format issues. There's a lot of notes in this docs, we should refactor some.
 2017-04-03 21:19:39 +02:00
Jürgen Weigert
e2cda2dc65 Update CMakeLists.txt 
remove doc-man target in doc/CMakeLists.txt https://github.com/owncloud/client/issues/2153
 2017-03-24 18:31:29 +01:00
ajasja
090d02a65f Documented the usage of environment variables. 
In particular the `OWNCLOUD_CHUNK_SIZE` as requested per #2449.
I looked through the code and it seems the env vars override the conf file, but I'm not 100 % sure.
The `OWNCLOUD_CRITICAL_FREE_SPACE_BYTES` and `OWNCLOUD_FREE_SPACE_BYTES` are now mentioned in two places.
 2017-03-24 12:26:46 +01:00
Matthew Setter
9840ae9e96 Fix incorrect documentation for the ownCloud command-line client 
This fixes #5609.
 2017-03-20 17:29:16 +01:00
Samuel Alfageme
d375e9b86c Including some info on the proxy config. in the docs. 
This was a request of @michaelstingl to document how to configure the proxy manually via the .cfg file for config provisioning purposes.
- Restructured the bullet points into 3 different tables; I believe it's a cleaner approach; maybe this is also applicable to other sections.
- Would be logical to include also settings on proxy auth?
 2017-03-20 11:55:02 +01:00
Matthew Setter
9af7e8cff0 Revise the point about starting a clean sync 
On review, after feedback from @phil-davis, he's right that users need
to be fully briefed as to the implications of choosing a clean sync —
especially when they have a large amount of data in their account.
 2017-03-10 08:35:55 +01:00
Matthew Setter
6580af65c1 Add explanation of how to replace local sync folder to FAQ 
This fixes owncloud/documentation/issues/2923.
 2017-03-07 15:41:24 +01:00
Matthew Setter
6e4ecd11a1 Update client version from 2.2 to 2.3 (#5568) 
As the latest version of 2.3, the version information needs to be
updated as well.
 2017-03-01 13:26:49 +01:00
Matthew Setter
488b964c52 Merge branch 'master' into fix-documentation-build-process 2017-02-21 12:07:57 +01:00
Matthew Setter
b4d3f696bf Re-add the Makefile for controlling the build process 
I'm not sure, why the file was removed, it was there in 2013, but it was
removed. This commit adds it back so that the build process can be
automated in a UNIX environment.
 2017-02-21 11:58:15 +01:00
Matthew Setter
9cc4d363b2 Fix the Sphinx-doc build configuration 
I'm not sure what the configuration/setup has been like to date. But as
it stood, it didn't build successfully. Given that, I've created a copy
of doc/conf.py, included in this commit, from the default doc/conf.py.in
and set the appropriate variables as necessary.

NOTE: The build didn't work when the version, release, and latex_logo
values weren't set, either directly or with interpolatable values.
 2017-02-21 11:49:23 +01:00
Matthew Setter
b646caffd0 Merge pull request #5547 from owncloud/update-docs-build-configuration 
Create a build configuration file
 2017-02-21 09:37:01 +01:00
Matthew Setter
b9bc3e36b8 Merge pull request #5545 from owncloud/grammar-updates 
Fix grammar and spelling errors in the documentation
 2017-02-21 09:28:55 +01:00
Matthew Setter
24aaf7a034 Create a build configuration file 
This is no different from the default file, conf.py.in, except for the
specification of the logo file.
 2017-02-20 11:04:01 +01:00
Matthew Setter
80f2e40e67 Fixed grammar and spelling errors in the documentation 2017-02-20 10:52:22 +01:00
Christian Kamm
006ce854a6 Doc: For conflicts, the local file is renamed #5521 2017-02-10 12:50:35 +01:00
Matthew Setter
d75b838897 Add extra note about deleting .csync_journal.db 
This is added as per the recommendation from @guruz in #5252.
 2017-01-24 16:18:21 +01:00
Carla Schroder
4df7cab72a add note about deleting .csync_journal.db for "CSync unknown error" 2017-01-24 16:18:21 +01:00
Samuel Alfageme
72a7b7ca42 Reference to build Qt5 with qtwebkit support in the docs #5129 (#5471) 
This addresses the issue only on OS X. It should be stated though, that qtwebkit is not part of the qt5core lib and therefore a requirement for the projectto build in the rest of the OSS
 2017-01-18 14:46:47 +01:00
Matthew Setter
1f60c61f87 Update the MacOS automatic update instructions 
As requested in #5431, the automatic update instructions for MacOS X
have been simplified; removing the older, incorrect instructions.
 2017-01-18 12:55:23 +01:00
Matthew Setter
30ef794fa1 Fix several typos in the client documentation 2017-01-18 12:53:33 +01:00
Matthew Setter
e7546903cc Add an FAQ entry about the sync client's sub-directory scan limit 
As requested in #1067, this commit adds an entry to the FAQ to highlight
the fact that the sync client will never scan greater than 50
sub-directories.
 2017-01-17 11:14:52 +01:00
Matthew Setter
78e3a7e897 Revise the FAQ entry style 
This approach uses less content, and makes the content more prominent.
 2017-01-17 10:36:42 +01:00
Christian Kamm
48655ff1ec Doc: Add forceSyncInterval and timeout config file flags 2017-01-11 11:34:36 +01:00
Christian Kamm
107149d601 Doc: Improve example #5422 2017-01-03 11:31:51 +01:00
Phil Davis
23fb07240b Fix Mac PATH command 
Reported in the doc repo owncloud/documentation#1618
This version as suggested by @jturcotte
 2016-12-20 20:01:38 +01:00
Jonathan Kawohl
5bae2ed5ef fixed merge conflicts 2016-12-13 09:12:50 +01:00
ckamm
5bef1aa402 Merge pull request #5045 from owncloud/dbjournal_per_account 
Allow a folder to be synced to several accounts. This changes the path of the sync journal file!
 2016-12-06 10:55:58 +01:00
Christian Kamm
9641c7a1e7 Rename sync journal to ._sync_xxx.db. 
The added underscore means that older clients will also ignore the
file.
 2016-11-23 16:48:15 +01:00
Christian Kamm
3e59a9b316 Merge branch 'master' into dbjournal_per_account 2016-11-23 16:47:56 +01:00
Jonathan Kawohl
42aed56a5a Merge branch 'master' of https://gthub.com/Kawohl/client into Kawohl-master 
fix conflict
 2016-11-23 10:56:29 +01:00
Jonathan Kawohl
ca9ec46253 fixed note 2016-11-23 09:17:33 +01:00
Jonathan Kawohl
a92eec160a fixed review https://github.com/owncloud/client/pull/5259#pullrequestreview-9743725 2016-11-23 09:10:58 +01:00
Jonathan Kawohl
6cc63462b3 adjusted minimum version. 2016-11-21 13:53:59 +01:00
ckamm
ec7333a4bf Merge pull request #5272 from owncloud/licensefix-pending 
License: Adjust license of GPLv2 source files to GPLv2+
 2016-11-18 15:14:47 +01:00
Jonathan Kawohl
5f0167b19e removed openssl_version variable, 2016-11-09 10:25:32 +01:00
Jonathan Kawohl
58cee61624 added info on qtkeychain 
added installation info on qtkeychain
 2016-11-09 08:59:14 +01:00
Jonathan Kawohl
d23d07f99b Correcting for PR comments 2016-11-09 08:59:14 +01:00
Jonathan Kawohl
d70db810dd updated link for documentation and added more info to osx build 2016-11-09 08:59:14 +01:00
ckamm
36d61ef3a9 Doc: Add sync algorithm overview and comments (#5277) 
* Doc: Add sync algorithm overview and comments
 2016-11-08 16:10:55 +01:00
Christian Kamm
db24f60ae3 License: Adjust license of GPLv2 source files to GPLv2+ 
See #5180
 2016-10-25 11:06:54 +02:00
Jonathan Kawohl
f738cfd7fe added info on qtkeychain 
added installation info on qtkeychain
 2016-10-24 09:00:07 +02:00
Jonathan Kawohl
092c935422 Correcting for PR comments 2016-10-20 13:05:56 +02:00
Jonathan Kawohl
72d8175032 updated link for documentation and added more info to osx build 2016-10-19 11:12:11 +02:00
Klaas Freitag
9f2ae5dd17 Add a note that the source repositories need to be enabled. (#5239) 
* Add a note that the source repositories need to be enabled.

* Fix typo, is => are.
 2016-10-13 16:22:54 +02:00
Christian Kamm
f36d4562a1 Doc: Remove mention of "F5 to reset database" #5130 2016-10-07 13:22:43 +02:00
Klaas Freitag
2daf895e43 Documentation: Mention the new format for the journal file. 2016-09-02 16:19:10 +02:00
Markus Goetz
0c6788f03d conffile.rst #5052 2016-07-12 14:29:05 +02:00
Olivier Goffart
8b5f71f49e Fix docker build instruction for windows 2016-06-13 15:30:39 +02:00
Carla Schroder
43f727cf69 fix win install instructions: build path and docker image name (#4901) 2016-06-05 10:56:56 +02:00
Carla Schroder
7773380deb update file manager screenshot 2016-05-11 12:44:27 -07:00
Carla Schroder
e22050a434 updates to 2.2 user manual 2016-05-11 12:37:40 -07:00
Klaas Freitag
035058934f Documentation draft to introduce notifications. 
Also added a screenshot.
 2016-05-11 11:16:08 +02:00
Carla Schroder
030184fad9 Merge pull request #4704 from owncloud/doc_overlay_icons 
Doc: Draft overlay icons
 2016-04-22 08:40:09 -07:00
Klaas Freitag
57f0603e0e Doc: Applied review feedback for overlay icon docs. 2016-04-22 09:56:53 +02:00
Olivier Goffart
7a82fac0d5 owncloudcmd: Save the selective sync list on the first run 
For issue #4690

In the first run, the journal might not exist, we should not cancel
setting the selective sync list
 2016-04-21 12:58:10 +02:00
Daniel Molkentin
dbcb94e7d4 Update doc and Dockerfile for 2.2 builds 2016-04-21 12:25:12 +02:00
Carla Schroder
53a72148d3 a bit of editing on new section 2016-04-19 10:28:46 -07:00
Klaas Freitag
c379593c0f Doc: Draft overlay icons 2016-04-19 18:20:23 +02:00
Markus Goetz
c64720eac5 Merge pull request #4605 from RealRancor/RealRancor-patch-1 
Change note to warning in documentation
 2016-04-07 15:50:32 +02:00
Olivier Goffart
3334067d9f Merge branch '2.1' 
Conflicts:
	src/gui/socketapi.cpp
 2016-04-04 16:58:49 +02:00
Klaas Freitag
6b0d535120 Merge branch 'notifications' 2016-04-04 10:40:33 +02:00
Klaas Freitag
9f438cb768 Doc: Add milliseconds unit to notificationRefreshInterval doc 2016-03-29 14:39:12 +02:00
RealRancor
05fae8ee7f Change note to warning in documentation 2016-03-23 18:19:44 +01:00
Klaas Freitag
ea2f19b78a Docs: Add new config option for the notification sync interval. 2016-03-22 11:38:44 +01:00
Markus Goetz
57acde758b Documentation: promptDeleteAllFiles #4389 2016-03-21 15:05:49 +01:00
Christian Kamm
04faee4a0f Doc: low disk space #4443 2016-03-15 15:20:23 +01:00
Carla Schroder
0052386b41 correct OBS url for client building 2016-02-26 08:41:33 -08:00
Carla Schroder
e1909c3bd1 add OBS link for client building 2016-02-26 08:37:54 -08:00
Carla Schroder
8ce9388d29 corrections to client building instructions 2016-02-26 08:32:52 -08:00
Carla Schroder
c13637b105 improve client build instructions 2016-02-24 13:31:19 -08:00
Carla Schroder
46c3c9e0fc fix formatting 2016-02-23 09:45:30 -08:00
Carla Schroder
85f6c5fda8 Add note that branded clients have custom windows registry key names 2016-02-23 09:42:40 -08:00
Markus Goetz
86fb83261a Merge pull request #4470 from RealRancor/chunksize_config 
Add chunkSize config to documentation
 2016-02-22 15:43:12 +01:00
Hefee
28b694b170 Merge branch '2.1' 2016-02-20 10:34:34 +01:00
Carla Schroder
a32381a2a4 doc updates for 2.1.1 release 2016-02-18 10:31:51 -08:00
RealRancor
ed06fc51a0 Add chunkSize config to documentation 2016-02-12 11:34:27 +01:00
Olivier Goffart
93308faeb9 Merge remote-tracking branch 'origin/2.1' 
Conflicts:
	doc/building.rst
 2016-02-08 14:28:25 +01:00
Daniel Molkentin
65655584e9 Doc: Instruct to use sha256 for Authenticode signing 2016-02-06 15:01:31 +01:00
Daniel Molkentin
b0acc475b0 Bring build documentation up to date, use docker for Win32 xbuild 2016-02-05 14:55:29 +01:00
Daniel Molkentin
6701927840 Move ocdoc to current documentation master to catch up with new design 2016-02-04 14:21:23 +01:00
Daniel Molkentin
dd76d72d61 Merge remote-tracking branch 'origin/2.1' 2016-01-26 14:09:38 +01:00
Markus Goetz
95615eaca7 Merge pull request #4338 from owncloud/mtimes 
add note re mtime syncing
 2016-01-11 16:44:56 +01:00
Daniel Molkentin
51a70cee3d Document all owncloudcmd switches in man page/doc 
Fixes #4290
 2016-01-06 22:33:39 +01:00
Carla Schroder
aafab73a82 add note re mtime syncing 2016-01-06 12:45:23 -08:00
Olivier Goffart
639301e9e9 Merge remote-tracking branch 'origin/2.1' 
Conflicts:
	VERSION.cmake
 2016-01-04 12:38:59 +01:00
Klaas Freitag
a759ba1d9e Do not use nullptr, old compilers die on it. 2015-12-22 15:07:51 +01:00
Christian Kamm
ae806e8214 Merge remote-tracking branch 'origin/2.1' 2015-12-10 11:07:20 +01:00
Daniel Molkentin
73acad2c92 FF doc subrepo to adjust to new .org theming 2015-12-08 01:02:46 +01:00
Carla Schroder
78df3a35b4 added desktop sharing 2015-12-03 10:29:44 -08:00
Jürgen Weigert
e67bb1c5ce Merge pull request #4201 from owncloud/jnweiger-patch-1 
improved linux build instructions.
 2015-12-03 14:05:24 +01:00
Jürgen Weigert
f2c9a49c50 fixed formatting lines 212 215 2015-12-03 14:04:43 +01:00
Carla Schroder
3d71d6c96f more image fixes 2015-12-02 12:10:20 -08:00
Carla Schroder
41c3c107d4 clean up screenshot 2015-12-02 12:06:43 -08:00
Carla Schroder
24cad42a86 corrections to 2.1 user manual 2015-12-02 12:02:55 -08:00
Carla Schroder
1a564b1672 more updates to 2.1 user manual 2015-12-02 11:52:42 -08:00
Carla Schroder
339caf9dc8 updates for 2.1 release 2015-11-30 17:09:27 -08:00
Jürgen Weigert
f54f48615d Update building.rst 
ah, and the instructions miss the 'cd client' before git submodule init.
 2015-11-26 12:06:32 +01:00
Jürgen Weigert
06bb97e6d9 Update building.rst 2015-11-26 12:02:23 +01:00
Jürgen Weigert
0763f65329 improved linux build instructions. 
I am using :: lists, as the ``  versions mangle multi-line commands all in one long line.
The cmake command should just end in .., not in ../client
 2015-11-26 11:55:23 +01:00
Klaas Freitag
8abaf92083 Merge git://github.com/NvanAdrichem/client into 2.1, pull #4060 2015-11-18 17:00:19 +01:00
Daniel Molkentin
7ba88cc9e3 Merge remote-tracking branch 'origin/2.0' 2015-11-17 12:57:31 +01:00
Daniel Molkentin
914df32587 Documentation: Fix PDF logo, version number 2015-11-17 12:55:41 +01:00
Niels van Adrichem
572d9bdf1a Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/gui/share.h
 2015-11-05 14:42:26 +01:00
RealRancor
854264c3d2 Backport #4052 to 2.0 2015-11-04 15:55:07 +01:00
Niels van Adrichem
42ef09e3bb Updated documentation for Non Shibboleth authentication and customized WebDAV Paths 2015-11-03 13:43:26 +01:00