shile 
							
						 
					 
					
						
						
							
						
						891c192ebc 
					 
					
						
						
							
							Add install instructions for nextcloudcmd  
						
						 
						
						... 
						
						
						
						Signed-off-by: shile <13051960278@163.com > 
						
						
					 
					
						2020-06-03 16:10:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bruno Perel 
							
						 
					 
					
						
						
							
						
						7378ae6a7f 
					 
					
						
						
							
							Fix git merge hiccup  
						
						 
						
						
						
						
					 
					
						2020-03-02 08:05:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andre-Schuiki 
							
						 
					 
					
						
						
							
						
						4e83f3d525 
					 
					
						
						
							
							Update autoupdate.rst  
						
						 
						
						... 
						
						
						
						Hi, you have the wrong registry path in the documentation? (tested client version: 2.6.0 x64 build: 20190927)
The Nextcloud Client checks the path "HKEY_LOCAL_MACHINE\Software\Policies\Nextcloud GmbH\Nextcloud" not "HKEY_LOCAL_MACHINE\Software\Policies\Nextcloud\Nextcloud" under HKLM. 
						
						
					 
					
						2020-01-30 10:12:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roeland Jago Douma 
							
						 
					 
					
						
						
							
						
						a3aab00ca9 
					 
					
						
						
							
							Windows 7 is out of support  
						
						 
						
						... 
						
						
						
						Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl > 
						
						
					 
					
						2020-01-16 00:07:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camila Ayres 
							
						 
					 
					
						
						
							
						
						beffd726bd 
					 
					
						
						
							
							Merge branch 'master' into samu-workopen-patch-2-1  
						
						 
						
						
						
						
					 
					
						2019-10-22 15:08:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								samu-workopen 
							
						 
					 
					
						
						
							
						
						15e36c535f 
					 
					
						
						
							
							Update Step 11  
						
						 
						
						... 
						
						
						
						Step 11 is completely outdated, please replace it with: 
Enable git submodules:
$ cd desktop
$ git submodule init
$ git submodule update
Generate the build files:
$ cd build
$ cmake .. -DCMAKE_INSTALL_PREFIX=~/nextcloud-desktop-client -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 
						
						
					 
					
						2019-10-19 16:11:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								samu-workopen 
							
						 
					 
					
						
						
							
						
						e4482ef675 
					 
					
						
						
							
							Replace command line Step 5 Install Homebrew  
						
						 
						
						... 
						
						
						
						replace brew install "qt5 --with-qtwebkit" with "install qt5" otherwise it will not work 
						
						
					 
					
						2019-10-19 15:06:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								samu-workopen 
							
						 
					 
					
						
						
							
						
						09b3be25fc 
					 
					
						
						
							
							Update building instructions  
						
						 
						
						... 
						
						
						
						Added links and a description how to clone the repo 
						
						
					 
					
						2019-10-19 14:21:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ivyclare 
							
						 
					 
					
						
						
							
						
						bcdc88ecf0 
					 
					
						
						
							
							Change »Details…« to  »View more activity…«  
						
						 
						
						... 
						
						
						
						Signed-off-by: ivyclare <ivolinengong@gmail.com > 
						
						
					 
					
						2019-05-28 01:14:31 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Julius Härtl 
							
						 
					 
					
						
						
							
						
						abac2c327e 
					 
					
						
						
							
							Fix cmake build of documentation  
						
						 
						
						... 
						
						
						
						Signed-off-by: Julius Härtl <jus@bitgrid.net > 
						
						
					 
					
						2018-11-05 10:56:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roeland Jago Douma 
							
						 
					 
					
						
						
							
						
						d246c1e8b9 
					 
					
						
						
							
							Merge branch 'master' into upstream/pr/6485  
						
						 
						
						
						
						
					 
					
						2018-10-24 08:27:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dmitry Mayorov 
							
						 
					 
					
						
						
							
						
						d338c130af 
					 
					
						
						
							
							added logdebug  
						
						 
						
						
						
						
					 
					
						2018-09-09 21:36:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						2844c925eb 
					 
					
						
						
							
							Show a tray message when a folder watcher becomes unreliable  #6119  
						
						 
						
						
						
						
					 
					
						2018-08-28 17:04:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						4fa6fff1a9 
					 
					
						
						
							
							Doc: Explaining conflict files and resolving them  #6396  
						
						 
						
						
						
						
					 
					
						2018-07-03 10:18:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						e2e6b06d6c 
					 
					
						
						
							
							Update installing.rst  
						
						 
						
						
						
						
					 
					
						2018-06-06 20:50:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jürgen Weigert 
							
						 
					 
					
						
						
							
						
						caf21210a6 
					 
					
						
						
							
							update supported linux platforms  
						
						 
						
						
						
						
					 
					
						2018-06-06 20:50:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roeland Jago Douma 
							
						 
					 
					
						
						
							
						
						c1171d700e 
					 
					
						
						
							
							Merge pull request  #322  from nextcloud/upstream/pr/6404  
						
						 
						
						... 
						
						
						
						Excludes: Expand doc, Desktop.ini only in root folder 
						
						
					 
					
						2018-06-04 17:13:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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