42aed56a5a
Merge branch 'master' of https://gthub.com/Kawohl/client into Kawohl-master
...
fix conflict
2016-11-23 10:56:29 +01:00
ca9ec46253
fixed note
2016-11-23 09:17:33 +01:00
a92eec160a
fixed review https://github.com/owncloud/client/pull/5259#pullrequestreview-9743725
2016-11-23 09:10:58 +01:00
6cc63462b3
adjusted minimum version.
2016-11-21 13:53:59 +01:00
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
5f0167b19e
removed openssl_version variable,
2016-11-09 10:25:32 +01:00
58cee61624
added info on qtkeychain
...
added installation info on qtkeychain
2016-11-09 08:59:14 +01:00
d23d07f99b
Correcting for PR comments
2016-11-09 08:59:14 +01:00
d70db810dd
updated link for documentation and added more info to osx build
2016-11-09 08:59:14 +01:00
36d61ef3a9
Doc: Add sync algorithm overview and comments ( #5277 )
...
* Doc: Add sync algorithm overview and comments
2016-11-08 16:10:55 +01:00
db24f60ae3
License: Adjust license of GPLv2 source files to GPLv2+
...
See #5180
2016-10-25 11:06:54 +02:00
f738cfd7fe
added info on qtkeychain
...
added installation info on qtkeychain
2016-10-24 09:00:07 +02:00
092c935422
Correcting for PR comments
2016-10-20 13:05:56 +02:00
72d8175032
updated link for documentation and added more info to osx build
2016-10-19 11:12:11 +02:00
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
f36d4562a1
Doc: Remove mention of "F5 to reset database" #5130
2016-10-07 13:22:43 +02:00
2daf895e43
Documentation: Mention the new format for the journal file.
2016-09-02 16:19:10 +02:00
0c6788f03d
conffile.rst #5052
2016-07-12 14:29:05 +02:00
8b5f71f49e
Fix docker build instruction for windows
2016-06-13 15:30:39 +02:00
43f727cf69
fix win install instructions: build path and docker image name ( #4901 )
2016-06-05 10:56:56 +02:00
7773380deb
update file manager screenshot
2016-05-11 12:44:27 -07:00
e22050a434
updates to 2.2 user manual
2016-05-11 12:37:40 -07:00
035058934f
Documentation draft to introduce notifications.
...
Also added a screenshot.
2016-05-11 11:16:08 +02:00
030184fad9
Merge pull request #4704 from owncloud/doc_overlay_icons
...
Doc: Draft overlay icons
2016-04-22 08:40:09 -07:00
57f0603e0e
Doc: Applied review feedback for overlay icon docs.
2016-04-22 09:56:53 +02:00
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
dbcb94e7d4
Update doc and Dockerfile for 2.2 builds
2016-04-21 12:25:12 +02:00
53a72148d3
a bit of editing on new section
2016-04-19 10:28:46 -07:00
c379593c0f
Doc: Draft overlay icons
2016-04-19 18:20:23 +02:00
c64720eac5
Merge pull request #4605 from RealRancor/RealRancor-patch-1
...
Change note to warning in documentation
2016-04-07 15:50:32 +02:00
3334067d9f
Merge branch '2.1'
...
Conflicts:
src/gui/socketapi.cpp
2016-04-04 16:58:49 +02:00
6b0d535120
Merge branch 'notifications'
2016-04-04 10:40:33 +02:00
9f438cb768
Doc: Add milliseconds unit to notificationRefreshInterval doc
2016-03-29 14:39:12 +02:00
05fae8ee7f
Change note to warning in documentation
2016-03-23 18:19:44 +01:00
ea2f19b78a
Docs: Add new config option for the notification sync interval.
2016-03-22 11:38:44 +01:00
57acde758b
Documentation: promptDeleteAllFiles #4389
2016-03-21 15:05:49 +01:00
04faee4a0f
Doc: low disk space #4443
2016-03-15 15:20:23 +01:00
0052386b41
correct OBS url for client building
2016-02-26 08:41:33 -08:00
e1909c3bd1
add OBS link for client building
2016-02-26 08:37:54 -08:00
8ce9388d29
corrections to client building instructions
2016-02-26 08:32:52 -08:00
c13637b105
improve client build instructions
2016-02-24 13:31:19 -08:00
46c3c9e0fc
fix formatting
2016-02-23 09:45:30 -08:00
85f6c5fda8
Add note that branded clients have custom windows registry key names
2016-02-23 09:42:40 -08:00
86fb83261a
Merge pull request #4470 from RealRancor/chunksize_config
...
Add chunkSize config to documentation
2016-02-22 15:43:12 +01:00
28b694b170
Merge branch '2.1'
2016-02-20 10:34:34 +01:00
a32381a2a4
doc updates for 2.1.1 release
2016-02-18 10:31:51 -08:00
ed06fc51a0
Add chunkSize config to documentation
2016-02-12 11:34:27 +01:00
93308faeb9
Merge remote-tracking branch 'origin/2.1'
...
Conflicts:
doc/building.rst
2016-02-08 14:28:25 +01:00
65655584e9
Doc: Instruct to use sha256 for Authenticode signing
2016-02-06 15:01:31 +01:00
b0acc475b0
Bring build documentation up to date, use docker for Win32 xbuild
2016-02-05 14:55:29 +01:00
6701927840
Move ocdoc to current documentation master to catch up with new design
2016-02-04 14:21:23 +01:00
dd76d72d61
Merge remote-tracking branch 'origin/2.1'
2016-01-26 14:09:38 +01:00
95615eaca7
Merge pull request #4338 from owncloud/mtimes
...
add note re mtime syncing
2016-01-11 16:44:56 +01:00
51a70cee3d
Document all owncloudcmd switches in man page/doc
...
Fixes #4290
2016-01-06 22:33:39 +01:00
aafab73a82
add note re mtime syncing
2016-01-06 12:45:23 -08:00
639301e9e9
Merge remote-tracking branch 'origin/2.1'
...
Conflicts:
VERSION.cmake
2016-01-04 12:38:59 +01:00
a759ba1d9e
Do not use nullptr, old compilers die on it.
2015-12-22 15:07:51 +01:00
ae806e8214
Merge remote-tracking branch 'origin/2.1'
2015-12-10 11:07:20 +01:00
73acad2c92
FF doc subrepo to adjust to new .org theming
2015-12-08 01:02:46 +01:00
78df3a35b4
added desktop sharing
2015-12-03 10:29:44 -08:00
e67bb1c5ce
Merge pull request #4201 from owncloud/jnweiger-patch-1
...
improved linux build instructions.
2015-12-03 14:05:24 +01:00
f2c9a49c50
fixed formatting lines 212 215
2015-12-03 14:04:43 +01:00
3d71d6c96f
more image fixes
2015-12-02 12:10:20 -08:00
41c3c107d4
clean up screenshot
2015-12-02 12:06:43 -08:00
24cad42a86
corrections to 2.1 user manual
2015-12-02 12:02:55 -08:00
1a564b1672
more updates to 2.1 user manual
2015-12-02 11:52:42 -08:00
339caf9dc8
updates for 2.1 release
2015-11-30 17:09:27 -08:00
f54f48615d
Update building.rst
...
ah, and the instructions miss the 'cd client' before git submodule init.
2015-11-26 12:06:32 +01:00
06bb97e6d9
Update building.rst
2015-11-26 12:02:23 +01:00
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
8abaf92083
Merge git://github.com/NvanAdrichem/client into 2.1, pull #4060
2015-11-18 17:00:19 +01:00
7ba88cc9e3
Merge remote-tracking branch 'origin/2.0'
2015-11-17 12:57:31 +01:00
914df32587
Documentation: Fix PDF logo, version number
2015-11-17 12:55:41 +01:00
572d9bdf1a
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/gui/share.h
2015-11-05 14:42:26 +01:00
854264c3d2
Backport #4052 to 2.0
2015-11-04 15:55:07 +01:00
42ef09e3bb
Updated documentation for Non Shibboleth authentication and customized WebDAV Paths
2015-11-03 13:43:26 +01:00
a59c3ef278
some doc fixes & updates
2015-11-02 11:18:31 -08:00
8c5ef2f1c3
Make registry key a code block in autoupdate docs.
2015-10-31 19:05:21 +01:00
fac00348d9
Use the term folder sync connection in more places #3757
2015-10-27 12:12:21 +01:00
c7bf09c3d4
Merge remote-tracking branch 'origin/2.0'
2015-10-21 18:49:58 +02:00
daf6d8772f
update 3-dot menu
2015-10-21 09:44:38 -07:00
10f59bf3ad
Revert "Update "..." menu documentation for 2.0"
2015-10-14 09:03:08 -07:00
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
67a71ff10f
Backport #3916 to 2.0
2015-10-05 16:22:11 +02:00
8fd2b8d829
Fix linkname in architecture.rst.
2015-10-03 21:42:23 +02:00
efefc2d986
Merge branch '2.0'
...
Conflicts:
doc/images/menu.png
doc/images/settings_network.png
2015-10-02 15:44:50 +02:00
2c9d418423
Fix registry key syntax in FAQ.
2015-09-27 20:38:53 +02:00
1cb518cb13
Fix registry key syntax in FAQ.
2015-09-27 20:19:06 +02:00
8c02034838
corrections
2015-09-21 10:19:49 -07:00
caaf8c841e
perty new screenies and updates
2015-09-18 14:36:00 -07:00
5f857a49b8
restore missing image to fix build failure of PR 3838
2015-09-18 09:03:32 -07:00
68ed64e11d
remove ugly images
2015-09-17 17:44:21 -07:00
043655bd7a
nice new screenshots from windows pc
2015-09-17 17:41:22 -07:00
3ba4e38693
new screenshots and revised installation page
2015-09-16 09:45:50 -07:00
25d1defd73
move new features to introduction, fix missing images
2015-09-15 16:34:45 -07:00
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
5f660bf080
GUI: Replace term "sign in" with "Log in" and friends.
...
Also with doc changes.
2015-09-10 17:36:28 +02:00
e00cc4ed5b
/doc/autoupdate.rst: "Migrate to the following directory" => "Edit this Registry key"
...
Registry keys are no directories; you would not "migrate" to keys if you are just about to switch to them; resembling formulas as "Edit these / this Registry key/s" ease fast reading, for that also ":" instead of "::" at the end (formatting what follows)
2015-09-10 01:37:40 +02:00
0329a8be2e
/doc/autoupdate.rst: "Migrate to the following directory" => "Edit this Registry key"
...
Registry keys are no directories; you would not "migrate" to keys if you are just about to switch to them; resembling formulas as "Edit these / this Registry key/s" ease fast reading, for that also ":" instead of "::" at the end (formatting what follows)
2015-09-09 12:33:25 +02:00
79f64abfc3
/doc/autoupdate.rst: "32-/64-bit" => "32-/64-bit-Windows"
...
Should be stated clearly that there are no alternative 32- / 64-bit-ownCloud-Clients, but just a 32-bit-ownCloud-Client that is treated differently in 32- / 64-bit-Windows
2015-09-09 12:10:10 +02:00
39bff056a6
Merge remote-tracking branch 'origin/2.0'
2015-09-05 18:14:30 +02:00
b6e0802203
Doc for owncloudcmd: we only use the config of the gui client for the crendential #3293
2015-09-03 11:18:02 +02:00
3ba5e27d02
Merge branch '2.0'
2015-09-01 17:57:56 +02:00
950bc578d0
Merge branch '2.0'
2015-08-31 14:34:04 +02:00
b3a462d452
more typos
2015-08-31 11:12:47 +02:00
916f522010
typo correction
2015-08-31 11:03:14 +02:00
967b533e37
typo corrections, cross-refs
2015-08-31 10:48:43 +02:00
ab4fa905fc
updates for 2.0 release
2015-08-29 16:26:48 +02:00
45835f1cf9
Update navigating.rst
2015-08-27 10:25:19 +02:00
cf543d1eb0
Update navigating.rst
2015-08-27 10:20:15 +02:00
9f24f10186
Update installing.rst
2015-08-27 10:07:54 +02:00
bc37668e9f
1st batch of updates for 2.0
2015-08-21 13:19:15 -07:00
da93f37067
doc: Update Windows build instructions
2015-08-18 11:53:57 +02:00
bd39543542
Merge pull request #3623 from owncloud/phil-davis-conffile-20
...
Conffile doc typo 2.0
2015-08-18 11:13:46 +02:00
49949084fb
Merge pull request #3628 from owncloud/phil-davis-FAQ-20
...
FAQ Doc typo 2.0
2015-08-18 11:13:26 +02:00
b584f37906
Merge pull request #3627 from owncloud/phil-davis-troubleshooting-20
...
Troubleshooting Doc minor typos 2.0
2015-08-18 11:13:17 +02:00
70f3b91a1e
Merge pull request #3626 from owncloud/phil-davis-architecture-20
...
Architecture Doc typos and formatting 2.0
2015-08-18 11:10:54 +02:00
15545168d4
Merge pull request #3625 from owncloud/phil-davis-building-20
...
Building Doc minor corrections 2.0
2015-08-18 11:10:38 +02:00
2d797c9408
Merge pull request #3624 from owncloud/phil-davis-autoupdate-20
...
Autoupdate Doc bullet point rendering 2.0
2015-08-18 11:10:35 +02:00
8d5ffccaf1
Merge pull request #3622 from owncloud/phil-davis-navigating-20
...
Navigating doc typos 2.0
2015-08-18 11:10:29 +02:00
e54bbcd15f
FAQ Doc typo
2015-08-14 17:48:37 +05:45
149d6c32c1
Troubleshooting Doc minor typos 2.0
2015-08-14 17:46:42 +05:45
0ca3df917e
Architecture Doc typos and formatting 2.0
2015-08-14 17:43:36 +05:45
12fe59e3ce
Building Doc minor corrections
2015-08-14 17:41:02 +05:45
3bfb8f6906
Autoupdate Doc bullet point rendering 2.0
...
A space at the start of the bullet point about "Locate and open the following file" seems to be causing that bullet point to not line up nicely on the rendered page.
2015-08-14 17:38:41 +05:45
7527ee0cd3
Conffile doc typo
2015-08-14 17:35:18 +05:45
080ec49fae
Navigating doc typos
...
Some "downloading" that should be "uploading".
Some bullet points with "code" items were rendering with bold, italics on the published page. These seemed to be bullet points that had 3 spaces at the start of their 2nd line of text. Other bullet points that rendered correctly had only 2 spaces. So I removed the extra space. I hope it renders nicely in the published form - it is a bit hard to know in the GitHub Preview, because that is trying to show change-sidebars and differences also.
2015-08-14 17:32:32 +05:45
fe92186ce0
Installing doc typo 2.0
2015-08-14 17:28:47 +05:45
0735aa1fbd
Structure developer documentation
...
- rename target "doc-dev"
- group into modules
- move to doc/dev
2015-06-29 18:43:21 +02:00
8bcd0261dc
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
2015-06-15 14:03:46 +02:00
827e07700d
Documentation: Mention the git submodules
2015-06-10 16:48:34 +02:00
6ba3324035
Backport #3004 and #2978 to 1.8
2015-05-28 17:11:03 +02:00
8cfb17bca6
Backport #3279 to 1.8
2015-05-28 17:00:59 +02:00
d0f81f466e
Fix syntax issues in troubleshooting docs
2015-05-26 12:55:49 +02:00
abaf2138cf
Merge pull request #2978 from RealRancor/doc_virus_scanner
...
Add note for on-access virus scanner solutions
2015-05-26 10:32:17 +02:00
f4b82a9892
Fix typo in doc
2015-05-13 14:31:21 +02:00
8d93af21a1
Doc: Fix the section config values should be in.
2015-05-06 15:55:25 +02:00
7c0c7da9bf
Merge pull request #1928 from willyaranda/patch-1
...
Clarify the remotePollInterval variable
2015-05-06 15:53:11 +02:00
ddfb7f3b7a
Merge remote-tracking branch 'origin/1.8'
2015-04-27 12:20:11 +02:00
d1fe25cc31
Update owncloudcmd.rst
2015-04-24 11:44:38 -07:00
60c18f75b5
update owncloud and owncloudcmd docs
...
Conflicts:
doc/owncloudcmd.rst
2015-04-24 11:42:10 -07:00
c7f3791f3d
Update autoupdate.rst
2015-04-24 10:03:51 -07:00
ee9d5e6bf0
Update introduction.rst
2015-04-24 10:03:06 -07:00
7c4deec800
add more warning that 1.7 clients and older are blocked
2015-04-24 09:54:05 -07:00
1fe86bced2
note that linux users need password manager
2015-04-21 13:05:09 -07:00
8be6881093
add note to restart windows after update
2015-04-21 10:10:16 -07:00
d1e46056ae
Merge pull request #3004 from RealRancor/fix_typo
...
Docs: Added point and missing newline, fixed typo
2015-04-20 10:27:59 -07:00
d55d8c0152
add note re linux password managers
2015-03-23 10:57:05 -07:00
5b8c9eb16f
add note re password managers
2015-03-23 10:52:57 -07:00
1f327d683a
Added point and missing newline and fixed typo
2015-03-23 13:31:52 +01:00
e9ea895a01
Add note for on-access virus scanner solutions
2015-03-18 09:42:42 +01:00
dc33784a76
spelling corrections
2015-03-12 09:48:00 -07:00
961df1fc44
fix server side permissions table
2015-03-12 09:46:27 -07:00
286ad0c478
Doc: Formatting fixes
2015-03-12 16:59:12 +01:00
5a6eecd694
doc: Added snippet about custom WebDAV properties.
2015-03-11 14:11:18 +01:00
5f8af4527e
Update Windows cross build instructions for 1.8
2015-02-27 17:13:14 +01:00
23e248b5d1
shell_integration: Fetch the share menu title from the client on Windows
...
The context menu will now show "Share with ownCloud" instead of "Share" as
it does on other platforms.
This also updates the submodule to point to matching binaries.
2015-02-13 16:08:39 +01:00
07849537cf
Fix Windows building documentation issues
...
Add missing words and clear up why qtkeychain must be built in-source.
2015-02-06 17:10:35 +01:00
667665b809
Add documentation to build on Windows directly with MinGW
...
This doesn't link to the Generic Build Instructions section like other
platforms documentation does since the cmake and make commands are
different.
2015-02-04 16:57:56 +01:00
63cda04b56
remove obsolete account setup page
2015-01-30 14:05:47 -08:00
6ffc04808d
typo fixes 1.8 install
2015-01-30 12:58:42 -08:00
c932e26f83
markup and typo fixes 1.8 install page
2015-01-30 12:54:49 -08:00
682ce2e1e2
New page on installing 1.8 client
2015-01-30 12:48:12 -08:00
9873204be6
replace references to "Mirall" with "client"
2015-01-30 09:14:42 -08:00
6e4da53e31
Merge pull request #2638 from owncloud/add-slash-as-ignored-character
...
fix link and add slash as bad character
2015-01-07 15:36:09 +01:00
414ac5433d
Merge branch '1.7'
...
Conflicts:
binary
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
doc/troubleshooting.rst
2015-01-05 14:40:53 +01:00
7127b989c6
Update navigating.rst
2014-12-31 14:50:54 -08:00
3fc755d92f
Markup fixes
2014-12-31 14:48:17 -08:00
0dc43e5211
Markup corrections
2014-12-31 14:46:22 -08:00
4ddbb17a11
Update architecture.rst
...
Markup corrections
2014-12-31 14:37:28 -08:00
bfe31645ab
Markup fixes
2014-12-31 14:34:45 -08:00
09f843727d
Update and correct desktop client manual
...
Conflicts:
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
2014-12-31 14:31:35 -08:00
096511fc89
Update and correct desktop client manual
2014-12-31 11:27:52 -08:00
a6bfb23d20
Update troubleshooting.rst
...
Markup corrections
2014-12-30 18:41:50 -08:00
c2f3413dc5
Merge pull request #2652 from RealRancor/fix_typos
...
Fixed typos in docs
2014-12-29 13:41:22 -08:00
755daeb024
Update troubleshooting.rst
...
More markup fixes
2014-12-29 10:09:42 -08:00
26233ac078
Update troubleshooting.rst
...
Markup fixes
2014-12-29 10:07:52 -08:00
2ee2876855
Fixed typos in docs
2014-12-29 18:11:12 +01:00
f7ebd2e793
Markup correction
2014-12-26 08:17:15 -08:00
e250153204
fix link and add slash as bad character
2014-12-23 11:25:55 +01:00
95a380ae9e
fix typos
2014-12-10 08:24:12 -08:00
e982790ad5
Mirall--
2014-12-09 09:27:47 +01:00
3016844dd7
Merge branch 'master' into rename_client
...
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
a786511769
Clarify the remotePollInterval variable from https://github.com/owncloud/core/issues/6543
2014-11-14 11:48:30 +01:00
58f1a9bb30
Rename: Adjust documentation
2014-11-09 23:09:52 +01:00
e579504181
Merge pull request #2370 from owncloud/icons-overlay-doc
...
Add section on Overlay Icons to 'Using the Synchronization Client'
2014-11-07 16:52:26 +01:00
2c1f31cecb
Update autoupdate.rst
...
Corrected configuration file location
2014-10-29 09:56:17 -07:00
94be12b9e4
Merge branch 'updater' of https://github.com/owncloud/mirall into updater
2014-10-28 15:01:34 -07:00
1862fb77ff
Correct Linux section on disabling update notifications
2014-10-28 14:57:18 -07:00
06b619f0ed
Update autoupdate.rst
...
Typo correction
2014-10-28 12:19:05 -07:00
f5cc6cfd07
Fix typos and clean up wording
2014-10-28 11:56:49 -07:00
0f5cf00e35
Update The Automatic Updater manual page with current information
2014-10-28 11:52:58 -07:00
b7ce5ba82a
Doc: Fix build documentation, adjust it to 1.7.
...
Fixes #2365
2014-10-27 16:14:32 -04:00
95a9b0427c
doc: Fix markup in build.rst
2014-10-27 14:54:23 -04:00
9cd81d87b2
add 64-bit windows registry location
2014-10-25 07:25:18 -07:00
b5da8423a6
Update navigating.rst
2014-10-22 19:24:19 -07:00
c3de0a2d4b
Add section on Overlay Icons to 'Using the Synchronization Client'
2014-10-22 19:20:58 -07:00
6048a7143a
Revert "Remove references to qsqlite3"
...
QtWebkit needs it
This reverts commit b1c10c8454
2014-10-20 10:27:34 +02:00
b1c10c8454
Remove references to qsqlite3
2014-10-16 17:51:17 +02:00
e82b319ee7
Fix owncloud man page formatting
2014-09-18 12:30:20 +02:00
Jonathan Kawohl