iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							db6a63bcf6 
							
						 
					 
					
						
						
							
							open location directly from notification  
						
						
						
					 
					
						2015-03-10 21:46:13 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5132cd7234 
							
						 
					 
					
						
						
							
							show geo uris as 'location' in overview  
						
						
						
					 
					
						2015-03-10 17:20:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a5321e41f 
							
						 
					 
					
						
						
							
							Merge pull request  #1022  from Boris-de/cipher_blacklist  
						
						... 
						
						
						
						disable all really weak cipher suites 
						
					 
					
						2015-03-08 11:28:39 +01:00 
						 
				 
			
				
					
						
							
							
								Boris Wachtmeister 
							
						 
					 
					
						
						
						
						
							
						
						
							67f8ed44bd 
							
						 
					 
					
						
						
							
							disable all really weak cipher suites  
						
						... 
						
						
						
						With #959  all ciphers of the platform were enabled, but this also
includes several suites that are considered as very weak, even down to
NULL- and anon-ciphers which disable completely disable encryption
and/or authentication. Especially the anon-ciphers could be easily used
for a mitm-attack.
To remove all weak ciphers a blacklist with patterns of cipher-names was
added to Config.java. The blacklist is based on the "mandatory discards"
that Mozilla suggests to not use for TLS-servers because they are weak
or known to be broken.
https://wiki.mozilla.org/Security/Server_Side_TLS#Mandatory_discards  
						
					 
					
						2015-03-07 15:48:29 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							87a048fe6f 
							
						 
					 
					
						
						
							
							display geo uris as location. show 'send loction' in share menu if request location intent can be resolved  
						
						
						
					 
					
						2015-03-07 14:15:38 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cbca92d209 
							
						 
					 
					
						
						
							
							fixed enter is send option  
						
						
						
					 
					
						2015-03-06 22:22:50 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							44028a547f 
							
						 
					 
					
						
						
							
							fixed npe in message parser  
						
						
						
					 
					
						2015-03-06 21:14:55 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f25a824610 
							
						 
					 
					
						
						
							
							avoid unnecessary thread creation  
						
						
						
					 
					
						2015-03-05 15:46:33 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c5230e081c 
							
						 
					 
					
						
						
							
							added config option to disable string prep in jids  
						
						
						
					 
					
						2015-03-05 10:15:04 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e10c4e78f1 
							
						 
					 
					
						
						
							
							experimantal in memory jid caching  
						
						
						
					 
					
						2015-03-04 19:56:24 +01:00 
						 
				 
			
				
					
						
							
							
								Quentin 
							
						 
					 
					
						
						
						
						
							
						
						
							fb3740f07b 
							
						 
					 
					
						
						
							
							Green led color is better with "full-green"  
						
						
						
					 
					
						2015-03-04 00:57:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac577fe4fd 
							
						 
					 
					
						
						
							
							added methods to count number of unread messages  
						
						
						
					 
					
						2015-03-02 11:53:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ff86fa6049 
							
						 
					 
					
						
						
							
							mark all sent messages up to a marker as displayed  
						
						
						
					 
					
						2015-03-01 14:15:40 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d318af098d 
							
						 
					 
					
						
						
							
							merge messages with related status (unsend, send, send_received)  
						
						
						
					 
					
						2015-03-01 12:05:54 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							864c709c96 
							
						 
					 
					
						
						
							
							catching out of memory run time exception in hasEnabledAccounts()  
						
						
						
					 
					
						2015-02-28 12:03:53 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0d6907f1e0 
							
						 
					 
					
						
						
							
							pulled new translations from transifex  
						
						
						
					 
					
						2015-02-27 17:20:41 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							98df008bce 
							
						 
					 
					
						
						
							
							use conversations green in notification led  
						
						
						
					 
					
						2015-02-27 17:16:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c2ddd74d7f 
							
						 
					 
					
						
						
							
							Merge pull request  #1006  from QuentinC/development  
						
						... 
						
						
						
						Some changes to the LED color in notifications ! 
						
					 
					
						2015-02-27 17:07:30 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f3be0d99cc 
							
						 
					 
					
						
						
							
							don't add users with null nicks to muc user list  
						
						
						
					 
					
						2015-02-27 17:04:13 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6ad4865d96 
							
						 
					 
					
						
						
							
							hide change password menu item if server feature is unavailable  
						
						
						
					 
					
						2015-02-27 17:03:13 +01:00 
						 
				 
			
				
					
						
							
							
								QuentinC 
							
						 
					 
					
						
						
						
						
							
						
						
							c67a481e4b 
							
						 
					 
					
						
						
							
							Update NotificationService.java  
						
						... 
						
						
						
						Revert led light color 
						
					 
					
						2015-02-27 11:18:15 +01:00 
						 
				 
			
				
					
						
							
							
								Quentin 
							
						 
					 
					
						
						
						
						
							
						
						
							71ce73a271 
							
						 
					 
					
						
						
							
							- Update mBuilder in NotificationService.java to ensure that the led is displayed at the right color.  
						
						... 
						
						
						
						CF: http://stackoverflow.com/questions/14953793/android-notification-led-doesnt-use-my-color#comment20991762_14953793 
