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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						5f660bf080 
					 
					
						
						
							
							GUI: Replace term "sign in" with "Log in" and friends.  
						
						 
						
						... 
						
						
						
						Also with doc changes. 
						
						
					 
					
						2015-09-10 17:36:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hh.lohmann 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hh.lohmann 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hh.lohmann 
							
						 
					 
					
						
						
							
						
						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