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
Carla Schroder
a59c3ef278
some doc fixes & updates
2015-11-02 11:18:31 -08:00
RealRancor
8c5ef2f1c3
Make registry key a code block in autoupdate docs.
2015-10-31 19:05:21 +01:00
Olivier Goffart
fac00348d9
Use the term folder sync connection in more places #3757
2015-10-27 12:12:21 +01:00
Daniel Molkentin
c7bf09c3d4
Merge remote-tracking branch 'origin/2.0'
2015-10-21 18:49:58 +02:00
Carla Schroder
daf6d8772f
update 3-dot menu
2015-10-21 09:44:38 -07:00
Carla Schroder
10f59bf3ad
Revert "Update "..." menu documentation for 2.0"
2015-10-14 09:03:08 -07:00
Phil Davis
0f4e88eeaa
Update "..." menu documentation for 2.0
...
This menu in 2.0.* now has 4 options.
The small screenshot needs updating also. @carlaschroder it is probably best if you take a new screen shot from whatever client version you have been using for screen shots. That way they will all have a consistent look.
2015-10-08 12:28:15 +05:45
RealRancor
67a71ff10f
Backport #3916 to 2.0
2015-10-05 16:22:11 +02:00
RealRancor
8fd2b8d829
Fix linkname in architecture.rst.
2015-10-03 21:42:23 +02:00
Christian Kamm
efefc2d986
Merge branch '2.0'
...
Conflicts:
doc/images/menu.png
doc/images/settings_network.png
2015-10-02 15:44:50 +02:00
RealRancor
2c9d418423
Fix registry key syntax in FAQ.
2015-09-27 20:38:53 +02:00
RealRancor
1cb518cb13
Fix registry key syntax in FAQ.
2015-09-27 20:19:06 +02:00
Carla Schroder
8c02034838
corrections
2015-09-21 10:19:49 -07:00
Carla Schroder
caaf8c841e
perty new screenies and updates
2015-09-18 14:36:00 -07:00
Carla Schroder
5f857a49b8
restore missing image to fix build failure of PR 3838
2015-09-18 09:03:32 -07:00
Carla Schroder
68ed64e11d
remove ugly images
2015-09-17 17:44:21 -07:00
Carla Schroder
043655bd7a
nice new screenshots from windows pc
2015-09-17 17:41:22 -07:00
Carla Schroder
3ba4e38693
new screenshots and revised installation page
2015-09-16 09:45:50 -07:00
Carla Schroder
25d1defd73
move new features to introduction, fix missing images
2015-09-15 16:34:45 -07:00
Phil Davis
429f8229b3
Adjust log out description
...
Note: This whole doc needs review and updating of text and screen shots for 2.0 multi-account client.
2015-09-10 22:12:24 +05:45
