Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6a15bc26b6 
								
							 
						 
						
							
							
								
								npe check after reading image uri  
							
							 
							
							
							
						 
						
							2015-04-28 22:23:45 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d94c231a74 
								
							 
						 
						
							
							
								
								adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar)  
							
							 
							
							
							
						 
						
							2015-04-28 16:25:32 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								92d14c4a00 
								
							 
						 
						
							
							
								
								increased padding on image buttons on v21 to match material guidelines  
							
							 
							
							
							
						 
						
							2015-04-28 14:46:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								93e942f96d 
								
							 
						 
						
							
							
								
								made material icons smaller (24dp)  
							
							 
							
							
							
						 
						
							2015-04-28 14:28:51 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f3805b8bab 
								
							 
						 
						
							
							
								
								stop conference details from crashing when rotating the screen  
							
							 
							
							
							
						 
						
							2015-04-28 13:56:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								51bf8ec98e 
								
							 
						 
						
							
							
								
								fixed npe when rotating screen in contact details activity  
							
							 
							
							
							
						 
						
							2015-04-28 13:31:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b1843fb61a 
								
							 
						 
						
							
							
								
								print stack trace on io error  
							
							 
							
							
							
						 
						
							2015-04-28 09:35:10 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b10b8e2c50 
								
							 
						 
						
							
							
								
								escape nick in highlight regex pattern  
							
							 
							
							
							
						 
						
							2015-04-28 09:32:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f8e06d8e9a 
								
							 
						 
						
							
							
								
								revert undo timeout to a more reasonable value  
							
							 
							
							
							
						 
						
							2015-04-28 09:25:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a4ff8e3633 
								
							 
						 
						
							
							
								
								increased padding around switches in manage accounts  
							
							 
							
							
							
						 
						
							2015-04-27 12:19:05 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4caa92e8ff 
								
							 
						 
						
							
							
								
								handle returning from camera without picture  
							
							 
							
							
							
						 
						
							2015-04-27 12:18:27 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e11d658f5e 
								
							 
						 
						
							
							
								
								use xmppserviceconnection to send iq packets in jingle connection  
							
							 
							
							
							
						 
						
							2015-04-26 20:27:30 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c283fec0d1 
								
							 
						 
						
							
							
								
								hard code bitmap configs  
							
							 
							
							
							
						 
						
							2015-04-26 20:26:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e509105909 
								
							 
						 
						
							
							
								
								added changelog. removed deprecated todo list  
							
							 
							
							
							
						 
						
							2015-04-26 12:40:03 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								031b752906 
								
							 
						 
						
							
							
								
								version bump to 1.3.0-beta  
							
							 
							
							
							
						 
						
							2015-04-26 10:49:25 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7f2a83a684 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-04-26 10:48:36 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0fda254d48 
								
							 
						 
						
							
							
								
								Merge pull request  #1135  from BrianBlade/manage_certificates  
							
							 
							
							... 
							
							
							
							Add option to remove manually approved certificates 
							
						 
						
							2015-04-25 19:09:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5ea1c547d5 
								
							 
						 
						
							
							
								
								fixed service discovery by properly storing and checking identities  
							
							 
							
							
							
						 
						
							2015-04-25 18:24:10 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								82daf849aa 
								
							 
						 
						
							
							
								
								fixed   #1039  
							
							 
							
							
							
						 
						
							2015-04-25 14:42:32 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								77caf73103 
								
							 
						 
						
							
							
								
								Merge pull request  #1146  from BrianBlade/minor_otr_tweaks  
							
							 
							
							... 
							
							
							
							OTR: Fix onContactStatusChanged & dont archive OTR 
							
						 
						
							2015-04-25 14:09:38 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d07baccf97 
								
							 
						 
						
							
							
								
								cleaned up file handling  
							
							 
							
							
							
						 
						
							2015-04-25 14:08:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5e1492fbff 
								
							 
						 
						
							
							
								
								send invite to other instanzes after creating ad hoc conference.  fixes   #1136  
							
							 
							
							
							
						 
						
							2015-04-23 17:37:47 +02:00  
						
					 
				
					
						
							
							
								 
								BrianBlade
							
						 
						
							 
							
							
							
							
								
							
							
								d6443d9b2f 
								
							 
						 
						
							
							
								
								OTR: Fix onContactStatusChanged & dont archive OTR  
							
							 
							
							... 
							
							
							
							- Fix session handling on contact status change: Do not reset
  potentially active sessions; check peer's OTR-resource on disconnect
- use no-permanent-store hint instead of no-store to ensure
  finished messages are delivered to offline/disconnected clients
