650255e18a 
								
							 
						 
						
							
							
								
								shut up linter. fixed build  
							
							
							
						 
						
							2015-05-02 11:58:19 +02:00  
				
					
						
							
							
								 
						
							
								53fea9e1fe 
								
							 
						 
						
							
							
								
								replace send button with quick action button as long as no text has been entered  
							
							
							
						 
						
							2015-05-02 11:38:56 +02:00  
				
					
						
							
							
								 
						
							
								8617932aad 
								
							 
						 
						
							
							
								
								version bump to 1.3.0  
							
							
							
						 
						
							2015-05-01 13:52:56 +02:00  
				
					
						
							
							
								 
						
							
								e1fab8a488 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							
							
						 
						
							2015-05-01 13:52:19 +02:00  
				
					
						
							
							
								 
						
							
								bcdfdb9ccf 
								
							 
						 
						
							
							
								
								added config option to be a bit more verbose about stanza counts  
							
							
							
						 
						
							2015-04-29 16:15:07 +02:00  
				
					
						
							
							
								 
						
							
								f0d51fcb77 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							
							
						 
						
							2015-04-29 10:19:03 +02:00  
				
					
						
							
							
								 
						
							
								0624401137 
								
							 
						 
						
							
							
								
								version bump to 1.3.0-beta  
							
							
							
						 
						
							2015-04-28 22:23:59 +02:00  
				
					
						
							
							
								 
						
							
								6a15bc26b6 
								
							 
						 
						
							
							
								
								npe check after reading image uri  
							
							
							
						 
						
							2015-04-28 22:23:45 +02:00  
				
					
						
							
							
								 
						
							
								d94c231a74 
								
							 
						 
						
							
							
								
								adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar)  
							
							
							
						 
						
							2015-04-28 16:25:32 +02:00  
				
					
						
							
							
								 
						
							
								92d14c4a00 
								
							 
						 
						
							
							
								
								increased padding on image buttons on v21 to match material guidelines  
							
							
							
						 
						
							2015-04-28 14:46:52 +02:00  
				
					
						
							
							
								 
						
							
								93e942f96d 
								
							 
						 
						
							
							
								
								made material icons smaller (24dp)  
							
							
							
						 
						
							2015-04-28 14:28:51 +02:00  
				
					
						
							
							
								 
						
							
								f3805b8bab 
								
							 
						 
						
							
							
								
								stop conference details from crashing when rotating the screen  
							
							
							
						 
						
							2015-04-28 13:56:08 +02:00  
				
					
						
							
							
								 
						
							
								51bf8ec98e 
								
							 
						 
						
							
							
								
								fixed npe when rotating screen in contact details activity  
							
							
							
						 
						
							2015-04-28 13:31:33 +02:00  
				
					
						
							
							
								 
						
							
								b1843fb61a 
								
							 
						 
						
							
							
								
								print stack trace on io error  
							
							
							
						 
						
							2015-04-28 09:35:10 +02:00  
				
					
						
							
							
								 
						
							
								b10b8e2c50 
								
							 
						 
						
							
							
								
								escape nick in highlight regex pattern  
							
							
							
						 
						
							2015-04-28 09:32:58 +02:00  
				
					
						
							
							
								 
						
							
								f8e06d8e9a 
								
							 
						 
						
							
							
								
								revert undo timeout to a more reasonable value  
							
							
							
						 
						
							2015-04-28 09:25:58 +02:00  
				
					
						
							
							
								 
						
							
								a4ff8e3633 
								
							 
						 
						
							
							
								
								increased padding around switches in manage accounts  
							
							
							
						 
						
							2015-04-27 12:19:05 +02:00  
				
					
						
							
							
								 
						
							
								4caa92e8ff 
								
							 
						 
						
							
							
								
								handle returning from camera without picture  
							
							
							
						 
						
							2015-04-27 12:18:27 +02:00  
				
					
						
							
							
								 
						
							
								e11d658f5e 
								
							 
						 
						
							
							
								
								use xmppserviceconnection to send iq packets in jingle connection  
							
							
							
						 
						
							2015-04-26 20:27:30 +02:00  
				
					
						
							
							
								 
						
							
								c283fec0d1 
								
							 
						 
						
							
							
								
								hard code bitmap configs  
							
							
							
						 
						
							2015-04-26 20:26:59 +02:00  
				
					
						
							
							
								 
						
							
								e509105909 
								
							 
						 
						
							
							
								
								added changelog. removed deprecated todo list  
							
							
							
						 
						
							2015-04-26 12:40:03 +02:00  
				
					
						
							
							
								 
						
							
								031b752906 
								
							 
						 
						
							
							
								
								version bump to 1.3.0-beta  
							
							
							
						 
						
							2015-04-26 10:49:25 +02:00  
				
					
						
							
							
								 
						
							
								7f2a83a684 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							
							
						 
						
							2015-04-26 10:48:36 +02:00  
				
					
						
							
							
								 
						
							
								0fda254d48 
								
							 
						 
						
							
							
								
								Merge pull request  #1135  from BrianBlade/manage_certificates  
							
							... 
							
							
							
							Add option to remove manually approved certificates 
							
						 
						
							2015-04-25 19:09:50 +02:00  
				
					
						
							
							
								 
						
							
								5ea1c547d5 
								
							 
						 
						
							
							
								
								fixed service discovery by properly storing and checking identities  
							
							
							
						 
						
							2015-04-25 18:24:10 +02:00  
				
					
						
							
							
								 
						
							
								82daf849aa 
								
							 
						 
						
							
							
								
								fixed   #1039  
							
							
							
						 
						
							2015-04-25 14:42:32 +02:00  
				
					
						
							
							
								 
						
							
								77caf73103 
								
							 
						 
						
							
							
								
								Merge pull request  #1146  from BrianBlade/minor_otr_tweaks  
							
							... 
							
							
							
							OTR: Fix onContactStatusChanged & dont archive OTR 
							
						 
						
							2015-04-25 14:09:38 +02:00  
				
					
						
							
							
								 
						
							
								d07baccf97 
								
							 
						 
						
							
							
								
								cleaned up file handling  
							
							
							
						 
						
							2015-04-25 14:08:24 +02:00  
				
					
						
							
							
								 
						
							
								5e1492fbff 
								
							 
						 
						
							
							
								
								send invite to other instanzes after creating ad hoc conference.  fixes   #1136  
							
							
							
						 
						
							2015-04-23 17:37:47 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								3a627f72fb 
								
							 
						 
						
							
							
								
								fixed direct invites  
							
							
							
						 
						
							2015-04-21 18:36:11 +02:00  
				
					
						
							
							
								 
						
							
								e9783b80d1 
								
							 
						 
						
							
							
								
								added missing translations from transifex  
							
							
							
						 
						
							2015-04-21 10:13:28 +02:00  
				
					
						
							
							
								 
						
							
								cfc4fbaa10 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							
							
						 
						
							2015-04-20 20:33:04 +02:00  
				
					
						
							
							
								 
						
							
								e7972d3d11 
								
							 
						 
						
							
							
								
								pulled latest translations from transifex  
							
							
							
						 
						
							2015-04-20 20:32:50 +02:00  
				
					
						
							
							
								 
						
							
								69b4355652 
								
							 
						 
						
							
							
								
								added reference to the location plugin to README  
							
							
							
						 
						
							2015-04-20 16:41:24 +02:00  
				
					
						
							
							
								 
						
							
								895a28ab9d 
								
							 
						 
						
							
							
								
								added amazon app store link (us store)  
							
							
							
						 
						
							2015-04-20 16:13:43 +02:00  
				
					
						
							
							
								 
						
							
								5d7e1159f5 
								
							 
						 
						
							
							
								
								always hide pgp snackbar after decrypting a message.  fixes   #1075  
							
							
							
						 
						
							2015-04-20 12:13:47 +02:00  
				
					
						
							
							
								 
						
							
								127b7866f0 
								
							 
						 
						
							
							
								
								removed some dead code  
							
							
							
						 
						
							2015-04-20 11:49:44 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								9e20a4936e 
								
							 
						 
						
							
							
								
								some code clean up to fix some rare NPE’s  
							
							
							
						 
						
							2015-04-19 19:11:32 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								570a22206d 
								
							 
						 
						
							
							
								
								increased undo delay  
							
							
							
						 
						
							2015-04-17 20:01:09 +02:00  
				
					
						
							
							
								 
						
							
								dbe170bd35 
								
							 
						 
						
							
							
								
								fixed a bug in DNS helper code.  fixes   #1130  
							
							
							
						 
						
							2015-04-16 22:06:41 +02:00  
				
					
						
							
							
								 
						
							
								c4daa08170 
								
							 
						 
						
							
							
								
								fixed a bug in DNS helper code.  fixes   #1130  
							
							
							
						 
						
							2015-04-16 21:56:03 +02:00  
				
					
						
							
							
								 
						
							
								584ffbd000 
								
							 
						 
						
							
							
								
								bumped version to 1.3.0-alpha  
							
							
							
						 
						
							2015-04-15 16:28:44 +02:00  
				
					
						
							
							
								 
						
							
								65e760aefd 
								
							 
						 
						
							
							
								
								some bug fixes concerning 0byte files.  fixes   #1126  
							
							
							
						 
						
							2015-04-15 15:36:16 +02:00  
				
					
						
							
							
								 
						
							
								f99e234b88 
								
							 
						 
						
							
							
								
								maintain state when rotating settings activity  
							
							
							
						 
						
							2015-04-14 15:53:50 +02:00  
				
					
						
							
							
								 
						
							
								b6cc8c90a0 
								
							 
						 
						
							
							
								
								Merge branch 'BrianBlade-dont_trust_cas_preference' into development  
							
							
							
						 
						
							2015-04-14 15:17:26 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								261b505f06 
								
							 
						 
						
							
							
								
								always show save button when account info was modified.  fixes   #918  
							
							
							
						 
						
							2015-04-14 15:00:49 +02:00