- Changed led Color to green to remember the icon color and led times 
						
					 
					
						2015-02-27 00:33:49 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a022e4b41a 
							
						 
					 
					
						
						
							
							reset error status in edit account when reconnecting  
						
						
						
					 
					
						2015-02-26 17:17:40 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9e10c3841e 
							
						 
					 
					
						
						
							
							check for null in jid parser  
						
						
						
					 
					
						2015-02-26 16:56:07 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fa45ceabc9 
							
						 
					 
					
						
						
							
							initilize keys with jsonobject value on parse error  
						
						
						
					 
					
						2015-02-26 16:55:49 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b8bc70aaa0 
							
						 
					 
					
						
						
							
							prevent next button from showing up too early on account setup  
						
						
						
					 
					
						2015-02-25 23:48:45 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3e8314459c 
							
						 
					 
					
						
						
							
							pulled new translations from transifex  
						
						
						
					 
					
						2015-02-23 21:56:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8319446c03 
							
						 
					 
					
						
						
							
							reset incoming chat state when going into background  
						
						
						
					 
					
						2015-02-23 21:47:35 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7a62fbbeae 
							
						 
					 
					
						
						
							
							get rid of some useless debugging  
						
						
						
					 
					
						2015-02-23 12:05:18 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							da2da75756 
							
						 
					 
					
						
						
							
							init mode (first start) for StartConversationActivity (no up button) and avoid being started multiple times.  fixed   #995  
						
						
						
					 
					
						2015-02-22 13:24:29 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7259e666ea 
							
						 
					 
					
						
						
							
							look at 5 muc users instead of 4 for tile cache clearing  
						
						
						
					 
					
						2015-02-22 13:16:07 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f52bc4f0be 
							
						 
					 
					
						
						
							
							properly remove invalid avatar  
						
						
						
					 
					
						2015-02-22 13:15:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3db5a48529 
							
						 
					 
					
						
						
							
							clear muc tiles cache only when necessary  
						
						
						
					 
					
						2015-02-21 22:19:10 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7ee5e95959 
							
						 
					 
					
						
						
							
							added typing notifications through XEP-0085.  fixed   #210  
						
						
						
					 
					
						2015-02-21 11:06:52 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f26f6e9a00 
							
						 
					 
					
						
						
							
							fixed   #993  
						
						
						
					 
					
						2015-02-19 14:36:52 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2e596c0bd4 
							
						 
					 
					
						
						
							
							launch edit account activity when starting Conversations for the first time (fixed regression)  
						
						
						
					 
					
						2015-02-19 13:48:40 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5003d1f549 
							
						 
					 
					
						
						
							
							made xmpp uris case insensitive  
						
						
						
					 
					
						2015-02-18 18:23:13 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9c2e6392ec 
							
						 
					 
					
						
						
							
							always call to cancel before loading new avatars  
						
						
						
					 
					
						2015-02-18 18:12:43 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b128b33e56 
							
						 
					 
					
						
						
							
							always go through reconnect method instead of just starting XmppConnection threads  
						
						
						
					 
					
						2015-02-18 13:37:26 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							da2bc6db23 
							
						 
					 
					
						
						
							
							avoid weird npe.  fixed   #991  
						
						
						
					 
					
						2015-02-18 13:11:41 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a8ec36cda8 
							
						 
					 
					
						
						
							
							limit ui refresh rate  
						
						
						
					 
					
						2015-02-17 14:18:35 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							67d5ee6b71 
							
						 
					 
					
						
						
							
							moved roster loading to async task as well  
						
						
						
					 
					
						2015-02-17 11:51:11 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							62b15a5d26 
							
						 
					 
					
						
						
							
							refresh list view more often  
						
						
						
					 
					
						2015-02-17 09:53:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a6e6959614 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-02-16 16:56:40 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4e14c89ff8 
							
						 
					 
					
						
						
							
							support for XEP-0092: Software Version  
						
						
						
					 
					
						2015-02-16 10:06:09 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5aa600c638 
							
						 
					 
					
						
						
							
							fixed avatar cache lookup in ListItemAdapter  
						
						
						
					 
					
						2015-02-16 00:58:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							178004996b 
							
						 
					 
					
						
						
							
							Merge pull request  #986  from singpolyma/vitelity-s.ms-compatability  
						
						... 
						
						
						
						Vitelity's s.ms service requires <body> first 
						
					 
					
						2015-02-15 23:28:22 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							146edb8c81 
							
						 
					 
					
						
						
							
							made image view background more colorful while waiting on actual avatar to load  
						
						
						
					 
					
						2015-02-15 23:25:35 +01:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
						
						
							
						
						
							00fa6f89d6 
							
						 
					 
					
						
						
							
							Vitelity's s.ms service requires <body> first  
						
						... 
						
						
						
						If the <body> tag is not first, their bot just silently drops the
