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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |