Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						36cd9d9ced 
					 
					
						
						
							
							Shibboleth: Move browser window to the offset of the setup wizard  
						
						
						
						
							
						
					 
					
						2014-02-27 17:07:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						9c70ee68d2 
					 
					
						
						
							
							Mask password lineedit  
						
						
						
						
							
						
					 
					
						2014-02-27 17:07:59 +01:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						e809a59049 
					 
					
						
						
							
							Remove spurious error message.  
						
						... 
						
						
						
						Sometimes 'success' is false without apparent reason.
Just remove the message 
						
						
							
						
					 
					
						2014-02-27 17:03:42 +01:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						96c535d712 
					 
					
						
						
							
							Make the parrallel uploaded also check for problem in Shared  
						
						
						
						
							
						
					 
					
						2014-02-27 14:13:22 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						5d58a8164c 
					 
					
						
						
							
							csync: Remove get_etag  
						
						
						
						
							
						
					 
					
						2014-02-27 14:03:17 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						71cc74a0d6 
					 
					
						
						
							
							csync: Remove csync_get_local_username  
						
						
						
						
							
						
					 
					
						2014-02-27 13:55:34 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						77d9256e03 
					 
					
						
						
							
							csync: Remove more unneeded code  
						
						
						
						
							
						
					 
					
						2014-02-27 13:52:30 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						e7fb84a491 
					 
					
						
						
							
							csync: Remove capabilities  
						
						
						
						
							
						
					 
					
						2014-02-27 13:42:20 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						a652fec5a0 
					 
					
						
						
							
							csync: Remove more unused stuff  
						
						
						
						
							
						
					 
					
						2014-02-27 13:33:22 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						0d34a2bca5 
					 
					
						
						
							
							csync: Remove unused vio stuff  
						
						
						
						
							
						
					 
					
						2014-02-27 13:25:31 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						a2e8bfd962 
					 
					
						
						
							
							csync: Remove unix_extensions  
						
						
						
						
							
						
					 
					
						2014-02-27 13:23:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						33ae2eb19f 
					 
					
						
						
							
							Try to handle auth requests by a Shibboleth IdP  
						
						
						
						
							
						
					 
					
						2014-02-27 13:18:53 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						eff2427a03 
					 
					
						
						
							
							csync: Remove time_sync_required  
						
						
						
						
							
						
					 
					
						2014-02-27 13:12:21 +01:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						d4fa955950 
					 
					
						
						
							
							Don't fetch credidentials from application.cpp  
						
						... 
						
						
						
						They will be fetched by the connection validator after doing
the status.php check 
						
						
							
						
					 
					
						2014-02-27 13:06:29 +01:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						869793592d 
					 
					
						
						
							
							Merge branch '1.5'  
						
						... 
						
						
						
						Conflicts:
	VERSION.cmake
	src/mirall/owncloudpropagator.cpp
	src/mirall/owncloudpropagator.h 
						
						
							
						
					 
					
						2014-02-27 11:40:34 +01:00 
						 
				 
			
				
					
						
							
							
								Mr. Jenkins 
							
						 
					 
					
						
						
							
						
						417dbcc9ac 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						
						
						
							
						
					 
					
						2014-02-27 01:26:23 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						02bfb4f005 
					 
					
						
						
							
							Amend ChangeLog  
						
						
						
						
							
 
						
					 
					
						2014-02-26 15:08:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						d4dd5afbe7 
					 
					
						
						
							
							Revert "Make "Sign Out" forget the cookies"  
						
						... 
						
						
						
						This reverts commit 8607300195 
						
						
							
						
					 
					
						2014-02-26 15:05:15 +01:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						8607300195 
					 
					
						
						
							
							Make "Sign Out" forget the cookies  
						
						... 
						
						
						
						If we keep the cookies, next time we sign in, the entered password