stanza.  I know we shouldn't have to care about order, and I'm trying to
get them to fix it, but it's not high-priority for them since "most"
clients seem to work, so I'd like this workaround in. 
						
					 
					
						2015-02-15 14:18:41 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0485da8488 
							
						 
					 
					
						
						
							
							loading avatars in seperate tasks  
						
						
						
					 
					
						2015-02-15 18:48:05 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e68c6a1b74 
							
						 
					 
					
						
						
							
							load messages asynchronously  
						
						
						
					 
					
						2015-02-12 18:53:00 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							45de788773 
							
						 
					 
					
						
						
							
							use time instead of uptime for unmute  
						
						
						
					 
					
						2015-02-12 18:52:10 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							44ee746681 
							
						 
					 
					
						
						
							
							added actions to error notification  
						
						
						
					 
					
						2015-02-10 17:13:34 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6c8b82dd66 
							
						 
					 
					
						
						
							
							strip fractional seconds from timestamp before parsing  
						
						
						
					 
					
						2015-02-10 11:11:01 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							af0c979f45 
							
						 
					 
					
						
						
							
							disabled cipher logging  
						
						
						
					 
					
						2015-02-09 16:41:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3260d620e 
							
						 
					 
					
						
						
							
							Merge pull request  #959  from SamWhited/ciphers_fix  
						
						... 
						
						
						
						Ciphers fix 
						
					 
					
						2015-02-09 16:04:54 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							026be61b72 
							
						 
					 
					
						
						
							
							don't show 'enter pgp key' in non encrypted chats  
						
						
						
					 
					
						2015-02-09 16:01:30 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							16dc13e4df 
							
						 
					 
					
						
						
							
							always add a non resolved SRV record to the list  
						
						
						
					 
					
						2015-02-09 11:54:20 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ac309efcc8 
							
						 
					 
					
						
						
							
							made delay timestamp parser accept nano seconds  
						
						
						
					 
					
						2015-02-09 11:53:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ae8c021c16 
							
						 
					 
					
						
						
							
							sort users in muc  
						
						
						
					 
					
						2015-02-07 12:29:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							00b2e30938 
							
						 
					 
					
						
						
							
							trim message bodys on display  
						
						
						
					 
					
						2015-02-07 12:29:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e1e09d5cba 
							
						 
					 
					
						
						
							
							refactored how snackbar is displayed  
						
						
						
					 
					
						2015-02-07 12:17:03 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							03d30e4fdb 
							
						 
					 
					
						
						
							
							Use platform ciphers as well, just prefer ours  
						
						
						
					 
					
						2015-02-02 11:16:22 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bd3fccd2dc 
							
						 
					 
					
						
						
							
							don't disable any ciphers  
						
						
						
					 
					
						2015-02-02 14:22:49 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							206fd3fc4b 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2015-02-02 13:56:32 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6674a3d757 
							
						 
					 
					
						
						
							
							added more ciphers for old openssl versions  
						
						
						
					 
					
						2015-02-02 13:55:56 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							1650565bb0 
							
						 
					 
					
						
						
							
							Remove another unused resource  
						
						
						
					 
					
						2015-02-01 16:02:59 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a4f4fe95ac 
							
						 
					 
					
						
						
							
							Merge pull request  #955  from SamWhited/unused_resources  
						
						... 
						
						
						
						Remove unused resources 
						
					 
					
						2015-02-01 17:41:42 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e0af29f0a3 
							
						 
					 
					
						
						
							
							pulled spanish translations again  
						
						
						
					 
					
						2015-02-01 17:33:36 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							735fc655e9 
							
						 
					 
					
						
						
							
							Remove unused resources  
						
						
						
					 
					
						2015-02-01 11:32:11 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							33530a9e30 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-02-01 17:04:29 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							ce5c6c6257 
							
						 
					 
					
						
						
							
							Removes some unused strings (the legacy SSL stuff)  
						
						
						
					 
					
						2015-02-01 08:58:35 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d0e764c1a5 
							
						 
					 
					
						
						
							
							fixed text preview for images  
						
						
						
					 
					
						2015-02-01 12:32:19 +01:00 
						 
				 
			
				
					
						
							
							
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							e76a9c06c3 
							
						 
					 
					
						
						
							
							Remove title_activity_conversations and use app_name instead  
						
						
						
					 
					
						2015-01-30 17:02:53 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3216813e49 
							
						 
					 
					
						
						
							
							made version codes ready for release candidate in beta channel  
						
						
						
					 
					
						2015-01-29 23:56:04 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3a52f31824 
							
						 
					 
					
						
						
							
							don't count when attempt failed completly  
						
						
						
					 
					
						2015-01-29 23:35:31 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6c3ea7f2bd 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2015-01-29 23:26:41 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f2bf64d19d 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2015-01-29 23:20:01 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							48604a6620 
							
						 
					 
					
						
						
							
							Use Material Design Icons on API 21+  
						
						
						
					 
					
						2015-01-29 15:28:26 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0eeead495f 
							
						 
					 
					
						
						
							
							properly clear notifications.  fixed   #921  
						
						
						
					 
					
						2015-01-29 13:20:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c237a55093 
							
						 
					 
					
						
						
							
							Merge pull request  #941  from SamWhited/snackbar_ordering  
						
						... 
						
						
						
						Show errors before mute snackbar 
						
					 
					
						2015-01-28 13:08:26 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3c64839daf 
							
						 
					 
					
						
						
							
							fixed broken caps  
						
						
						
					 
					
						2015-01-28 00:28:00 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8cbf610bb2 
							
						 
					 
					
						
						
							
							Show errors before mute snackbar  
						
						... 
						
						
						
						See #939  
						
					 
					
						2015-01-27 08:49:03 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8b662e7f8 
							
						 
					 
					
						
						
							
							muc tics for consistency  
						
						
						
					 
					
						2015-01-26 01:25:47 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2a14a0d9b8 
							
						 
					 
					
						
						
							
							changed version code and version name to 1.0-beta2  
						
						
						
					 
					
						2015-01-26 00:50:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							91e85d2faf 
							
						 
					 
					
						
						
							
							adapt caps on whether or not message confirmation is on  
						
						
						
					 
					
						2015-01-26 00:48:56 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							94086bb9b7 
							
						 
					 
					
						
						
							
							don't put ejabberds status code muc messages into an actual conversation  
						
						
						
					 
					
						2015-01-26 00:26:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f0d428a56d 
							
						 
					 
					
						
						
							
							made connect time out more failsave  
						
						
						
					 
					
						2015-01-25 20:52:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4afdd6480a 
							
						 
					 
					
						
						
							
							Merge pull request  #930  from betheg/otr  
						
						... 
						
						
						
						otr: switch to the otr-state the partner alternate. 
						
					 
					
						2015-01-25 20:53:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1559144701 
							
						 
					 
					
						
						
							
							Merge pull request  #933  from betheg/mergeable  
						
						... 
						
						
						
						fix mergable() for /me command. 
						
					 
					
						2015-01-25 19:30:00 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							29331e49b9 
							
						 
					 
					
						
						
							
							fix mergable() for /me command.  
						
						
						
					 
					
						2015-01-25 16:58:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							14fc520ec0 
							
						 
					 
					
						
						
							
							updated translations  
						
						
						
					 
					
						2015-01-25 16:36:57 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							82a74fabc9 
							
						 
					 
					
						
						
							
							set jingle file transfer to offer after iq offer has returned  
						
						
						
					 
					
						2015-01-25 16:32:59 +01:00 
						 
				 
			
				
					
						
							
							
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							0f3fb3ab43 
							
						 
					 
					
						
						
							
							Czech translation  
						
						... 
						
						
						
						for "hide offline" added 
						
					 
					
						2015-01-25 16:18:09 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							7800647885 
							
						 
					 
					
						
						
							
							otr: switch to the otr-state the partner alternate.  
						
						... 
						
						
						
						should also fixed  #877  
						
					 
					
						2015-01-25 13:07:31 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							8041d23cb1 
							
						 
					 
					
						
						
							
							MessageParser: fix the regex for otr query messages.  
						
						
						
					 
					
						2015-01-24 16:19:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7769d305e6 
							
						 
					 
					
						
						
							
							Merge pull request  #924  from andersruneson/changeonlinecolor  
						
						... 
						
						
						
						Changed online color to green instead of primary 
						
					 
					
						2015-01-24 00:28:29 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b9af38464e 
							
						 
					 
					
						
						
							
							fixed mam to work with muc  
						
						
						
					 
					
						2015-01-24 00:22:51 +01:00 
						 
				 
			
				
					
						
							
							
								Anders Sandblad 
							
						 
					 
					
						
						
						
						
							
						
						
							cbebd14dbd 
							
						 
					 
					
						
						
							
							Changed online color to green instead of primary  
						
						
						
					 
					
						2015-01-23 22:28:10 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4e50098e31 
							
						 
					 
					
						
						
							
							show checkbox to hide offline contacts  
						
						
						
					 
					
						2015-01-21 17:24:02 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2dc69eea68 
							
						 
					 
					
						
						
							
							fixed bug in find conference in database method  
						
						
						
					 
					
						2015-01-21 16:18:57 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							00c74503ab 
							
						 
					 
					
						
						
							
							deal with user entering full jids in join conference dialog  
						
						
						
					 
					
						2015-01-21 16:18:38 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							be9af442ef 
							
						 
					 
					
						
						
							
							always allow access to contact details. provide add button in contact details  
						
						
						
					 
					
						2015-01-21 15:31:40 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							764ef3c8cd 
							
						 
					 
					
						
						
							
							Add block/unblock to contact details menu  
						
						... 
						
						
						
						See #889  
						
					 
					
						2015-01-21 13:07:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							818c0e609c 
							
						 
					 
					
						
						
							
							Merge pull request  #908  from betheg/otr4j  
						
						... 
						
						
						
						otr4j: update to 0.22 
						
					 
					
						2015-01-21 11:48:42 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e42e0f88e1 
							
						 
					 
					
						
						
							
							Add color / category to foreground notification  
						
						
						
					 
					
						2015-01-20 20:32:27 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7839438f51 
							
						 
					 
					
						
						
							
							changed message duplicate finder  
						
						
						
					 
					
						2015-01-20 22:54:58 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6dc53c2b35 
							
						 
					 
					
						
						
							
							fixed missing image preview  
						
						
						
					 
					
						2015-01-20 22:54:26 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							04f4680582 
							
						 
					 
					
						
						
							
							fixed up button on v21 devices  
						
						
						
					 
					
						2015-01-20 22:53:45 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							fa7d748c3f 
							
						 
					 
					
						
						
							
							otr4j: update to 0.22  
						
						
						
					 
					
						2015-01-20 18:01:39 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							32a16137df 
							
						 
					 
					
						
						
							
							Fixed action bar search for Android 5.0  
						
						
						
					 
					
						2015-01-20 14:53:47 +01:00 
						 
				 
			
				
					
						
							
							
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							7e4053abff 
							
						 
					 
					
						
						
							
							Czech translation updated  
						
						... 
						
						
						
						for Conversations 
						
					 
					
						2015-01-19 19:07:43 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							503237087f 
							
						 
					 
					
						
						
							
							Remove legacy SSL support  
						
						
						
					 
					
						2015-01-19 11:02:13 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1e607d7b1b 
							
						 
					 
					
						
						
							
							don't trim bodies  
						
						
						
					 
					
						2015-01-19 12:15:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c5d087ad55 
							
						 
					 
					
						
						
							
							fetched translations from transifex  
						
						
						
					 
					
						2015-01-19 12:14:55 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4cbf8120f5 
							
						 
					 
					
						
						
							
							fixed legacy translation of image received  
						
						
						
					 
					
						2015-01-19 12:14:30 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e5dffcfb07 
							
						 
					 
					
						
						
							
							added changelog for 1.0  
						
						
						
					 
					
						2015-01-19 11:32:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							100ba6e7e7 
							
						 
					 
					
						
						
							
							check for deleted files when loading more messages from history  
						
						
						
					 
					
						2015-01-19 11:23:05 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7af588c8b3 
							
						 
					 
					
						
						
							
							account for rounding errors when rescheduling wake up  
						
						
						
					 
					
						2015-01-19 11:17:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fc2e458053 
							
						 
					 
					
						
						
							
							fixed bug when sharing files from google drive  
						
						
						
					 
					
						2015-01-18 20:27:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							149a6716b8 
							
						 
					 
					
						
						
							
							proper desc for offering and sending images in conversations overview  
						
						
						
					 
					
						2015-01-18 20:26:22 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6756386eee 
							
						 
					 
					
						
						
							
							explain read marker  
						
						
						
					 
					
						2015-01-18 13:44:18 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d58fadd05f 
							
						 
					 
					
						
						
							
							use same helper methods for images and files  
						
						
						
					 
					
						2015-01-18 13:00:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d453e5501b 
							
						 
					 
					
						
						
							
							Merge pull request  #899  from SamWhited/api21_notifications  
						
						... 
						
						
						
						Add some Android 21 notification features 
						
					 
					
						2015-01-18 11:58:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							78ac43cfa2 
							
						 
					 
					
						
						
							
							Merge pull request  #901  from kriztan/patch-2  
						
						... 
						
						
						
						Added new file type names for file transfers 
						
					 
					
						2015-01-18 11:57:34 +01:00 
						 
				 
			
				
					
						
							
							
								Christian S 
							
						 
					 
					
						
						
						
						
							
						
						
							ae16439bd6 
							
						 
					 
					
						
						
							
							Added new file type names for file transfers  
						
						... 
						
						
						
						- apk