- add no-permanent-store to ask compliant servers not to archive
  OTR messages 
							
						 
						
							2015-04-21 22:35:35 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3a627f72fb 
								
							 
						 
						
							
							
								
								fixed direct invites  
							
							 
							
							
							
						 
						
							2015-04-21 18:36:11 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e9783b80d1 
								
							 
						 
						
							
							
								
								added missing translations from transifex  
							
							 
							
							
							
						 
						
							2015-04-21 10:13:28 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								cfc4fbaa10 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							 
							
							
							
						 
						
							2015-04-20 20:33:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e7972d3d11 
								
							 
						 
						
							
							
								
								pulled latest translations from transifex  
							
							 
							
							
							
						 
						
							2015-04-20 20:32:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								69b4355652 
								
							 
						 
						
							
							
								
								added reference to the location plugin to README  
							
							 
							
							
							
						 
						
							2015-04-20 16:41:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								895a28ab9d 
								
							 
						 
						
							
							
								
								added amazon app store link (us store)  
							
							 
							
							
							
						 
						
							2015-04-20 16:13:43 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5d7e1159f5 
								
							 
						 
						
							
							
								
								always hide pgp snackbar after decrypting a message.  fixes   #1075  
							
							 
							
							
							
						 
						
							2015-04-20 12:13:47 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								127b7866f0 
								
							 
						 
						
							
							
								
								removed some dead code  
							
							 
							
							
							
						 
						
							2015-04-20 11:49:44 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d2c9bf31cd 
								
							 
						 
						
							
							
								
								fixed weird touch on snackbar switched conversation bug  
							
							 
							
							... 
							
							
							
							when touching the border of the snackbar or more precisely the space between the input field and the snackbar Conversations would switch into a random conversation for yet unknown reasons. 
							
						 
						
							2015-04-20 11:39:38 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9e20a4936e 
								
							 
						 
						
							
							
								
								some code clean up to fix some rare NPE’s  
							
							 
							
							
							
						 
						
							2015-04-19 19:11:32 +02:00  
						
					 
				
					
						
							
							
								 
								BrianBlade
							
						 
						
							 
							
							
							
							
								
							
							
								da367dd752 
								
							 
						 
						
							
							
								
								Add option to remove manually approved certificates  
							
							 
							
							... 
							
							
							
							- "Remove certificates" option brings up a dialog that allows
  to delete certificates from MemorizingTrustManager's keystore
- Reconnect active accounts when certificate-settings are changed
- new preference category "Certificate options" 
							
						 
						
							2015-04-19 18:08:13 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								570a22206d 
								
							 
						 
						
							
							
								
								increased undo delay  
							
							 
							
							
							
						 
						
							2015-04-17 20:01:09 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								dbe170bd35 
								
							 
						 
						
							
							
								
								fixed a bug in DNS helper code.  fixes   #1130  
							
							 
							
							
							
						 
						
							2015-04-16 22:06:41 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								c4daa08170 
								
							 
						 
						
							
							
								
								fixed a bug in DNS helper code.  fixes   #1130  
							
							 
							
							
							
						 
						
							2015-04-16 21:56:03 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								584ffbd000 
								
							 
						 
						
							
							
								
								bumped version to 1.3.0-alpha  
							
							 
							
							
							
						 
						
							2015-04-15 16:28:44 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								65e760aefd 
								
							 
						 
						
							
							
								
								some bug fixes concerning 0byte files.  fixes   #1126  
							
							 
							
							
							
						 
						
							2015-04-15 15:36:16 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								f99e234b88 
								
							 
						 
						
							
							
								
								maintain state when rotating settings activity  
							
							 
							
							
							
						 
						
							2015-04-14 15:53:50 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								b6cc8c90a0 
								
							 
						 
						
							
							
								
								Merge branch 'BrianBlade-dont_trust_cas_preference' into development  
							
							 
							
							
							
						 
						
							2015-04-14 15:17:26 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								defb127d6e 
								
							 
						 
						
							
							
								
								Merge branch 'dont_trust_cas_preference' of  https://github.com/BrianBlade/Conversations  into BrianBlade-dont_trust_cas_preference  
							
							 
							
							... 
							
							
							
							Conflicts:
	src/main/res/values-de/strings.xml
	src/main/res/values/strings.xml 
							
						 
						
							2015-04-14 15:17:06 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								261b505f06 
								
							 
						 
						
							
							
								
								always show save button when account info was modified.  fixes   #918  
							
							 
							
							
							
						 
						
							2015-04-14 15:00:49 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								2f24b09309 
								
							 
						 
						
							
							
								
								fixed disable account when sliding and not clicking the toggle  
							
							 
							
							
							
						 
						
							2015-04-13 18:19:40 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								62faa163f0 
								
							 
						 
						
							
							
								
								fixed typos  
							
							 
							
							
							
						 
						
							2015-04-13 18:18:25 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8486f47dd9 
								
							 
						 
						
							
							
								
								Merge pull request  #1123  from lookshe/development  
							
							 
							
							... 
							
							
							
							Bugfix for issue #1121  
							
						 
						
							2015-04-13 17:57:33 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								4bf09bc10b 
								
							 
						 
						
							
							
								
								shut up linter  
							
							 
							
							
							
						 
						
							2015-04-13 17:35:20 +02:00  
						
					 
				
					
						
							
							
								 
								lookshe
							
						 
						
							 
							
							
							
							
								
							
							
								6da77bdf3b 
								
							 
						 
						
							
							
								
								Bugfix for issue  #1121  
							
							 
							
							... 
							
							
							
							check with lowercase to also match JPEG, JPeg ...
changed image url in comment 
							
						 
						
							2015-04-13 16:21:00 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								85cb1e4a37 
								
							 
						 
						
							
							
								
								Maintain private chat on MUC.  fixes   #1097  
							
							 
							
							
							
						 
						
							2015-04-13 16:00:04 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								845b39cdcc 
								
							 
						 
						
							
							
								
								fixed regression where the selected conversation wasn't highlighted anymore on tabled layout  
							
							 
							
							
							
						 
						
							2015-04-13 15:59:18 +02:00