does not matter as the server still think our session is logged in. 
						
						
							
						
					 
					
						2014-02-26 13:23:52 +01:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						e468ea2d68 
					 
					
						
						
							
							Avoid re-entrency in HTTPCredidential::fetch  
						
						... 
						
						
						
						It is likely to re-enter if there is two jobs that asks for a password.
Example:
 1. log out
 2. restart the application
 3. enter a wrong password
 4. enter a wrong password again a few times
 5. enter the correct password
 6. it should must not prompt for the password again.
Because of the re-entrency, it was still prompting for the password several
times after the right password had been entered 
						
						
							
						
					 
					
						2014-02-26 13:10:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						05a1f7b1bb 
					 
					
						
						
							
							Another fix for the reconnect-logic  
						
						
						
						
							
						
					 
					
						2014-02-26 11:26:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						b8a4a2d2f7 
					 
					
						
						
							
							Add ChangeLog  
						
						
						
						
							
						
					 
					
						2014-02-25 18:11:04 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						c7e70533a0 
					 
					
						
						
							
							Shibboleth: Detect also QNAM redirects  
						
						... 
						
						
						
						If a QNAM job (e.g. Quota or ETag job) gets redirected,
we'll invalidate and then prompt to re-fetch the credentials
from the user.
(The keychain credentials will be wrong so they get deleted) 
						
						
							
						
					 
					
						2014-02-25 14:22:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						d4fa06c4e1 
					 
					
						
						
							
							Fix potential crash in c_iconv on Mac OS X  
						
						
						
						
							
						
					 
					
						2014-02-25 12:48:40 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						065690c2ce 
					 
					
						
						
							
							Shibboleth: Have proper invalidation if timeout during sync  
						
						
						
						
							
						
					 
					
						2014-02-25 09:33:28 +01:00 
						 
				 
			
				
					
						
							
							
								Jenkins for ownCloud 
							
						 
					 
					
						
						
							
						
						3cb6fc82dd 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						
						
						
							
						
					 
					
						2014-02-25 02:07:10 -05:00 
						 
				 
			
				
					
						
							
							
								Mr. Jenkins 
							
						 
					 
					
						
						
							
						
						7d398b20f2 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						
						
						
							
						
					 
					
						2014-02-25 01:26:24 -05:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						75cff87316 
					 
					
						
						
							
							add missing copyright header  
						
						
						
						
							
						
					 
					
						2014-02-24 19:32:41 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						b56843ead2 
					 
					
						
						
							
							Account: Fix Metatype registratition  
						
						
						
						
							
						
					 
					
						2014-02-24 15:31:11 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						51b5f3c9b2 
					 
					
						
						
							
							Propfind Job: Print redirect URL in log  
						
						
						
						
							
						
					 
					
						2014-02-24 15:20:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						7f508c0718 
					 
					
						
						
							
							Account needs qRegisterMetaType  
						
						
						
						
							
						
					 
					
						2014-02-24 14:56:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						45a7d4ff4c 
					 
					
						
						
							
							Fix Wizard when returning from later steps  
						
						... 
						
						
						
						We need to reset the credential type when
returning to the first page from later steps.
Otherwise, unfinished credential instances
and their NAM will try to fetch data, which
will fail with weird symptoms. 
						
						
							
						
					 
					
						2014-02-24 14:56:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						995e8938ad 
					 
					
						
						
							
							SSLButton: Fix certificate display  
						
						
						
						
							
						
					 
					
						2014-02-24 14:56:56 +01:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						1e43d1fa49 
					 
					
						
						
							
							Add missing license headers in tests  
						
						... 
						
						
						
						LGPL for csync tests,  GPL for mirall tests 
						
						
							
						
					 
					
						2014-02-24 11:08:58 +01:00 
						 
				 
			
				
					
						
							
							
								Mr. Jenkins 
							
						 
					 
					
						
						
							
						
						b03e49f492 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						
						
						
							
						
					 
					
						2014-02-23 01:26:46 -05:00 
						 
				 
			
				
					
						
							
							
								Mr. Jenkins 
							
						 
					 
					
						
						
							
						
						3ed5f43e90 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						
						
						
							
						
					 
					
						2014-02-22 01:26:39 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						5c1d612761 
					 
					
						
						
							
							Account settings: Set correct state icon right away  
						
						
						
						
							
						
					 
					
						2014-02-21 21:02:35 +01:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						f92cf3dee3 
					 
					
						
						
							
							ammand last commit  
						
						... 
						
						
						
						We should not close the directory twice in the normal case 
						
						
							
						
					 
					
						2014-02-21 19:09:38 +01:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						a71cb1d3ef 
					 
					
						
						
							
							Fix potential crash in case of abort while update:  
						
						... 
						
						
						
						We need to reset ctx->remote.read_from_db  BEFORE caling vio_closedir
