Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								382bcc4cb5 
								
							 
						 
						
							
							
								
								Merge pull request  #1042  from BrianBlade/FIXES_muc-dlrs_muc-lastseen  
							
							 
							
							... 
							
							
							
							add delivery receipts for private muc msgs & enable update last-seen for muc-msgs 
							
						 
						
							2015-03-19 18:47:33 +01:00  
						
					 
				
					
						
							
							
								 
								BrianBlade
							
						 
						
							 
							
							
							
							
								
							
							
								1c600fefcf 
								
							 
						 
						
							
							
								
								# add delivery receipts for private muc msgs  
							
							 
							
							... 
							
							
							
							# enable update last-seen for muc-msgs 
							
						 
						
							2015-03-18 21:49:41 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a13c59fa1b 
								
							 
						 
						
							
							
								
								Merge pull request  #1043  from strb/choose_contact_multiple_squashed  
							
							 
							
							... 
							
							
							
							Added multiple select to Choose Contact Activity (squashed) 
							
						 
						
							2015-03-18 17:36:23 +01:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								f76baa5658 
								
							 
						 
						
							
							
								
								Added multiple select to Choose Contact Activity  
							
							 
							
							... 
							
							
							
							When passing the Choose Contact Activity a boolean called "multiple"
set to true, it now allows the user to select multiple contacts. Long
pressing a contact enters multiple selection mode and the selection is
confirmed using a button in the CAB. The Activity returns whether or not
multiple contacts were selected using the same boolean. If multiple
contacts were selected, an array of JID strings called "contacts" is
returned. The Choose Contact Activity now also honors "filter_contacts",
an array of strings containing JIDs that should not be displayed in
the picker.
The invite to conference dialog now uses this feature to enable inviting
multiple contacts at once. Additionally, Invite Contact uses
"filter_contacts" to only display contacts that are not yet
participating in the conversation 
							
						 
						
							2015-03-18 17:11:50 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7ae357f863 
								
							 
						 
						
							
							
								
								Merge pull request  #1036  from QuentinC/development  
							
							 
							
							... 
							
							
							
							Green led color is better with "full-green" 
							
						 
						
							2015-03-18 17:11:43 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ae274ac728 
								
							 
						 
						
							
							
								
								Merge pull request  #1041  from weiss/fix-cached-avatar-size  
							
							 
							
							... 
							
							
							
							Set file size also for cached avatars 
							
						 
						
							2015-03-17 21:10:02 +01:00  
						
					 
				
					
						
							
							
								 
								Holger Weiß
							
						 
						
							 
							
							
							
							
								
							
							
								52af62d298 
								
							 
						 
						
							
							
								
								Set file size also for cached avatars  
							
							 
							
							
							
						 
						
							2015-03-17 17:36:17 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								4aab45533a 
								
							 
						 
						
							
							
								
								pulled new translations from transifex  
							
							 
							
							
							
						 
						
							2015-03-16 11:52:42 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								3d570f4a08 
								
							 
						 
						
							
							
								
								updated changelong  
							
							 
							
							
							
						 
						
							2015-03-11 18:18:07 +01:00  
						
					 
				
					
						
							
							
								 
								Mateusz "maxmati" Nowoty?ski
							
						 
						
							 
							
							
							
							
								
							
							
								74e5317095 
								
							 
						 
						
							
							
								
								Do not Strigprep JIDs from database  
							
							 
							
							
							
						 
						
							2015-03-11 15:59:31 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								4ee4eeb5e7 
								
							 
						 
						
							
							
								
								add context menu entries for geo uris  
							
							 
							
							
							
						 
						
							2015-03-11 15:48:43 +01:00  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
							
								
							
							
								16c6f8d2ff 
								
							 
						 
						
							
							
								
								another teaser task for gsoc  
							
							 
							
							
							
						 
						
							2015-03-06 14:39:05 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								ce9aede11c 
								
							 
						 
						
							
							
								
								fixed markdown syntax in todo list  
							
							 
							
							
							
						 
						
							2015-03-06 14:27:09 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								a385b6ce0b 
								
							 
						 
						
							
							
								
								added short todo list  
							
							 
							
							
							
						 
						
							2015-03-06 14:25:17 +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
							
						 
						
							 
							
							
							
							
								
							
							
								4beb954da5 
								
							 
						 
						
							
							
								
								increment version code  
							
							 
							
							
							
						 
						
							2015-02-28 12:04:32 +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
							
						 
						
							 
							
							
							
							
								
							
							
								1b579f512c 
								
							 
						 
						
							
							
								
								version bump to 1.1.0  
							
							 
							
							
							
						 
						
							2015-02-26 16:56:46 +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
							
						 
						
							 
							
							
							
							
								
							
							
								0decd8ac28 
								
							 
						 
						
							
							
								
								version bump to 1.1.0-beta  
							
							 
							
							
							
						 
						
							2015-02-23 21:56:30 +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
							
						 
						
							 
							
							
							
							
								
							
							
								37e9db3299 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							 
							
							
							
						 
						
							2015-02-23 13:10:33 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								7a62fbbeae 
								
							 
						 
						
							
							
								
								get rid of some useless debugging  
							
							 
							
							
							
						 
						
							2015-02-23 12:05:18 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b8e21e57ee 
								
							 
						 
						
							
							
								
								Merge pull request  #1000  from kriztan/patch-4  
							
							 
							
							... 
							
							
							
							added XEP-0085: Chat State Notifications to docs 
							
						 
						
							2015-02-23 10:48:09 +01:00  
						
					 
				
					
						
							
							
								 
								Christian S.
							
						 
						
							 
							
							
							
							
								
							
							
								bf9bf91789 
								
							 
						 
						
							
							
								
								Update XEPs.md  
							
							 
							
							... 
							
							
							
							added XEP-0085: Chat State Notifications 
							
						 
						
							2015-02-23 10:36:07 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								eea6a87f2d 
								
							 
						 
						
							
							
								
								Merge pull request  #997  from betheg/otr4j_repository  
							
							 
							
							... 
							
							
							
							otr4j has moved to Maven Central 
							
						 
						
							2015-02-22 18:30:25 +01:00