- vcard 
						
					 
					
						2015-01-18 11:17:27 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							99989cd1d5 
							
						 
					 
					
						
						
							
							Add some Android 21 notification features  
						
						
						
					 
					
						2015-01-17 23:41:57 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							83c806a774 
							
						 
					 
					
						
						
							
							Fix string substitutions with unknown filetypes  
						
						
						
					 
					
						2015-01-17 20:53:25 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							dfc1cea882 
							
						 
					 
					
						
						
							
							Correct the download file string on notifications  
						
						... 
						
						
						
						Fixes  #896  
					
						2015-01-17 09:11:04 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							edd58f19b4 
							
						 
					 
					
						
						
							
							Add download button on notification if applicable  
						
						
						
					 
					
						2015-01-16 01:10:01 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dc8b467cf6 
							
						 
					 
					
						
						
							
							sending read marker when resuming activity and conversation is open  
						
						
						
					 
					
						2015-01-15 16:32:24 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c0993a9acb 
							
						 
					 
					
						
						
							
							show toast when avatar has been published -  fixed   #874  
						
						
						
					 
					
						2015-01-15 16:26:46 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							994c9495ba 
							
						 
					 
					
						
						
							
							added dedicated button to disable foreground service in perma notification  
						
						
						
					 
					
						2015-01-15 16:17:55 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							351e5d7065 
							
						 
					 
					
						
						
							
							fixed   #888  
						
						
						
					 
					
						2015-01-15 15:45:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3f9f30a6c 
							
						 
					 
					
						
						
							
							Merge pull request  #885  from SamWhited/display-enter-key  
						
						... 
						
						
						
						Add option to swap enter/emoticon key 
						
					 
					
						2015-01-14 22:54:02 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a6a9ed4877 
							
						 
					 
					
						
						
							
							handle muc nicks with white spaces.  fixed   #884  
						
						
						
					 
					
						2015-01-14 22:48:14 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0a96bec3c1 
							
						 
					 
					
						
						
							
							Add option to swap enter/emoticon key  
						
						
						
					 
					
						2015-01-14 16:14:14 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							548a585b2c 
							
						 
					 
					
						
						
							
							Harden the TLS connection cipher suites  
						
						
						
					 
					
						2015-01-14 13:10:15 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a88824bb1d 
							
						 
					 
					
						
						
							
							Merge pull request  #882  from SamWhited/apiandjavafixes  
						
						... 
						
						
						
						Type safety and deprecated API forward-compatibility fixes for Notifications 
						
					 
					
						2015-01-14 10:47:37 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							caf861d96f 
							
						 
					 
					
						
						
							
							Ensure type safety in Pebble notifications  
						
						... 
						
						
						
						Also use forward-compatible screen-on detection 
						
					 
					
						2015-01-13 23:18:35 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							acb3aed99c 
							
						 
					 
					
						
						
							
							Fix bottom padding on about page  
						
						
						
					 
					
						2015-01-13 21:29:47 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7d2a9624b5 
							
						 
					 
					
						
						
							
							make use of different dimensions for different screen sizes  
						
						
						
					 
					
						2015-01-13 11:52:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1262a7cba7 
							
						 
					 
					
						
						
							
							Merge pull request  #872  from Elinvention/development  
						
						... 
						
						
						
						Updated Italian translations 
						
					 
					
						2015-01-13 10:48:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1fac4754d8 
							
						 
					 
					
						
						
							
							Merge pull request  #873  from SamWhited/about-margin-fix  
						
						... 
						
						
						
						Use margin instead of padding on about screen 
						
					 
					
						2015-01-13 10:12:33 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d9c2fa39cd 
							
						 
					 
					
						
						
							
							Use margin instead of padding in about screen  
						
						
						
					 
					
						2015-01-12 23:08:26 -05:00 
						 
				 
			
				
					
						
							
							
								Elia 
							
						 
					 
					
						
						
						
						
							
						
						
							8f6ee1fe22 
							
						 
					 
					
						
						
							
							Updated Italian translations  
						
						
						
					 
					
						2015-01-13 01:32:51 +01:00 
						 
				 
			
				
					
						
							
							
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							c920a09a0c 
							
						 
					 
					
						
						
							
							Czech translation  
						
						... 
						
						
						
						updated 
						
					 
					
						2015-01-12 20:07:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dd5101ff5c 
							
						 
					 
					
						
						
							
							catch bug in guessContentType  
						
						
						
					 
					
						2015-01-12 18:40:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d3323e384 
							
						 
					 
					
						
						
							
							context menu for files and offered files.  fixed   #848   fixed   #849  
						
						
						
					 
					
						2015-01-12 16:42:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							77e4e1c2ac 
							
						 
					 
					
						
						
							
							reworked message preview / message meta information (ie file offered, received * file)  
						
						... 
						
						
						
						fixed  #837  
					
						2015-01-12 16:09:39 +01:00