Otherwise, it may interpret the handle as a 'bdtree' handle instead of
a owncloud handle.
Should fix  #1442  
						
						
							
						
					 
					
						2014-02-21 16:57:24 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						4630244b51 
					 
					
						
						
							
							Windows: Special case csync_vio_local_stat  
						
						... 
						
						
						
						By not calling tstat _and_ GetFileInformationByHandle, but only
GetFileInformationByHandle, we can save some precious msec in the local
update phase. 
						
						
							
						
					 
					
						2014-02-21 14:15:34 +01:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						cd13144415 
					 
					
						
						
							
							Fix adding a file in a Shared readonly directory  
						
						... 
						
						
						
						It should not create a conflict in that case.
Also when editing a file, create a conflict using the normal way,
after downloading the file and checking it is not the same 
						
						
							
						
					 
					
						2014-02-21 10:53:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						67c07c4daa 
					 
					
						
						
							
							bump to 1.5.2  
						
						
						
						
							
						
					 
					
						2014-02-21 09:56:04 +01:00 
						 
				 
			
				
					
						
							
							
								Mr. Jenkins 
							
						 
					 
					
						
						
							
						
						7ec534067e 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						
						
						
							
						
					 
					
						2014-02-21 01:26:44 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						8e7290b450 
					 
					
						
						
							
							Fix online state handling  
						
						... 
						
						
						
						Before this commit, parts of mirall were aware of the state, but not all.
Also, the state was not set back to Connected again in all cases. This
commit introduces the following changes:
- Make QuotaInfo a member of Account
- QuotaInfo and Folder (EtagJob) can put the client in disconnected mode
- FolderMan now disables etag-polling when offline
Fixes  #1459 
Fixes  #1441  
						
						
							
						
					 
					
						2014-02-20 23:24:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						b51a722347 
					 
					
						
						
							
							Fix German translation for branch  
						
						
						
						
							
						
					 
					
						2014-02-20 23:23:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						30d0e2fee8 
					 
					
						
						
							
							Remove stray debug  
						
						
						
						
							
						
					 
					
						2014-02-20 23:23:46 +01:00 
						 
				 
			
				
					
						
							
							
								dragotin 
							
						 
					 
					
						
						
							
						
						c38c3ce6e2 
					 
					
						
						
							
							Merge pull request  #1450  from owncloud/remove-file-string  
						
						... 
						
						
						
						remove 'File' word from notification 
						
						
							
						
					 
					
						2014-02-20 17:31:57 +01:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						04647b0d61 
					 
					
						
						
							
							Handle empty passwords returning from the keychain read procedure.  
						
						... 
						
						
						
						This is needed if the keychain does not have the an QSettings based
fallback any more. 
						
						
							
						
					 
					
						2014-02-20 16:53:38 +01:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						e991bcd112 
					 
					
						
						
							
							Do not store the password in the config file. Erase it if it is there.  
						
						... 
						
						
						
						This fixes bug #1458  
						
						
							
						
					 
					
						2014-02-20 14:35:02 +01:00 
						 
				 
			
				
					
						
							
							
								Mr. Jenkins 
							
						 
					 
					
						
						
							
						
						aa02ce2481 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						
						
						
							
						
					 
					
						2014-02-20 03:17:59 -05:00