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 
							
						 
					 
					
						
						
						
						
							
						
						
							c4daa08170 
							
						 
					 
					
						
						
							
							fixed a bug in DNS helper code.  fixes   #1130  
						
						 
						
						
						
					 
					
						2015-04-16 21:56:03 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							878066ca99 
							
						 
					 
					
						
						
							
							Add option to use MTM without default TrustManager  
						
						 
						
						... 
						
						
						
						Add a new "Don't trust system CAs" preference under advanced options
that will change the behaviour of the MemorizingTrustManager. All
formerly unknown certificates will raise a warning if checked. 
						
					 
					
						2015-04-11 15:13:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							37d08276a8 
							
						 
					 
					
						
						
							
							allow sharing multiple images at once.  fixes   #1090  
						
						 
						
						
						
					 
					
						2015-04-11 14:53:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							332fe0fd19 
							
						 
					 
					
						
						
							
							don't resume old session when changing resource  
						
						 
						
						
						
					 
					
						2015-04-09 12:46:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							dace8ba3d3 
							
						 
					 
					
						
						
							
							Enable end-conversation by swipe gesture  
						
						 
						
						... 
						
						
						
						Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews
Re-enable selectableItemBackground
Dont end selectedConversation on swipe
Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.
Add blacklistedConversation for undo swipe
Update title_undo_swipe_* strings
Fix undo(), rename blacklistedConversation
Fix discardUndo(); re-init selectedConversation
maintain scroll position after undo
clear notification when dismissing a conversation
modified / simplified maintain scroll position code
simplify handling of selectedConversation
change undo_muc string, remove notifyDataSetChanged() 
						
					 
					
						2015-04-08 23:29:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							59ea143147 
							
						 
					 
					
						
						
							
							Merge pull request  #1099  from BrianBlade/fix_otr_error_msgs  
						
						 
						
						... 
						
						
						
						Fix OTR-Error messages (#1021 ) 
						
					 
					
						2015-04-02 11:11:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b7b87e1a8d 
							
						 
					 
					
						
						
							
							do not overlap account title and switch  
						
						 
						
						
						
					 
					
						2015-04-01 23:45:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cb29c5bb15 
							
						 
					 
					
						
						
							
							Merge branch 'account_state_switch' of  https://github.com/BrianBlade/Conversations  into BrianBlade-account_state_switch  
						
						 
						
						
						
					 
					
						2015-04-01 23:24:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a376cacac 
							
						 
					 
					
						
						
							
							Merge pull request  #1076  from rk4an/patch-1  
						
						 
						
						... 
						
						
						
						Update french translation 
						
					 
					
						2015-04-01 20:30:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							64d6a2970e 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-04-01 20:26:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							db74cb52c4 
							
						 
					 
					
						
						
							
							Fix OTR-Error messages  
						
						 
						
						... 
						
						
						
						Send out OTR-Errors on unreadableMessageReceived() as well, not only on
messageFromAnotherInstanceReceived 
						
					 
					
						2015-04-01 20:03:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							e64049c4fc 
							
						 
					 
					
						
						
							
							Add toggle account-state switch  
						
						 
						
						... 
						
						
						
						Add a switch to AccountAdapter that allows self-contained enabling/disabling of
accounts without the need to bring up the context-menu 
						
					 
					
						2015-04-01 12:47:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erkan 
							
						 
					 
					
						
						
						
						
							
						
						
							2a73173176 
							
						 
					 
					
						
						
							
							Update french translation  
						
						 
						
						
						
					 
					
						2015-03-22 20:09:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ad8f1902d1 
							
						 
					 
					
						
						
							
							pulled translations  
						
						 
						
						
						
					 
					
						2015-03-22 18:56:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c47d1e83c1 
							
						 
					 
					
						
						
							
							properly set chat states when receiving otr status messages  
						
						 
						
						
						
					 
					
						2015-03-21 16:43:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							99b2ef7e9d 
							
						 
					 
					
						
						
							
							respond to unreadable OTR messages with error message.  fixed   #1021  
						
						 
						
						
						
					 
					
						2015-03-21 16:07:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							da099e5fa4 
							
						 
					 
					
						
						
							
							wait for session iq to return sucessfully before sending other stanzas.  fixed   #1017  
						
						 
						
						
						
					 
					
						2015-03-20 21:48:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							442ae12ee5 
							
						 
					 
					
						
						
							
							don't update presence for muc messages  
						
						 
						
						
						
					 
					
						2015-03-19 19:40:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0d6475d0d9 
							
						 
					 
					
						
						
							
							pulled more translations  
						
						 
						
						
						
					 
					
						2015-03-19 19:32:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							50c8065015 
							
						 
					 
					
						
						
							
							Merge pull request  #866  from SamWhited/xep0245  
						
						 
						
						... 
						
						
						
						Add XEP-0245 (/me command) support 
						
					 
					
						2015-01-12 01:22:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							3c5224251c 
							
						 
					 
					
						
						
							
							Add XEP-0245 (/me command) support  
						
						 
						
						
						
					 
					
						2015-01-11 18:32:00 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef6e4c5dd5 
							
						 
					 
					
						
						
							
							do not check image file size over http if accepted file size is 0  
						
						 
						
						
						
					 
					
						2015-01-11 22:18:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b07b7519a6 
							
						 
					 
					
						
						
							
							keep proper image file extension  
						
						 
						
						
						
					 
					
						2015-01-11 15:19:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0aa50cb5a1 
							
						 
					 
					
						
						
							
							shortened some string  
						
						 
						
						
						
					 
					
						2015-01-11 01:01:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e34bc920e4 
							
						 
					 
					
						
						
							
							fixed   #860  
						
						 
						
						
						
					 
					
						2015-01-10 23:56:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							18eb187949 
							
						 
					 
					
						
						
							
							make room persistant when changing subject or other muc options  
						
						 
						
						
						
					 
					
						2015-01-10 23:10:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							158f5dd17c 
							
						 
					 
					
						
						
							
							don't crash when selecting a conversation by uuid did not work  
						
						 
						
						
						
					 
					
						2015-01-10 19:43:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c89fdec0b1 
							
						 
					 
					
						
						
							
							fixed regression in tablet ui  
						
						 
						
						
						
					 
					
						2015-01-09 22:24:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							06eae476ee 
							
						 
					 
					
						
						
							
							Introduced expert options to control enter-is-send  
						
						 
						
						... 
						
						
						
						(default == off) 
						
					 
					
						2015-01-09 19:23:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0a48f777ac 
							
						 
					 
					
						
						
							
							code cleanup for jingle proxy discovery  
						
						 
						
						
						
					 
					
						2015-01-09 14:42:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d9f88c4669 
							
						 
					 
					
						
						
							
							ensure that everyone is member before making a room private  
						
						 
						
						
						
					 
					
						2015-01-09 13:28:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							734a9934a3 
							
						 
					 
					
						
						
							
							make project translatable via transifex  
						
						 
						
						
						
					 
					
						2015-01-09 02:06:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ffa97c48f5 
							
						 
					 
					
						
						
							
							added missing drawables  
						
						 
						
						
						
					 
					
						2015-01-08 23:02:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a9159568b9 
							
						 
					 
					
						
						
							
							allow for very basic muc configuration  
						
						 
						
						
						
					 
					
						2015-01-08 21:29:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0fe193b027 
							
						 
					 
					
						
						
							
							code cleanup  
						
						 
						
						
						
					 
					
						2015-01-08 14:45:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f8aa1bfec4 
							
						 
					 
					
						
						
							
							kick after ban  
						
						 
						
						
						
					 
					
						2015-01-08 01:23:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f8dc59be81 
							
						 
					 
					
						
						
							
							fixed german translation  
						
						 
						
						
						
					 
					
						2015-01-08 00:41:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							061de5205e 
							
						 
					 
					
						
						
							
							some clean ups for affiliation change context menu  
						
						 
						
						
						
					 
					
						2015-01-08 00:23:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cff9a937f2 
							
						 
					 
					
						
						
							
							Merge pull request  #851  from kriztan/patch-2  
						
						 
						
						... 
						
						
						
						Updated German translations for more muc options 
						
					 
					
						2015-01-07 23:53:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20aa7bea47 
							
						 
					 
					
						
						
							
							Merge pull request  #852  from SamWhited/ellipsis  
						
						 
						
						... 
						
						
						
						s/.../…/ in CS strings 
						
					 
					
						2015-01-07 23:53:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8505102cee 
							
						 
					 
					
						
						
							
							Merge pull request  #850  from plsng/dutch  
						
						 
						
						... 
						
						
						
						Update Dutch translations 
						
					 
					
						2015-01-07 23:53:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e1ea20b392 
							
						 
					 
					
						
						
							
							s/.../…/ in CS strings  
						
						 
						
						... 
						
						
						
						[ci skip] 
						
					 
					
						2015-01-07 13:42:49 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian S. 
							
						 
					 
					
						
						
						
						
							
						
						
							45c1e88a08 
							
						 
					 
					
						
						
							
							Updated German translations for more muc options  
						
						 
						
						
						
					 
					
						2015-01-07 19:06:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Follens 
							
						 
					 
					
						
						
						
						
							
						
						
							c9dc82d134 
							
						 
					 
					
						
						
							
							Update Dutch translations  
						
						 
						
						
						
					 
					
						2015-01-07 18:49:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d655f445a 
							
						 
					 
					
						
						
							
							more muc options  
						
						 
						
						... 
						
						
						
						* show invite button only with admin privileges or on public conferences
* Offer to ban user in public conferences.
Thanks to @betheg for the awesome ground work for this 
						
					 
					
						2015-01-07 18:34:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d70b5f93f3 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2015-01-07 18:32:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ab19faddd 
							
						 
					 
					
						
						
							
							Merge pull request  #847  from kriztan/patch-1  
						
						 
						
						... 
						
						
						
						Updated German translations... 
						
					 
					
						2015-01-07 18:30:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian S 
							
						 
					 
					
						
						
						
						
							
						
						
							9d43ddbf59 
							
						 
					 
					
						
						
							
							Updated German translations...  
						
						 
						
						... 
						
						
						
						...I'm not sure if "Weitere Einstellungen" is the right translation for "advanced mode". Has anybody a better translation?
I've changed the translations.
Updated German translations...
Updated German translations... 
						
					 
					
						2015-01-07 18:08:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0ad8796b44 
							
						 
					 
					
						
						
							
							fixed invites  
						
						 
						
						
						
					 
					
						2015-01-07 16:45:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							af1410b02a 
							
						 
					 
					
						
						
							
							Merge pull request  #845  from SamWhited/material  
						
						 
						
						... 
						
						
						
						Add materials theme for v21 devices 
						
					 
					
						2015-01-07 15:57:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef525fb10e 
							
						 
					 
					
						
						
							
							basic affiliation changes in muc  
						
						 
						
						
						
					 
					
						2015-01-07 15:03:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							81e9afdf19 
							
						 
					 
					
						
						
							
							reset next encryption when archiving conversations  
						
						 
						
						
						
					 
					
						2015-01-07 12:20:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							943a01b9bf 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2015-01-07 10:49:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a7ee9cc41b 
							
						 
					 
					
						
						
							
							Merge pull request  #846  from kruks23/translation4  
						
						 
						
						... 
						
						
						
						Update spanish translation 
						
					 
					
						2015-01-07 10:28:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							a1a2a39108 
							
						 
					 
					
						
						
							
							Update affiliation in MUC details and advance mode  
						
						 
						
						
						
					 
					
						2015-01-07 08:50:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							45bb59dba8 
							
						 
					 
					
						
						
							
							Add materials theme  
						
						 
						
						
						
					 
					
						2015-01-06 21:37:49 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a22c8c04d8 
							
						 
					 
					
						
						
							
							use copyonwritearraylist in for phone helper  
						
						 
						
						
						
					 
					
						2015-01-07 01:01:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d502e57661 
							
						 
					 
					
						
						
							
							refactored UiHelper  
						
						 
						
						
						
					 
					
						2015-01-07 00:59:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							066f60a23c 
							
						 
					 
					
						
						
							
							Czech translation for - show affiliation instead of role in MucDetails  
						
						 
						
						
						
					 
					
						2015-01-06 21:15:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f02f510c18 
							
						 
					 
					
						
						
							
							fixed bug in new ping strategy  
						
						 
						
						
						
					 
					
						2015-01-06 19:46:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							353f4e38bb 
							
						 
					 
					
						
						
							
							mark sent images as sent_received instead of sent  
						
						 
						
						... 
						
						
						
						fixed  #842  
						
					 
					
						2015-01-06 18:44:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8a3ccfd456 
							
						 
					 
					
						
						
							
							Merge pull request  #841  from BenoitBouvarel/patch-2  
						
						 
						
						... 
						
						
						
						Update strings.xml 
						
					 
					
						2015-01-06 18:33:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							562699c745 
							
						 
					 
					
						
						
							
							run invalidateOptionsMenu on uiThread  
						
						 
						
						
						
					 
					
						2015-01-06 18:26:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b0043ba91 
							
						 
					 
					
						
						
							
							fixed potential NPEs in ShareWithActivity  
						
						 
						
						
						
					 
					
						2015-01-06 18:25:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Benoit Bouvarel 
							
						 
					 
					
						
						
						
						
							
						
						
							352af145f8 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						 
						
						... 
						
						
						
						char ">" was missing at line 285 
						
					 
					
						2015-01-06 01:23:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Benoit Bouvarel 
							
						 
					 
					
						
						
						
						
							
						
						
							f8758b7bd5 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						 
						
						... 
						
						
						
						French translation updated 
						
					 
					
						2015-01-05 23:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							777e060100 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2015-01-05 18:47:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fdcbdfdc05 
							
						 
					 
					
						
						
							
							added debug info + possible platform bug work arounds to message adapter  
						
						 
						
						
						
					 
					
						2015-01-05 18:46:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c51245ff5 
							
						 
					 
					
						
						
							
							reworked ping scheduling strategy. very experimental  
						
						 
						
						
						
					 
					
						2015-01-05 18:45:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							85f24c9106 
							
						 
					 
					
						
						
							
							avoid requesting blocklist after stream resumption  
						
						 
						
						
						
					 
					
						2015-01-05 16:17:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Schneppe 
							
						 
					 
					
						
						
						
						
							
						
						
							47a8a39595 
							
						 
					 
					
						
						
							
							corrected German spellings  
						
						 
						
						... 
						
						
						
						and shorten some strings 
						
					 
					
						2015-01-05 15:59:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2679824770 
							
						 
					 
					
						
						
							
							prevent QR code parser from crashing  fixed   #839  
						
						 
						
						
						
					 
					
						2015-01-05 15:08:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bdb335e6b0 
							
						 
					 
					
						
						
							
							Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role  
						
						 
						
						
						
					 
					
						2015-01-05 15:06:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8264474a0c 
							
						 
					 
					
						
						
							
							Merge pull request  #838  from shtrom/pebble-notifications-squash  
						
						 
						
						... 
						
						
						
						Send notification to Pebble on new message 
						
					 
					
						2015-01-05 13:14:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Olivier Mehani 
							
						 
					 
					
						
						
						
						
							
						
						
							f1ebece866 
							
						 
					 
					
						
						
							
							Send notification to Pebble on new message  
						
						 
						
						... 
						
						
						
						This implements basic notifications to the Pebble through the app (using
an intent).  This simply hooks into NotificationService.notify().
This is pretty basic, but it works (I haven't tested to see how the
intent is received when the Pebble app is not around, though). More
fancy stuff could probably be added to avoid getting flooded, but the
Pebble app already does a good job a filtering notification (e.g.,
screen on or quiet times).
Signed-off-by: Olivier Mehani <shtrom@ssji.net> 
						
					 
					
						2015-01-05 23:06:46 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Schneppe 
							
						 
					 
					
						
						
						
						
							
						
						
							ddee804a01 
							
						 
					 
					
						
						
							
							Updated languages for higher auto accept file sizes and changed labeling to MiB and KiB  
						
						 
						
						
						
					 
					
						2015-01-05 12:46:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2723c9ccb9 
							
						 
					 
					
						
						
							
							made checks for valid image extensions case insensitive  
						
						 
						
						
						
					 
					
						2015-01-04 23:04:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3522243835 
							
						 
					 
					
						
						
							
							do not run mam queries in findOrCreateConversation() when isn't available  
						
						 
						
						
						
					 
					
						2015-01-04 18:16:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6cd92a663 
							
						 
					 
					
						
						
							
							added higher auto accept file sizes  
						
						 
						
						... 
						
						
						
						also changed labeling to MiB and KiB 
						
					 
					
						2015-01-04 17:53:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0d6d09b7e9 
							
						 
					 
					
						
						
							
							code cleanup + logging of spoofed iq packets  
						
						 
						
						
						
					 
					
						2015-01-04 15:40:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							88704ce5cd 
							
						 
					 
					
						
						
							
							Verify IQ responses  
						
						 
						
						... 
						
						
						
						Fixes  #20 
Move fromServer/toServer to AbstractStanza 
						
					 
					
						2015-01-04 08:28:13 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							eb7e683403 
							
						 
					 
					
						
						
							
							Make IqPacket type an enum  
						
						 
						
						
						
					 
					
						2015-01-04 08:20:30 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							00fdac42a9 
							
						 
					 
					
						
						
							
							Merge pull request  #832  from svetlemodry/development  
						
						 
						
						... 
						
						
						
						Czech translation update 
						
					 
					
						2015-01-04 12:45:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							3a4fbcd4cc 
							
						 
					 
					
						
						
							
							Czech translation update  
						
						 
						
						
						
					 
					
						2015-01-04 12:43:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c190487bc 
							
						 
					 
					
						
						
							
							deal with prosodys muc namespace tagging of messages  
						
						 
						
						
						
					 
					
						2015-01-04 12:37:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e32a927300 
							
						 
					 
					
						
						
							
							Use packet callbacks only for IqPackets. Removed unnecessary code  
						
						 
						
						
						
					 
					
						2015-01-04 12:09:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51f5b84ee4 
							
						 
					 
					
						
						
							
							Merge pull request  #829  from kriztan/patch-1  
						
						 
						
						... 
						
						
						
						corrected German 'private_message_to' 
						
					 
					
						2015-01-04 11:28:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergio 
							
						 
					 
					
						
						
						
						
							
						
						
							c674e9c3e9 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2015-01-04 11:24:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							b739a0d200 
							
						 
					 
					
						
						
							
							corrected German 'private_message_to'  
						
						 
						
						
						
					 
					
						2015-01-04 11:16:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f338d89753 
							
						 
					 
					
						
						
							
							no longer use ConcurrentHashMap in favor of synchronize on a final HashMap  
						
						 
						
						
						
					 
					
						2015-01-04 00:14:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4f4eff2353 
							
						 
					 
					
						
						
							
							Merge branch 'development'  
						
						 
						
						
						
					 
					
						2015-01-03 22:39:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							58b7e71e58 
							
						 
					 
					
						
						
							
							Added and modified German translations  
						
						 
						
						
						
					 
					
						2015-01-03 19:35:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e89e54a04a 
							
						 
					 
					
						
						
							
							version bump to 0.10  
						
						 
						
						
						
					 
					
						2015-01-03 19:11:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc8bd64bfd 
							
						 
					 
					
						
						
							
							void messages getting reloaded through mam after clear history  
						
						 
						
						
						
					 
					
						2015-01-03 18:22:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be7de054be 
							
						 
					 
					
						
						
							
							record voice and attachment refactor  
						
						 
						
						
						
					 
					
						2015-01-03 16:06:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							960b7343d3 
							
						 
					 
					
						
						
							
							disable / enable all accounts  
						
						 
						
						
						
					 
					
						2015-01-03 13:36:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							521c289db1 
							
						 
					 
					
						
						
							
							update last presence only for messages  
						
						 
						
						
						
					 
					
						2015-01-03 13:01:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							715c8545f4 
							
						 
					 
					
						
						
							
							added missing layout file  
						
						 
						
						
						
					 
					
						2015-01-03 10:35:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8bda54d48c 
							
						 
					 
					
						
						
							
							code cleanup  
						
						 
						
						
						
					 
					
						2015-01-03 00:47:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							969044b113 
							
						 
					 
					
						
						
							
							migrated change password into separate activity  
						
						 
						
						
						
					 
					
						2015-01-03 00:11:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1988e244ef 
							
						 
					 
					
						
						
							
							some further otr improvements  
						
						 
						
						
						
					 
					
						2015-01-02 15:14:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f58f27a1f7 
							
						 
					 
					
						
						
							
							click on dynamic tag to filter for that tag  
						
						 
						
						
						
					 
					
						2015-01-02 14:47:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							093c5275c6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/development' into development  
						
						 
						
						
						
					 
					
						2015-01-02 14:28:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3df23a4f75 
							
						 
					 
					
						
						
							
							allow cancellation of waiting files  
						
						 
						
						
						
					 
					
						2015-01-02 14:27:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f178f23177 
							
						 
					 
					
						
						
							
							Merge pull request  #826  from kriztan/patch-1  
						
						 
						
						... 
						
						
						
						Added German translations 
						
					 
					
						2015-01-02 12:15:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bcd3be59ce 
							
						 
					 
					
						
						
							
							put Conversations into background mode earlier  
						
						 
						
						
						
					 
					
						2015-01-02 12:04:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							eca826caf3 
							
						 
					 
					
						
						
							
							Added German translations  
						
						 
						
						
						
					 
					
						2015-01-02 09:12:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d2f454479 
							
						 
					 
					
						
						
							
							prefer PLAIN over DIGEST-MD5  
						
						 
						
						... 
						
						
						
						DIGEST-MD5 seems to be broken for a lot of cases (OpenFire)
switched priority of PLAIN to not cause any security errors 
						
					 
					
						2015-01-02 01:39:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb3bf25523 
							
						 
					 
					
						
						
							
							fixed layout file  
						
						 
						
						
						
					 
					
						2015-01-02 01:37:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3833e6dfef 
							
						 
					 
					
						
						
							
							improved OTR verification part one  
						
						 
						
						
						
					 
					
						2015-01-02 01:21:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b71740f0d4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/development' into development  
						
						 
						
						
						
					 
					
						2014-12-30 09:36:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f93f9c314 
							
						 
					 
					
						
						
							
							improved fromServer filter  
						
						 
						
						
						
					 
					
						2014-12-30 09:36:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0882da2568 
							
						 
					 
					
						
						
							
							Make `app_name' string untranslatable  
						
						 
						
						... 
						
						
						
						Remove untranslatable about message
Escape single quote in NL translation 
						
					 
					
						2014-12-29 19:38:47 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c5d7d4f1b 
							
						 
					 
					
						
						
							
							refactor swithOverToTls stuff  
						
						 
						
						
						
					 
					
						2014-12-30 01:17:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb8737ed9f 
							
						 
					 
					
						
						
							
							fixed npe in block menu item  
						
						 
						
						
						
					 
					
						2014-12-30 01:16:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c78dc5b494 
							
						 
					 
					
						
						
							
							fixed nl strings  
						
						 
						
						
						
					 
					
						2014-12-30 01:15:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							04de77261b 
							
						 
					 
					
						
						
							
							fixed   #818  
						
						 
						
						
						
					 
					
						2014-12-30 01:13:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5df8e6a5b3 
							
						 
					 
					
						
						
							
							Merge pull request  #812  from kriztan/patch-1  
						
						 
						
						... 
						
						
						
						Update german translations 
						
					 
					
						2014-12-30 00:22:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							55b84d0895 
							
						 
					 
					
						
						
							
							Merge pull request  #813  from plsng/translation  
						
						 
						
						... 
						
						
						
						Update Dutch translations 
						
					 
					
						2014-12-30 00:22:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d1d4e361ad 
							
						 
					 
					
						
						
							
							Merge pull request  #814  from kruks23/translation1  
						
						 
						
						... 
						
						
						
						Update spanish translations 
						
					 
					
						2014-12-30 00:22:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Follens 
							
						 
					 
					
						
						
						
						
							
						
						
							800520b27b 
							
						 
					 
					
						
						
							
							Update Dutch translations  
						
						 
						
						
						
					 
					
						2014-12-29 23:08:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							b48bddb852 
							
						 
					 
					
						
						
							
							Fix typo in method name  
						
						 
						
						
						
					 
					
						2014-12-29 14:21:20 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergio 
							
						 
					 
					
						
						
						
						
							
						
						
							164c41661e 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2014-12-27 13:04:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Follens 
							
						 
					 
					
						
						
						
						
							
						
						
							4a8342a378 
							
						 
					 
					
						
						
							
							Update Dutch translations  
						
						 
						
						
						
					 
					
						2014-12-27 12:53:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							3b3d51b39a 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						
						
					 
					
						2014-12-27 10:42:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							193d2645e6 
							
						 
					 
					
						
						
							
							code cleanup for change password stuff  
						
						 
						
						
						
					 
					
						2014-12-25 22:28:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c22a8d1c6 
							
						 
					 
					
						
						
							
							added callback to change account password to notify UI on success / failure  
						
						 
						
						
						
					 
					
						2014-12-25 22:08:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e4d9dca2fe 
							
						 
					 
					
						
						
							
							Add ability to change password on server  
						
						 
						
						... 
						
						
						
						Fixes  #260  
						
					 
					
						2014-12-25 21:38:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2081c1bef7 
							
						 
					 
					
						
						
							
							proper call to invalidateViews()  
						
						 
						
						
						
					 
					
						2014-12-25 19:53:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef1f72ea27 
							
						 
					 
					
						
						
							
							catch another exception in fingerprint generation  
						
						 
						
						
						
					 
					
						2014-12-25 19:53:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							94aeca7c8a 
							
						 
					 
					
						
						
							
							Merge pull request  #810  from kriztan/patch-2  
						
						 
						
						... 
						
						
						
						Update german translations 
						
					 
					
						2014-12-25 10:23:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							3b127ab743 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						
						
					 
					
						2014-12-25 09:14:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pulser 
							
						 
					 
					
						
						
						
						
							
						
						
							3ada834839 
							
						 
					 
					
						
						
							
							Show server info option when blocking is unavailable  
						
						 
						
						... 
						
						
						
						Current head of development branch doesn't show server information if
blocking is disabled. This is due to slightly wrong logic on an if
statement. This patch ensures only the blocking option is disabled when
blocking is not supported by the server, and that the feature remains
available. 
						
					 
					
						2014-12-24 20:54:56 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							afbe727b17 
							
						 
					 
					
						
						
							
							Don't allow user to register domain only jids  
						
						 
						
						
						
					 
					
						2014-12-23 17:35:36 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8a467e33dd 
							
						 
					 
					
						
						
							
							Don't show menu on create account screen  
						
						 
						
						
						
					 
					
						2014-12-23 17:12:52 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d454788011 
							
						 
					 
					
						
						
							
							Remove old JID validator  
						
						 
						
						
						
					 
					
						2014-12-23 13:23:13 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							01107e31ae 
							
						 
					 
					
						
						
							
							Add more server compatibility info.  
						
						 
						
						... 
						
						
						
						Hide server info behind a checkbox.
Add XEP-0352 support to the server info list
Add XEP-0237 to server info list
Add XEP-0352 support to the server info list
Add MaM and Blocking to the account XEPs list
Also add a toggle button to hide some of the list
Rebase on current codebase
Make MAM string more descriptive
Change show more button to checkbox menu item
Shorten `MAM (History)' to `MAM'
Order XEP list and hide all by default
Supress warning (which is wrong anyways)
Change `Show more' to `Show more info' 
						
					 
					
						2014-12-23 12:44:30 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d5f99560ff 
							
						 
					 
					
						
						
							
							made method private that is no longer required to be public  
						
						 
						
						
						
					 
					
						2014-12-23 18:09:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e152ed1e07 
							
						 
					 
					
						
						
							
							Simplify roster handling code  
						
						 
						
						... 
						
						
						
						Merge result handling code into IqParser
Fixes  #20  
						
					 
					
						2014-12-22 12:53:31 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e1cb72b9ef 
							
						 
					 
					
						
						
							
							Fix NPEs in blocking code  
						
						 
						
						
						
					 
					
						2014-12-22 11:24:08 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							af7a64491f 
							
						 
					 
					
						
						
							
							Add support for XEP-0191 (Blocking command)  
						
						 
						
						... 
						
						
						
						Fixes  #791 
Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1 
						
					 
					
						2014-12-22 08:19:00 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1517641713 
							
						 
					 
					
						
						
							
							get rid of special self presence object and incorporate that into roster  
						
						 
						
						
						
					 
					
						2014-12-20 17:23:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ce4848f742 
							
						 
					 
					
						
						
							
							more null checks for otr fingerprints  
						
						 
						
						
						
					 
					
						2014-12-20 16:01:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							40335785aa 
							
						 
					 
					
						
						
							
							don't include empty fingerprints in list of otrfingerprints  
						
						 
						
						
						
					 
					
						2014-12-20 15:21:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6b047bed97 
							
						 
					 
					
						
						
							
							fixed another break continue bug  
						
						 
						
						
						
					 
					
						2014-12-20 12:52:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88f43643bf 
							
						 
					 
					
						
						
							
							inject ui callback into running mam query  
						
						 
						
						
						
					 
					
						2014-12-20 12:52:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							675bac7255 
							
						 
					 
					
						
						
							
							Merge pull request  #794  from svetlemodry/development  
						
						 
						
						... 
						
						
						
						Czech image transfer string fix 
						
					 
					
						2014-12-20 12:14:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							6dd75cbb07 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2014-12-20 10:54:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							c8cfd1b084 
							
						 
					 
					
						
						
							
							Czech image transfer string fix  
						
						 
						
						
						
					 
					
						2014-12-19 22:50:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a68cb5d364 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-12-19 13:40:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							627982df90 
							
						 
					 
					
						
						
							
							fixed   #755  
						
						 
						
						
						
					 
					
						2014-12-19 13:40:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							7c4a306ae4 
							
						 
					 
					
						
						
							
							Czech translation updated  
						
						 
						
						... 
						
						
						
						added missing strings 
						
					 
					
						2014-12-18 18:42:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							948112c2f3 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						
						
					 
					
						2014-12-18 12:10:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f00e168752 
							
						 
					 
					
						
						
							
							clean up conversation history after swtiching to a different conversation  
						
						 
						
						
						
					 
					
						2014-12-17 21:05:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de952cc959 
							
						 
					 
					
						
						
							
							show error if jid couldn't be parsed in new contact dialog  
						
						 
						
						
						
					 
					
						2014-12-17 21:04:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c30108eb17 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-12-17 10:51:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							741a0c129d 
							
						 
					 
					
						
						
							
							made scroling smoother + bug fixes for history loading  
						
						 
						
						
						
					 
					
						2014-12-17 10:50:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							80435eca5c 
							
						 
					 
					
						
						
							
							smoothed out scrolling a bit  
						
						 
						
						
						
					 
					
						2014-12-17 09:32:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5603440a91 
							
						 
					 
					
						
						
							
							Merge pull request  #783  from SamWhited/quiet-hours  
						
						 
						
						... 
						
						
						
						Update summary in TimePreference change listener 
						
					 
					
						2014-12-17 07:15:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1a7ed4ed7c 
							
						 
					 
					
						
						
							
							properly detect images in share with  
						
						 
						
						
						
					 
					
						2014-12-17 07:12:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4cf499a2 
							
						 
					 
					
						
						
							
							Merge branch 'issue756' of  https://github.com/SamWhited/Conversations  into SamWhited-issue756  
						
						 
						
						
						
					 
					
						2014-12-17 07:00:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3f6638cb64 
							
						 
					 
					
						
						
							
							properly count mam messages  
						
						 
						
						
						
					 
					
						2014-12-17 06:59:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0b4987581f 
							
						 
					 
					
						
						
							
							Handle time comparisons using longs  
						
						 
						
						
						
					 
					
						2014-12-16 18:03:16 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							6659339eff 
							
						 
					 
					
						
						
							
							Allow sending of any filetype via intent  
						
						 
						
						... 
						
						
						
						Fixes  #756  
						
					 
					
						2014-12-15 22:31:55 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f9c783085d 
							
						 
					 
					
						
						
							
							Update summary in TimePreference change listener  
						
						 
						
						... 
						
						
						
						Ensures the summary is updated even if we change the time preference
programatically; also allows other places to stop the summary from being
updated by setting a new listener. 
						
					 
					
						2014-12-15 17:46:32 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e2f50ab855 
							
						 
					 
					
						
						
							
							go through mam history page by page. load mam dynamically on scroll  
						
						 
						
						
						
					 
					
						2014-12-15 23:06:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03ca971e2e 
							
						 
					 
					
						
						
							
							Merge pull request  #782  from SamWhited/quiet-hours  
						
						 
						
						... 
						
						
						
						Make some magic number constants final 
						
					 
					
						2014-12-15 19:28:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							ea61142d7e 
							
						 
					 
					
						
						
							
							Make some magic number constants final  
						
						 
						
						
						
					 
					
						2014-12-15 11:39:18 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ab2187dbdf 
							
						 
					 
					
						
						
							
							fixed crashing on unparsed jids  
						
						 
						
						
						
					 
					
						2014-12-15 17:36:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							183e31ade1 
							
						 
					 
					
						
						
							
							Merge branch 'quiet-hours' of  https://github.com/SamWhited/Conversations  into SamWhited-quiet-hours  
						
						 
						
						
						
					 
					
						2014-12-15 17:35:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e084266595 
							
						 
					 
					
						
						
							
							migrated more jid parsing to use getAttributeAsJid. added error logging  
						
						 
						
						
						
					 
					
						2014-12-15 17:29:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							af0f8e87bb 
							
						 
					 
					
						
						
							
							Make silent notification when quiet hours are on  
						
						 
						
						... 
						
						
						
						Notify, just don't play a sound or vibrate
Also make the Java annoyingly verbose... I can't help myself... ahh! 
						
					 
					
						2014-12-15 11:23:50 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							25d8546ae8 
							
						 
					 
					
						
						
							
							Merge branch 'quiet-hours' of  https://github.com/SamWhited/Conversations  into SamWhited-quiet-hours  
						
						 
						
						
						
					 
					
						2014-12-15 17:16:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2bd4621245 
							
						 
					 
					
						
						
							
							fixed history deletion.  fixed   #780  
						
						 
						
						
						
					 
					
						2014-12-15 17:14:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6cfbf2f2d 
							
						 
					 
					
						
						
							
							Merge pull request  #775  from kruks23/translation1  
						
						 
						
						... 
						
						
						
						Update spanish translations. 
						
					 
					
						2014-12-15 16:57:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							16360242d1 
							
						 
					 
					
						
						
							
							Merge pull request  #781  from drizzt/patch-1  
						
						 
						
						... 
						
						
						
						fixed typo in italian translation 
						
					 
					
						2014-12-15 16:57:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							209e62d68b 
							
						 
					 
					
						
						
							
							avoid npe on weird platform bugs  
						
						 
						
						
						
					 
					
						2014-12-15 16:55:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								drizzt 
							
						 
					 
					
						
						
						
						
							
						
						
							9f6537acdc 
							
						 
					 
					
						
						
							
							fixed typo in italian translation  
						
						 
						
						... 
						
						
						
						s/gallaria/galleria/ 
						
					 
					
						2014-12-15 14:19:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8a496a5f1 
							
						 
					 
					
						
						
							
							run mam queries only when online  
						
						 
						
						
						
					 
					
						2014-12-14 23:23:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d4b0aec5 
							
						 
					 
					
						
						
							
							Add quiet hours feature  
						
						 
						
						
						
					 
					
						2014-12-14 15:07:41 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5cbae25808 
							
						 
					 
					
						
						
							
							more patches for dns helper  
						
						 
						
						
						
					 
					
						2014-12-14 19:02:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							50410dad33 
							
						 
					 
					
						
						
							
							possible dns fixes  
						
						 
						
						
						
					 
					
						2014-12-14 18:31:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de06cb38d1 
							
						 
					 
					
						
						
							
							refactored the way certain messages are being found within a conversation  
						
						 
						
						
						
					 
					
						2014-12-14 18:10:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fc293aaede 
							
						 
					 
					
						
						
							
							avoiding concurrent modification  
						
						 
						
						
						
					 
					
						2014-12-13 22:17:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6148f04d7b 
							
						 
					 
					
						
						
							
							fixed regression  
						
						 
						
						
						
					 
					
						2014-12-13 20:05:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							899802646c 
							
						 
					 
					
						
						
							
							reverse through mam history when loading larger chuncks  
						
						 
						
						
						
					 
					
						2014-12-13 15:32:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							02a89f4ce2 
							
						 
					 
					
						
						
							
							Merge branch 'feature/mam' into development  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java 
						
					 
					
						2014-12-13 13:55:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2368ba518d 
							
						 
					 
					
						
						
							
							refactored phone contacts merger  
						
						 
						
						
						
					 
					
						2014-12-13 13:52:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							1ffdae80a6 
							
						 
					 
					
						
						
							
							Update spanish translations.  
						
						 
						
						
						
					 
					
						2014-12-13 13:24:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b523518e4b 
							
						 
					 
					
						
						
							
							various mam improvments  
						
						 
						
						
						
					 
					
						2014-12-13 12:25:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f2510ae9f6 
							
						 
					 
					
						
						
							
							mark otr messages as no-store for mam  
						
						 
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1dcdc79a71 
							
						 
					 
					
						
						
							
							changed lastMessageReceived into lastMessageTransmitted to account for sent messages as well. (will trigger on sm ack)  
						
						 
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ccdb0fd971 
							
						 
					 
					
						
						
							
							save server id from mam messages. check for dups before adding mam  
						
						 
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0ab530932a 
							
						 
					 
					
						
						
							
							added max history age (default 1w). automatically sort newly added mam messages  
						
						 
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4a94389f05 
							
						 
					 
					
						
						
							
							very basic mam support  
						
						 
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							34558cc277 
							
						 
					 
					
						
						
							
							store last message received date in conversation  
						
						 
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b958e51df 
							
						 
					 
					
						
						
							
							removed unnecessary otr error response  
						
						 
						
						
						
					 
					
						2014-12-10 14:07:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							05d1f46c15 
							
						 
					 
					
						
						
							
							recreate activity after theme has changed.  fixed   #764  
						
						 
						
						
						
					 
					
						2014-12-09 20:22:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ae3bd9c9e9 
							
						 
					 
					
						
						
							
							Merge pull request  #767  from kruks23/translation3  
						
						 
						
						... 
						
						
						
						Update spanish translations. 
						
					 
					
						2014-12-09 20:16:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							920067b8ed 
							
						 
					 
					
						
						
							
							Update spanish translations.  
						
						 
						
						
						
					 
					
						2014-12-09 18:33:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							78370094e9 
							
						 
					 
					
						
						
							
							cleanup: removed unused emoticon parsing  
						
						 
						
						
						
					 
					
						2014-12-09 14:21:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9d52f62767 
							
						 
					 
					
						
						
							
							cleanup: removed stream compression  
						
						 
						
						
						
					 
					
						2014-12-09 14:14:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5acd471880 
							
						 
					 
					
						
						
							
							version bump to 0.9.3  
						
						 
						
						
						
					 
					
						2014-12-07 21:42:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							490f40b196 
							
						 
					 
					
						
						
							
							possible work around for some weird - possibly sdk - bugs  
						
						 
						
						
						
					 
					
						2014-12-07 21:14:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9c9e22c020 
							
						 
					 
					
						
						
							
							fixed digest-md5  
						
						 
						
						
						
					 
					
						2014-12-04 12:33:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2274c38726 
							
						 
					 
					
						
						
							
							close cursors after querying phone db  
						
						 
						
						
						
					 
					
						2014-12-03 23:29:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e623e28487 
							
						 
					 
					
						
						
							
							fixed   #651  
						
						 
						
						
						
					 
					
						2014-12-03 17:05:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							46e319b241 
							
						 
					 
					
						
						
							
							more safety checks for listener counts  
						
						 
						
						
						
					 
					
						2014-12-03 14:55:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a38005ec89 
							
						 
					 
					
						
						
							
							fixed   #544  
						
						 
						
						
						
					 
					
						2014-12-03 12:33:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9e97529b3d 
							
						 
					 
					
						
						
							
							version bump to 0.9.2  
						
						 
						
						
						
					 
					
						2014-12-03 11:18:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							685f405154 
							
						 
					 
					
						
						
							
							display proper error in edit account details if jid is invalid  
						
						 
						
						
						
					 
					
						2014-12-03 10:52:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8f62d95e1f 
							
						 
					 
					
						
						
							
							further npe checks  
						
						 
						
						
						
					 
					
						2014-12-03 10:45:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							aaeba697bd 
							
						 
					 
					
						
						
							
							refactored the message adapter a bit  
						
						 
						
						
						
					 
					
						2014-12-03 10:35:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							be358b77d6 
							
						 
					 
					
						
						
							
							set nick and autojoin=true for new bookmarks  
						
						 
						
						
						
					 
					
						2014-12-03 10:34:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c273637156 
							
						 
					 
					
						
						
							
							made muc parser more compatible with legacy mucs?! (whatever that is exactly)  
						
						 
						
						
						
					 
					
						2014-12-03 01:46:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							feec659b08 
							
						 
					 
					
						
						
							
							Make sure SASL tokenizer strips strings  
						
						 
						
						... 
						
						
						
						Fix DIGEST-MD5 auth (make sure we're not splitting on BASE64 `==') 
						
					 
					
						2014-12-02 19:33:41 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							46b2760069 
							
						 
					 
					
						
						
							
							worked around concurrent modification exception  
						
						 
						
						
						
					 
					
						2014-12-03 00:54:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4a80914603 
							
						 
					 
					
						
						
							
							fixed another npe in hasBookmark  
						
						 
						
						
						
					 
					
						2014-12-03 00:18:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							138345c5bf 
							
						 
					 
					
						
						
							
							Merge pull request  #740  from SamWhited/jidrpfix  
						
						 
						
						... 
						
						
						
						Fix RFC 6122 implementation 
						
					 
					
						2014-12-03 00:12:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c0e997e007 
							
						 
					 
					
						
						
							
							Merge pull request  #743  from weiss/update-german-translations  
						
						 
						
						... 
						
						
						
						Update/improve German translations 
						
					 
					
						2014-12-03 00:11:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							53aaaf68d5 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-12-03 00:07:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							eb0f8c08bd 
							
						 
					 
					
						
						
							
							safety net in joinMuc  
						
						 
						
						
						
					 
					
						2014-12-03 00:06:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							39a3f372dd 
							
						 
					 
					
						
						
							
							clean up getProposedNick  
						
						 
						
						
						
					 
					
						2014-12-03 00:06:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9152e1ac95 
							
						 
					 
					
						
						
							
							fixed potential npes in message parser  
						
						 
						
						
						
					 
					
						2014-12-03 00:06:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							241de062da 
							
						 
					 
					
						
						
							
							cleaned up avatar / tile creation  
						
						 
						
						
						
					 
					
						2014-12-03 00:06:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Holger Weiß 
							
						 
					 
					
						
						
						
						
							
						
						
							b5b6589b44 
							
						 
					 
					
						
						
							
							Update/improve German translations  
						
						 
						
						
						
					 
					
						2014-12-02 18:02:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							29a7828c5f 
							
						 
					 
					
						
						
							
							Allow JIDs such as "example.net/@"  
						
						 
						
						
						
					 
					
						2014-12-02 10:17:50 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							4f9dd82457 
							
						 
					 
					
						
						
							
							"example.net/@/" should be a valid JID.  
						
						 
						
						... 
						
						
						
						Retab JID file 
						
					 
					
						2014-12-02 10:09:31 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							3fc834c067 
							
						 
					 
					
						
						
							
							Fix RFC 6122 implementation  
						
						 
						
						... 
						
						
						
						JID resourceparts should be able to contain "@" and "/" characters 
						
					 
					
						2014-12-02 09:16:09 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							59402da60d 
							
						 
					 
					
						
						
							
							Merge pull request  #737  from kruks23/translation2  
						
						 
						
						... 
						
						
						
						Update spanish translations 
						
					 
					
						2014-12-02 00:31:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							85d5326c32 
							
						 
					 
					
						
						
							
							Merge pull request  #730  from svetlemodry/development  
						
						 
						
						... 
						
						
						
						Updated Czech translation file 
						
					 
					
						2014-12-02 00:31:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							2a2679cfec 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2014-12-01 23:16:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							2f34f93c3a 
							
						 
					 
					
						
						
							
							pref_about_message string deleted  
						
						 
						
						
						
					 
					
						2014-12-01 21:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							59a112ebfe 
							
						 
					 
					
						
						
							
							Updated Czech translation file  
						
						 
						
						... 
						
						
						
						added missing strings
fixing typos, improvements for better understanding 
						
					 
					
						2014-12-01 16:46:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9dd445a507 
							
						 
					 
					
						
						
							
							fixed   #728  
						
						 
						
						
						
					 
					
						2014-12-01 12:33:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6a429d9939 
							
						 
					 
					
						
						
							
							bumped cap version as well  
						
						 
						
						
						
					 
					
						2014-12-01 11:25:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8d306ac64f 
							
						 
					 
					
						
						
							
							clear encrypted messages on reinit  
						
						 
						
						
						
					 
					
						2014-12-01 11:18:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							96bbd16ca5 
							
						 
					 
					
						
						
							
							worked around rare npe  
						
						 
						
						
						
					 
					
						2014-12-01 10:58:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5992d4ac00 
							
						 
					 
					
						
						
							
							fixed npe if roster jid couldnt be parsed  
						
						 
						
						
						
					 
					
						2014-12-01 10:25:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							21f77cd1e3 
							
						 
					 
					
						
						
							
							fixed italian translation  
						
						 
						
						
						
					 
					
						2014-12-01 09:59:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							99e3fb814d 
							
						 
					 
					
						
						
							
							Merge pull request  #726  from Elinvention/development  
						
						 
						
						... 
						
						
						
						Update Italian translations 
						
					 
					
						2014-12-01 09:51:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a4b4c13c66 
							
						 
					 
					
						
						
							
							do not query service info from main server again  
						
						 
						
						
						
					 
					
						2014-12-01 09:48:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							57fd763066 
							
						 
					 
					
						
						
							
							don't request fragment before updating  
						
						 
						
						
						
					 
					
						2014-11-30 22:27:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elinvention 
							
						 
					 
					
						
						
						
						
							
						
						
							e039c8de25 
							
						 
					 
					
						
						
							
							Removed pref_about_message which is not translatable  
						
						 
						
						
						
					 
					
						2014-11-30 21:51:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elinvention 
							
						 
					 
					
						
						
						
						
							
						
						
							6b772f4141 
							
						 
					 
					
						
						
							
							Added missing italian translations with some minor fixes to existing ones  
						
						 
						
						
						
					 
					
						2014-11-30 21:16:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52a43db6d6 
							
						 
					 
					
						
						
							
							Merge pull request  #721  from SamWhited/warning_fixes  
						
						 
						
						... 
						
						
						
						Warning "fixes" 
						
					 
					
						2014-11-29 19:14:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							acf446a02c 
							
						 
					 
					
						
						
							
							Merge pull request  #718  from beriain/development  
						
						 
						
						... 
						
						
						
						Update basque translation 
						
					 
					
						2014-11-29 19:13:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d98486d1ca 
							
						 
					 
					
						
						
							
							fixed npe for broken bookmarks  
						
						 
						
						
						
					 
					
						2014-11-29 19:09:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e43ac27e8f 
							
						 
					 
					
						
						
							
							Accessibility: Add missing image descriptions  
						
						 
						
						
						
					 
					
						2014-11-29 08:03:35 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							afc673bb15 
							
						 
					 
					
						
						
							
							Misc. "fixes" to correct warnings.  
						
						 
						
						
						
					 
					
						2014-11-29 07:50:59 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1ff9293ee1 
							
						 
					 
					
						
						
							
							fix for concurrency issue  
						
						 
						
						
						
					 
					
						2014-11-29 13:09:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aitor Beriain 
							
						 
					 
					
						
						
						
						
							
						
						
							d9182fe81c 
							
						 
					 
					
						
						
							
							Update basque translation  
						
						 
						
						
						
					 
					
						2014-11-27 18:33:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3d8a2e7923 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-27 10:30:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7ba41c6a8e 
							
						 
					 
					
						
						
							
							fixed npe.  fixed   #717  
						
						 
						
						
						
					 
					
						2014-11-27 10:30:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2f02d8d398 
							
						 
					 
					
						
						
							
							create conversation with bare jid  
						
						 
						
						
						
					 
					
						2014-11-27 10:26:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0b8032dbd6 
							
						 
					 
					
						
						
							
							use getAttributeAsJid method  
						
						 
						
						
						
					 
					
						2014-11-27 10:26:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							e1e28e9ef6 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						... 
						
						
						
						modified translations a bit 
						
					 
					
						2014-11-26 11:39:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7a75a8bc5a 
							
						 
					 
					
						
						
							
							Merge pull request  #713  from betheg/muc  
						
						 
						
						... 
						
						
						
						MUC: do not add yourself to the muc user list. 
						
					 
					
						2014-11-24 11:53:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6f21dc84d5 
							
						 
					 
					
						
						
							
							Merge pull request  #714  from betheg/muc_bookmark_cd  
						
						 
						
						... 
						
						
						
						MUC: option to set/delete bookmark in conference details. 
						
					 
					
						2014-11-24 09:31:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							31b539daf7 
							
						 
					 
					
						
						
							
							MUC: option to set/delete bookmark in conference details.  
						
						 
						
						
						
					 
					
						2014-11-23 21:37:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							4d841587c8 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						
						
					 
					
						2014-11-23 15:21:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							dbe8280662 
							
						 
					 
					
						
						
							
							add an listener for the muc roster update.  
						
						 
						
						... 
						
						
						
						this is for the ConferenceDetailsActivity to show
precence updates immediately. 
						
					 
					
						2014-11-23 15:19:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							bdfdc5fb10 
							
						 
					 
					
						
						
							
							MUC: do not add yourself to the muc user list.  
						
						 
						
						
						
					 
					
						2014-11-23 15:19:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							ca761bac3c 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2014-11-22 00:37:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							28fefad834 
							
						 
					 
					
						
						
							
							work around to not confuse irc transport with real conference servers  
						
						 
						
						
						
					 
					
						2014-11-21 20:34:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							36f8a31d7d 
							
						 
					 
					
						
						
							
							Merge pull request  #706  from betheg/unused_imports  
						
						 
						
						... 
						
						
						
						remove unused imports. 
						
					 
					
						2014-11-21 20:03:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							81a1a48b8d 
							
						 
					 
					
						
						
							
							update action bar with conversations updates as well  
						
						 
						
						
						
					 
					
						2014-11-21 20:02:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							febbefefa5 
							
						 
					 
					
						
						
							
							MUC: set from when join muc.  
						
						 
						
						
						
					 
					
						2014-11-21 19:37:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							dc0dba3faf 
							
						 
					 
					
						
						
							
							remove unused imports.  
						
						 
						
						
						
					 
					
						2014-11-21 19:17:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							424de3ea3a 
							
						 
					 
					
						
						
							
							move task to back and not finish when hitting back button  
						
						 
						
						
						
					 
					
						2014-11-21 18:57:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							44faec7051 
							
						 
					 
					
						
						
							
							STATUS_CODE_SELF_PRESENCE is not set in all case.  
						
						 
						
						
						
					 
					
						2014-11-21 16:14:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							888475d4fe 
							
						 
					 
					
						
						
							
							additional null pointer saftey checks  
						
						 
						
						
						
					 
					
						2014-11-21 15:25:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de0b36fc78 
							
						 
					 
					
						
						
							
							verify contacts key only on initiating side of smp  
						
						 
						
						
						
					 
					
						2014-11-21 13:42:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							92ad4cb736 
							
						 
					 
					
						
						
							
							changed listener timing and cache clearing after muc presences  
						
						 
						
						
						
					 
					
						2014-11-20 22:44:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							66abdfccd4 
							
						 
					 
					
						
						
							
							create file and dirs before creating file  
						
						 
						
						
						
					 
					
						2014-11-20 22:02:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8fe3b2974b 
							
						 
					 
					
						
						
							
							Merge pull request  #698  from kriztan/patch-1  
						
						 
						
						... 
						
						
						
						Update german translations 
						
					 
					
						2014-11-20 21:47:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							3e3767cb06 
							
						 
					 
					
						
						
							
							change status codes string 'number' to a better readable constant.  
						
						 
						
						
						
					 
					
						2014-11-20 21:37:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							13bb46d550 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						
						
					 
					
						2014-11-20 19:20:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a207240881 
							
						 
					 
					
						
						
							
							fixed potential NPEs  
						
						 
						
						
						
					 
					
						2014-11-20 18:42:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a142dcc263 
							
						 
					 
					
						
						
							
							import fixes  
						
						 
						
						
						
					 
					
						2014-11-20 18:33:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8b10ea676c 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-20 18:20:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0ad6d0616f 
							
						 
					 
					
						
						
							
							brought ad hoc conferences back.  fixed   #688   fixed   #367  
						
						 
						
						
						
					 
					
						2014-11-20 18:20:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							73d184352e 
							
						 
					 
					
						
						
							
							Remove broken / unused imports  
						
						 
						
						
						
					 
					
						2014-11-19 14:57:23 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e9948f6b84 
							
						 
					 
					
						
						
							
							sent read marker to full jid  
						
						 
						
						
						
					 
					
						2014-11-19 17:40:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cbf42ee12c 
							
						 
					 
					
						
						
							
							some saftey checks before registering listeners in XmppActivity  
						
						 
						
						
						
					 
					
						2014-11-19 17:31:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b9a507633 
							
						 
					 
					
						
						
							
							Merge pull request  #691  from kruks23/development  
						
						 
						
						... 
						
						
						
						Update spanish translation 
						
					 
					
						2014-11-19 17:22:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							393807ab2d 
							
						 
					 
					
						
						
							
							Merge pull request  #692  from kriztan/patch-3  
						
						 
						
						... 
						
						
						
						Update german translations 
						
					 
					
						2014-11-19 17:22:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aitor Beriain 
							
						 
					 
					
						
						
						
						
							
						
						
							24b5d0eb26 
							
						 
					 
					
						
						
							
							Update basque translation  
						
						 
						
						
						
					 
					
						2014-11-19 16:12:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							6847594363 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						
						
					 
					
						2014-11-19 08:51:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							3ccee22c86 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2014-11-19 00:16:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							8f33f3540a 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2014-11-18 23:53:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							66087cb360 
							
						 
					 
					
						
						
							
							put error notification into notification service  
						
						 
						
						
						
					 
					
						2014-11-18 15:26:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1122e084a0 
							
						 
					 
					
						
						
							
							simplified message merge condition  
						
						 
						
						
						
					 
					
						2014-11-18 14:49:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							10bf2b77a8 
							
						 
					 
					
						
						
							
							synchronized message list in conversation fragment  
						
						 
						
						
						
					 
					
						2014-11-18 14:43:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dcebc120ac 
							
						 
					 
					
						
						
							
							show dynamic tags in contacts activity as well  
						
						 
						
						
						
					 
					
						2014-11-18 14:24:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ab832bcff7 
							
						 
					 
					
						
						
							
							properly remove conversations context menu  
						
						 
						
						
						
					 
					
						2014-11-18 13:51:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d29c861d03 
							
						 
					 
					
						
						
							
							disabled broken conversations context menu  
						
						 
						
						
						
					 
					
						2014-11-18 03:12:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							018a0c7978 
							
						 
					 
					
						
						
							
							better usage of synchronized in some places  
						
						 
						
						
						
					 
					
						2014-11-18 03:10:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							090e6ecf09 
							
						 
					 
					
						
						
							
							better exception handling in XmppConnection.connect. (never return without throwing exception. use finally to release wake lock. use status.server_not_found instead of status.offline when necessary  
						
						 
						
						
						
					 
					
						2014-11-18 01:48:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d2a4855a1e 
							
						 
					 
					
						
						
							
							added rendered versions of new icons  
						
						 
						
						
						
					 
					
						2014-11-18 00:42:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							240d2d68c8 
							
						 
					 
					
						
						
							
							context menu for conversations.  fixed   #630  
						
						 
						
						
						
					 
					
						2014-11-18 00:07:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							86241a260a 
							
						 
					 
					
						
						
							
							clear avatar cache with new roster push from server  
						
						 
						
						
						
					 
					
						2014-11-17 21:28:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							abbadcb58b 
							
						 
					 
					
						
						
							
							avoided some null pointers  
						
						 
						
						
						
					 
					
						2014-11-17 20:45:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f41c3eee04 
							
						 
					 
					
						
						
							
							context menu for muc participants + refactor trueCounterpart to use Jid class  
						
						 
						
						
						
					 
					
						2014-11-17 20:02:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							283d5058e5 
							
						 
					 
					
						
						
							
							synchronized around cache clear in avatar service  
						
						 
						
						
						
					 
					
						2014-11-17 20:01:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c058594ff5 
							
						 
					 
					
						
						
							
							Merge pull request  #681  from SamWhited/searchlocalefix  
						
						 
						
						... 
						
						
						
						Use `Locale.US' for string comparisons in search 
						
					 
					
						2014-11-17 18:27:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							b6d8977237 
							
						 
					 
					
						
						
							
							Use `Locale.US' for string comparisons in search  
						
						 
						
						
						
					 
					
						2014-11-17 12:19:45 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e664a0c936 
							
						 
					 
					
						
						
							
							Merge pull request  #680  from ferdev1/patch-2  
						
						 
						
						... 
						
						
						
						Fix string 2 
						
					 
					
						2014-11-17 18:14:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8865cc406c 
							
						 
					 
					
						
						
							
							trim search before searching  
						
						 
						
						
						
					 
					
						2014-11-17 17:31:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1a5af45afb 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-17 17:24:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							252c7e68d6 
							
						 
					 
					
						
						
							
							split search keywords by whitespaces and imply AND operatior  
						
						 
						
						
						
					 
					
						2014-11-17 17:24:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e30e84c819 
							
						 
					 
					
						
						
							
							slightly modified logo / launcher icon  
						
						 
						
						
						
					 
					
						2014-11-17 17:23:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ferdev1 
							
						 
					 
					
						
						
						
						
							
						
						
							6c13b8a9a1 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						 
						
						
						
					 
					
						2014-11-17 17:13:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							55957a77b3 
							
						 
					 
					
						
						
							
							Fix linter suppression  
						
						 
						
						
						
					 
					
						2014-11-17 09:19:11 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ceecc8ffe7 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-17 01:54:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							967cd922e1 
							
						 
					 
					
						
						
							
							highlight muc members by touching their name in muc details.  fixed   #503  
						
						 
						
						
						
					 
					
						2014-11-17 01:54:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							81b93c763a 
							
						 
					 
					
						
						
							
							Merge pull request  #675  from ferdev1/patch-1  
						
						 
						
						... 
						
						
						
						Fix string 
						
					 
					
						2014-11-17 00:04:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2036c58cd7 
							
						 
					 
					
						
						
							
							made tags searchable  
						
						 
						
						
						
					 
					
						2014-11-16 23:58:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8c4236b01b 
							
						 
					 
					
						
						
							
							fixed regression of xmpp uris not working  
						
						 
						
						
						
					 
					
						2014-11-16 22:23:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ferdev1 
							
						 
					 
					
						
						
						
						
							
						
						
							c147f44cf1 
							
						 
					 
					
						
						
							
							Fix string  
						
						 
						
						
						
					 
					
						2014-11-16 18:11:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							155b607f4d 
							
						 
					 
					
						
						
							
							Merge pull request  #673  from SamWhited/development  
						
						 
						
						... 
						
						
						
						Fix fetching accounts by JIDs 
						
					 
					
						2014-11-16 17:35:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cf00f3fade 
							
						 
					 
					
						
						
							
							happy hanukkah  
						
						 
						
						
						
					 
					
						2014-11-16 17:21:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							5765a91db6 
							
						 
					 
					
						
						
							
							Fix fetching accounts by JIDs  
						
						 
						
						... 
						
						
						
						Fixes a crash when publishing an avatar 
						
					 
					
						2014-11-16 10:04:45 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							84b2ce10b7 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-16 12:28:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ac8c2b7e62 
							
						 
					 
					
						
						
							
							show full time stamp in connection established field  
						
						 
						
						
						
					 
					
						2014-11-16 12:11:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f18f3086af 
							
						 
					 
					
						
						
							
							better error checking in ssl switch over  
						
						 
						
						
						
					 
					
						2014-11-16 12:00:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							cfdda5f8fd 
							
						 
					 
					
						
						
							
							Don't escape passwords in SASL  
						
						 
						
						... 
						
						
						
						Fixes  #671  
						
					 
					
						2014-11-15 21:11:14 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2067b9bd8d 
							
						 
					 
					
						
						
							
							made scan and show qr code more accessible in VerifyOtrActivity  
						
						 
						
						
						
					 
					
						2014-11-16 02:10:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b21bc13fc 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2014-11-16 00:34:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ac4eabbd22 
							
						 
					 
					
						
						
							
							close cursor for database  
						
						 
						
						
						
					 
					
						2014-11-16 00:34:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88c3537b68 
							
						 
					 
					
						
						
							
							parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible  
						
						 
						
						
						
					 
					
						2014-11-16 00:20:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0fb1772f18 
							
						 
					 
					
						
						
							
							Merge pull request  #669  from SamWhited/scramcaching  
						
						 
						
						... 
						
						
						
						Cache SCRAM-SHA-1 keys for current session 
						
					 
					
						2014-11-15 21:02:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a8fa8b498 
							
						 
					 
					
						
						
							
							Merge pull request  #670  from kruks23/translation9  
						
						 
						
						... 
						
						
						
						Update Spanish Translations 
						
					 
					
						2014-11-15 21:00:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5a634fdf47 
							
						 
					 
					
						
						
							
							small modifications for changing an account status in XmppConnection  
						
						 
						
						
						
					 
					
						2014-11-15 20:54:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							0dc711d710 
							
						 
					 
					
						
						
							
							Update Spanish Translations  
						
						 
						
						
						
					 
					
						2014-11-15 20:48:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a463f82e3b 
							
						 
					 
					
						
						
							
							Cache SCRAM-SHA-1 keys for current session  
						
						 
						
						
						
					 
					
						2014-11-15 12:57:36 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							69ab8a2adb 
							
						 
					 
					
						
						
							
							Merge pull request  #668  from SamWhited/auth-pinning  
						
						 
						
						... 
						
						
						
						Auth mechanism pinning 
						
					 
					
						2014-11-15 17:44:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							17cec63c14 
							
						 
					 
					
						
						
							
							Set security error status on TLS cert mismatch  
						
						 
						
						
						
					 
					
						2014-11-15 11:40:41 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d2388a5a7e 
							
						 
					 
					
						
						
							
							Remove extra status wrapper method  
						
						 
						
						
						
					 
					
						2014-11-15 11:31:15 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							251f4d6d7f 
							
						 
					 
					
						
						
							
							Add incompatible server status  
						
						 
						
						
						
					 
					
						2014-11-15 11:29:58 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7ba9854c22 
							
						 
					 
					
						
						
							
							fixed some disco / carbon related bugs  
						
						 
						
						
						
					 
					
						2014-11-15 17:24:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							c09d450db8 
							
						 
					 
					
						
						
							
							Add security error status  
						
						 
						
						
						
					 
					
						2014-11-15 11:21:47 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d94b07c916 
							
						 
					 
					
						
						
							
							Make account status an enum  
						
						 
						
						
						
					 
					
						2014-11-15 11:12:41 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							847877f9d2 
							
						 
					 
					
						
						
							
							Add auth method pinning  
						
						 
						
						
						
					 
					
						2014-11-15 10:01:08 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							35bf13f5ef 
							
						 
					 
					
						
						
							
							Merge branch 'feature/file_transfer' into development  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/main/res/values/strings.xml 
						
					 
					
						2014-11-15 15:52:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							07b07115d6 
							
						 
					 
					
						
						
							
							Merge branch 'feature/foreground_service' into development  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/main/res/values/strings.xml 
						
					 
					
						2014-11-15 15:51:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5b9c690c47 
							
						 
					 
					
						
						
							
							Merge branch 'feature/otr_verification' into development  
						
						 
						
						
						
					 
					
						2014-11-15 15:50:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4c504dea7a 
							
						 
					 
					
						
						
							
							Merge pull request  #665  from SamWhited/issue71  
						
						 
						
						... 
						
						
						
						Add SCRAM-SHA1 support 
						
					 
					
						2014-11-15 15:34:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bdc86bb8e3 
							
						 
					 
					
						
						
							
							added low priority and removed date in foreground noticfication  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3c6b3506e3 
							
						 
					 
					
						
						
							
							turn on foreground service in expert settings  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							41f7848f2c 
							
						 
					 
					
						
						
							
							handled more error cases  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ca2d86cf87 
							
						 
					 
					
						
						
							
							better cleanup after unsuccesful transfers  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							47d44448f3 
							
						 
					 
					
						
						
							
							fixed description in notifications and conversation overview  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e0f012dba1 
							
						 
					 
					
						
						
							
							fixed resending for files as well  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cc4f3702a8 
							
						 
					 
					
						
						
							
							made file transfers cancelable  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4ab558715c 
							
						 
					 
					
						
						
							
							adepted conversationadapter to deal with files  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							af2922adea 
							
						 
					 
					
						
						
							
							progress for ibb transfers  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e7a70a46e0 
							
						 
					 
					
						
						
							
							some mime and pgp fixes for file transfer  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							16847a30c8 
							
						 
					 
					
						
						
							
							support for pgp files  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c7acfe85c3 
							
						 
					 
					
						
						
							
							progress for http images as well. fixed open button for sent files  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dac12be53e 
							
						 
					 
					
						
						
							
							copy non local files to private storage first  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							02cbda68a7 
							
						 
					 
					
						
						
							
							bug fixes and various improvements for file transfer  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7a90ca429b 
							
						 
					 
					
						
						
							
							basic arbitrary file transfer  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							4b5d6f5b4f 
							
						 
					 
					
						
						
							
							Improve auth error handling and state machine  
						
						 
						
						
						
					 
					
						2014-11-15 08:49:00 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e2fb32841b 
							
						 
					 
					
						
						
							
							Merge pull request  #666  from SamWhited/localefixes  
						
						 
						
						... 
						
						
						
						Spelling fixes 
						
					 
					
						2014-11-15 13:12:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8650bc2e13 
							
						 
					 
					
						
						
							
							Make licenses info untranslatable  
						
						 
						
						
						
					 
					
						2014-11-14 22:33:18 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							bae2b7ddc6 
							
						 
					 
					
						
						
							
							Spelling fixes in Italian translation  
						
						 
						
						
						
					 
					
						2014-11-14 22:16:58 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							62404b234c 
							
						 
					 
					
						
						
							
							Spelling fix in German translation  
						
						 
						
						
						
					 
					
						2014-11-14 22:13:42 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0e550789d3 
							
						 
					 
					
						
						
							
							Add SCRAM-SHA1 support  
						
						 
						
						... 
						
						
						
						Factor out GS2 tokanization into own class
Add authentication exception class
Fixes  #71  
						
					 
					
						2014-11-14 18:00:12 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kevin Rauwolf 
							
						 
					 
					
						
						
						
						
							
						
						
							2bb68bcbba 
							
						 
					 
					
						
						
							
							Added check for empty from on group chat packet  
						
						 
						
						
						
					 
					
						2014-11-14 11:40:43 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							793671023b 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-14 19:49:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3118340ade 
							
						 
					 
					
						
						
							
							fixed possible npe when loading null counterpart into message  
						
						 
						
						
						
					 
					
						2014-11-14 19:49:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2bbad26fb0 
							
						 
					 
					
						
						
							
							Merge pull request  #653  from kriztan/patch-2  
						
						 
						
						... 
						
						
						
						Update German language 
						
					 
					
						2014-11-14 12:16:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							17c2ed411d 
							
						 
					 
					
						
						
							
							made presences synchronized  
						
						 
						
						
						
					 
					
						2014-11-13 14:44:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2db569b20f 
							
						 
					 
					
						
						
							
							made presences synchronized  
						
						 
						
						
						
					 
					
						2014-11-13 14:44:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							77ba68d61f 
							
						 
					 
					
						
						
							
							more npe checks in muc packet parser  
						
						 
						
						
						
					 
					
						2014-11-13 14:27:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e6a4fa031b 
							
						 
					 
					
						
						
							
							more npe checks in muc packet parser  
						
						 
						
						
						
					 
					
						2014-11-13 14:27:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							88c8373553 
							
						 
					 
					
						
						
							
							Merge pull request  #656  from SamWhited/authrefactor  
						
						 
						
						... 
						
						
						
						Refactor authentication code 
						
					 
					
						2014-11-12 23:01:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							2222483b42 
							
						 
					 
					
						
						
							
							Make sure we're storing the display JID as Unicode  
						
						 
						
						
						
					 
					
						2014-11-12 16:19:16 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							fca3e3c756 
							
						 
					 
					
						
						
							
							Update German language  
						
						 
						
						... 
						
						
						
						deleted 'pref_about_message' 
						
					 
					
						2014-11-12 20:09:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							14cfb60952 
							
						 
					 
					
						
						
							
							Refactor authentication code  
						
						 
						
						
						
					 
					
						2014-11-12 10:15:38 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							b971965697 
							
						 
					 
					
						
						
							
							Update German language  
						
						 
						
						
						
					 
					
						2014-11-12 13:13:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f1e2be4096 
							
						 
					 
					
						
						
							
							check if account is online before doing smp  
						
						 
						
						
						
					 
					
						2014-11-12 12:45:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							52ca2e7391 
							
						 
					 
					
						
						
							
							Merge branch 'feature/otr_verification' of  https://github.com/siacs/Conversations  into feature/otr_verification  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java 
						
					 
					
						2014-11-11 17:45:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d1bf9a3f6d 
							
						 
					 
					
						
						
							
							use auto register for verify otr listeners  
						
						 
						
						
						
					 
					
						2014-11-11 17:42:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							76f4cf1a73 
							
						 
					 
					
						
						
							
							small bug fix  
						
						 
						
						
						
					 
					
						2014-11-11 17:40:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e33fc26cbe 
							
						 
					 
					
						
						
							
							added snackbar to indicate smp. more error handling in verify activity  
						
						 
						
						
						
					 
					
						2014-11-11 17:40:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6cd2ff0d88 
							
						 
					 
					
						
						
							
							initial smp support  
						
						 
						
						
						
					 
					
						2014-11-11 17:40:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e555fe4b03 
							
						 
					 
					
						
						
							
							auto register/unregister listeners  
						
						 
						
						
						
					 
					
						2014-11-11 17:39:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fce78abb1c 
							
						 
					 
					
						
						
							
							temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds  
						
						 
						
						
						
					 
					
						2014-11-11 00:16:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8cb97f517f 
							
						 
					 
					
						
						
							
							small bug fix  
						
						 
						
						
						
					 
					
						2014-11-10 23:47:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dc98b3dbd5 
							
						 
					 
					
						
						
							
							added snackbar to indicate smp. more error handling in verify activity  
						
						 
						
						
						
					 
					
						2014-11-10 22:03:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8740b55d37 
							
						 
					 
					
						
						
							
							initial smp support  
						
						 
						
						
						
					 
					
						2014-11-10 19:23:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c8a6b05163 
							
						 
					 
					
						
						
							
							made Jid class parse otr session ids  
						
						 
						
						
						
					 
					
						2014-11-10 11:37:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							89ee999e1b 
							
						 
					 
					
						
						
							
							more refactoring for presence selection. removed getTo, getFrom and getJid from Element  
						
						 
						
						
						
					 
					
						2014-11-10 01:24:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							26b4788733 
							
						 
					 
					
						
						
							
							formating  
						
						 
						
						
						
					 
					
						2014-11-09 21:27:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a01ff66537 
							
						 
					 
					
						
						
							
							Merge pull request  #645  from betheg/about_all_libs  
						
						 
						
						... 
						
						
						
						add all used libs to the pref_about_message 
						
					 
					
						2014-11-09 21:18:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							72068d1a26 
							
						 
					 
					
						
						
							
							fixed private messages  
						
						 
						
						
						
					 
					
						2014-11-09 21:14:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							b1da9ae3cc 
							
						 
					 
					
						
						
							
							add libidn to pref_about_message.  
						
						 
						
						
						
					 
					
						2014-11-09 21:02:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							385bea0fe3 
							
						 
					 
					
						
						
							
							s/getResourcepart().isEmpty()/isBareJid()/  
						
						 
						
						
						
					 
					
						2014-11-09 13:13:19 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							56b4ac1751 
							
						 
					 
					
						
						
							
							use isBareJid instead of getResourcePart().isEmpty()  
						
						 
						
						
						
					 
					
						2014-11-09 19:06:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							eb9e988361 
							
						 
					 
					
						
						
							
							fixed muc sender history for some cases (where the previous nick was a valid jid)  
						
						 
						
						
						
					 
					
						2014-11-09 18:24:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							69ef17efc0 
							
						 
					 
					
						
						
							
							migrated some otr stuff to new jid classes  
						
						 
						
						
						
					 
					
						2014-11-09 17:46:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c310ada8b3 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-09 17:05:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb1a36da79 
							
						 
					 
					
						
						
							
							Merge pull request  #642  from SamWhited/accountgetjid  
						
						 
						
						... 
						
						
						
						Rework `Account.getJid()' to return full JIDs 
						
					 
					
						2014-11-09 17:06:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e9af0d4ca7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2014-11-09 17:02:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							61f046a675 
							
						 
					 
					
						
						
							
							make avatar service not break on empty names  
						
						 
						
						
						
					 
					
						2014-11-09 17:02:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							180a0e4408 
							
						 
					 
					
						
						
							
							Rework `Account.getJid()' to return full JIDs  
						
						 
						
						... 
						
						
						
						Remove `Account.getFullJid()' 
						
					 
					
						2014-11-09 10:57:22 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ad6fef063b 
							
						 
					 
					
						
						
							
							fixed null pointer in message merger  
						
						 
						
						
						
					 
					
						2014-11-09 16:47:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							377bd49ee8 
							
						 
					 
					
						
						
							
							refactored code to always contain full jid for counterpart  
						
						 
						
						
						
					 
					
						2014-11-09 16:21:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b99b694eb 
							
						 
					 
					
						
						
							
							fixed full jid for account  
						
						 
						
						
						
					 
					
						2014-11-09 16:20:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							87c4fd9050 
							
						 
					 
					
						
						
							
							return null if from ist not set in abstract stanza  
						
						 
						
						
						
					 
					
						2014-11-09 16:18:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8437dbd480 
							
						 
					 
					
						
						
							
							Merge pull request  #641  from kruks23/translation8  
						
						 
						
						... 
						
						
						
						Update Spanish Translations 
						
					 
					
						2014-11-09 15:20:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							53c7905631 
							
						 
					 
					
						
						
							
							Check for illegal arguments to the toASCII func  
						
						 
						
						
						
					 
					
						2014-11-09 09:05:02 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							f146c203a9 
							
						 
					 
					
						
						
							
							add all used libs to the pref_about_message.  
						
						 
						
						... 
						
						
						
						also improve the notice a bit. 
						
					 
					
						2014-11-09 13:59:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							6f6f15d563 
							
						 
					 
					
						
						
							
							Update Spanish Translations  
						
						 
						
						
						
					 
					
						2014-11-09 13:29:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							7cfcf10f48 
							
						 
					 
					
						
						
							
							Fix contact highlighting in MUC  
						
						 
						
						
						
					 
					
						2014-11-09 07:20:08 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							fc594e9b73 
							
						 
					 
					
						
						
							
							Fix issue with IDN SRV records  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							02db197a89 
							
						 
					 
					
						
						
							
							Fix crash on account creation  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							cc34c60255 
							
						 
					 
					
						
						
							
							Don't crash on packets with no "from" specified  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							1a3327f2b1 
							
						 
					 
					
						
						
							
							Create avatar's for JID's w/o localparts  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							5ce0cd3802 
							
						 
					 
					
						
						
							
							Fields that we sync on should be final  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e49c2b14ed 
							
						 
					 
					
						
						
							
							Fix bug introduced by rebase  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							778fb9de6c 
							
						 
					 
					
						
						
							
							Fix letter avatar selection in MUC  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							efa4cec24d 
							
						 
					 
					
						
						
							
							More formatting fixes in MUC  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							dd426ca6de 
							
						 
					 
					
						
						
							
							Format contact names in MUC properly  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							1f5908b1d1 
							
						 
					 
					
						
						
							
							Fix JID parsing error  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							9db624ec7b 
							
						 
					 
					
						
						
							
							It builds again!  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							864f319500 
							
						 
					 
					
						
						
							
							Add a packet JID place I missed...  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f108fc5a5c 
							
						 
					 
					
						
						
							
							Update more files to use JID objects  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							bf9207456e 
							
						 
					 
					
						
						
							
							Update another chunk of stuff to use JID objects  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f15900426d 
							
						 
					 
					
						
						
							
							Update more files to use JID objects  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							9053f4aca0 
							
						 
					 
					
						
						
							
							Move a chunk of classes over to using JID objects  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a990861316 
							
						 
					 
					
						
						
							
							Use factories to generate JIDs  
						
						 
						
						
						
					 
					
						2014-11-09 06:59:49 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a11878b139 
							
						 
					 
					
						
						
							
							Improve JID error handling  
						
						 
						
						
						
					 
					
						2014-11-09 06:59:49 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8e23b6c272 
							
						 
					 
					
						
						
							
							Add first attempt at JID class  
						
						 
						
						
						
					 
					
						2014-11-09 06:59:49 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							589bf01545 
							
						 
					 
					
						
						
							
							version bump to 0.8.3 + changelog  
						
						 
						
						
						
					 
					
						2014-11-09 11:08:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4d7bee2e38 
							
						 
					 
					
						
						
							
							fixed   #634  
						
						 
						
						
						
					 
					
						2014-11-09 10:51:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6f24432ae3 
							
						 
					 
					
						
						
							
							use proper theme for MTM  
						
						 
						
						
						
					 
					
						2014-11-09 10:51:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							acfbd44529 
							
						 
					 
					
						
						
							
							got rid of MTM and mRandom variable in favor of using a reference to service  
						
						 
						
						
						
					 
					
						2014-11-09 10:50:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							047aaf5d4f 
							
						 
					 
					
						
						
							
							check if socket was null before doing ssl connect  
						
						 
						
						
						
					 
					
						2014-11-08 20:52:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ea657ece0d 
							
						 
					 
					
						
						
							
							update conversation fragment on every backend connect  
						
						 
						
						
						
					 
					
						2014-11-08 20:51:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8a2f20b6ed 
							
						 
					 
					
						
						
							
							Merge pull request  #549  from emdete/p2  
						
						 
						
						... 
						
						
						
						adjust api level wrapping 
						
					 
					
						2014-11-08 13:32:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							014f5a195b 
							
						 
					 
					
						
						
							
							bug fixes for the previous ui refactoring  
						
						 
						
						
						
					 
					
						2014-11-07 21:49:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e45d7bda38 
							
						 
					 
					
						
						
							
							UI code refactoring  
						
						 
						
						
						
					 
					
						2014-11-07 15:38:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e42b6d715b 
							
						 
					 
					
						
						
							
							fixed   #633  
						
						 
						
						
						
					 
					
						2014-11-06 17:25:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dace729c5b 
							
						 
					 
					
						
						
							
							don't show avatar on initial account creation  
						
						 
						
						
						
					 
					
						2014-11-06 16:51:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							413623337b 
							
						 
					 
					
						
						
							
							version bump to 0.8.2  
						
						 
						
						
						
					 
					
						2014-11-06 10:32:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2253814519 
							
						 
					 
					
						
						
							
							fixed notifications for images  
						
						 
						
						
						
					 
					
						2014-11-05 21:37:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6a43bda4d7 
							
						 
					 
					
						
						
							
							fixed   #617  
						
						 
						
						
						
					 
					
						2014-11-05 00:06:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8d5d6b2b5 
							
						 
					 
					
						
						
							
							reformated license a bit  
						
						 
						
						
						
					 
					
						2014-11-04 23:47:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c94804813 
							
						 
					 
					
						
						
							
							Merge pull request  #626  from SamWhited/issue612  
						
						 
						
						... 
						
						
						
						Add last seen info to the database 
						
					 
					
						2014-11-04 22:59:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7d4e03cc9a 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-04 22:56:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							96563aca52 
							
						 
					 
					
						
						
							
							Add last seen info to the database  
						
						 
						
						... 
						
						
						
						Fixes  #612  
						
					 
					
						2014-11-04 16:41:35 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							e22d3b4946 
							
						 
					 
					
						
						
							
							adjust api level wrapping  
						
						 
						
						
						
					 
					
						2014-11-04 20:05:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							df786cbf01 
							
						 
					 
					
						
						
							
							Shorten license text and fix height of scrollview  
						
						 
						
						
						
					 
					
						2014-11-04 13:26:48 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							7b67f1a19c 
							
						 
					 
					
						
						
							
							Use normal text size and color  
						
						 
						
						
						
					 
					
						2014-11-04 13:17:15 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							55c81eaf15 
							
						 
					 
					
						
						
							
							Make links clickable in about text  
						
						 
						
						
						
					 
					
						2014-11-04 13:09:56 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88c0793694 
							
						 
					 
					
						
						
							
							link to account details when touching own avatar  
						
						 
						
						
						
					 
					
						2014-11-04 18:52:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f10dd428ba 
							
						 
					 
					
						
						
							
							Convert about dialog to activity  
						
						 
						
						
						
					 
					
						2014-11-04 12:48:46 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							97b4b012d0 
							
						 
					 
					
						
						
							
							Use real copyright symbol ©  
						
						 
						
						
						
					 
					
						2014-11-04 12:48:25 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8bf40308c8 
							
						 
					 
					
						
						
							
							Move AboutDialog to correct path  
						
						 
						
						
						
					 
					
						2014-11-04 12:47:58 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							df54ee75b4 
							
						 
					 
					
						
						
							
							Add about dialog with license info  
						
						 
						
						
						
					 
					
						2014-11-04 12:47:58 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ff10b094a0 
							
						 
					 
					
						
						
							
							clear avatar cache after nick name change  
						
						 
						
						
						
					 
					
						2014-11-04 18:27:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ff22f93185 
							
						 
					 
					
						
						
							
							Merge pull request  #625  from SamWhited/linterfix  
						
						 
						
						... 
						
						
						
						Make linter ignore properly checked API mismatch 
						
					 
					
						2014-11-04 17:59:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							b234b690c9 
							
						 
					 
					
						
						
							
							Make linter ignore properly checked API mismatch  
						
						 
						
						
						
					 
					
						2014-11-04 11:52:47 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cd5a56e8e7 
							
						 
					 
					
						
						
							
							show avatar in editaccount  
						
						 
						
						
						
					 
					
						2014-11-04 17:38:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b824e55277 
							
						 
					 
					
						
						
							
							register nfc callback in every activity that provides a proper sharable uri  
						
						 
						
						
						
					 
					
						2014-11-04 17:10:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							2ce95b19a9 
							
						 
					 
					
						
						
							
							optimize code abit  
						
						 
						
						
						
					 
					
						2014-11-04 13:32:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							b6c20d9260 
							
						 
					 
					
						
						
							
							implement "correct" ndef parsing  
						
						 
						
						
						
					 
					
						2014-11-04 13:32:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b3582c970e 
							
						 
					 
					
						
						
							
							made qr code available from muc and contact details as well  
						
						 
						
						
						
					 
					
						2014-11-04 12:15:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							12e2f0bdd7 
							
						 
					 
					
						
						
							
							added missing return statement. fixed api bug  
						
						 
						
						
						
					 
					
						2014-11-04 11:04:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							fb24bf98c9 
							
						 
					 
					
						
						
							
							be more OO  
						
						 
						
						
						
					 
					
						2014-11-04 10:49:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							32396b3bde 
							
						 
					 
					
						
						
							
							support pre JELLY_BEAN ndef  
						
						 
						
						
						
					 
					
						2014-11-04 10:48:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7a9327d960 
							
						 
					 
					
						
						
							
							fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete  
						
						 
						
						
						
					 
					
						2014-11-03 23:47:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d458919c8f 
							
						 
					 
					
						
						
							
							unfinishd qr code implemenation. thanks to @emdete  
						
						 
						
						
						
					 
					
						2014-11-03 22:47:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							08cb23a886 
							
						 
					 
					
						
						
							
							fixed merge error  
						
						 
						
						
						
					 
					
						2014-11-03 21:22:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7d7be8efd8 
							
						 
					 
					
						
						
							
							Merge branch 'nfc' of  https://github.com/siacs/Conversations  into nfc  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/main/AndroidManifest.xml 
						
					 
					
						2014-11-03 21:07:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a054a3fbb4 
							
						 
					 
					
						
						
							
							use different filter for nfc intents  
						
						 
						
						
						
					 
					
						2014-11-03 21:04:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							28a186cd6c 
							
						 
					 
					
						
						
							
							basic beam code / untested  
						
						 
						
						
						
					 
					
						2014-11-03 20:55:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4614ff343e 
							
						 
					 
					
						
						
							
							create file explicitly before downloading image  
						
						 
						
						
						
					 
					
						2014-11-03 20:55:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c48407f3b4 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-03 20:28:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							696dd07a41 
							
						 
					 
					
						
						
							
							basic beam code / untested  
						
						 
						
						
						
					 
					
						2014-11-03 20:00:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ec9c264cf7 
							
						 
					 
					
						
						
							
							more error handling for http connection  
						
						 
						
						
						
					 
					
						2014-11-03 19:59:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							39ae34d3e6 
							
						 
					 
					
						
						
							
							Wrap "last seen" time.  
						
						 
						
						... 
						
						
						
						Fixes  #611  
						
					 
					
						2014-11-03 08:28:20 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3e05ef77b1 
							
						 
					 
					
						
						
							
							version bump to 0.8.1  
						
						 
						
						
						
					 
					
						2014-11-03 11:20:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							49920649db 
							
						 
					 
					
						
						
							
							always use exif helper  
						
						 
						
						
						
					 
					
						2014-11-03 11:20:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							27f42dfb63 
							
						 
					 
					
						
						
							
							more error handling in xmppconnection  
						
						 
						
						
						
					 
					
						2014-11-03 10:03:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1ea2e7dc3b 
							
						 
					 
					
						
						
							
							fixed arrayoutofbounds + spelling  
						
						 
						
						
						
					 
					
						2014-11-01 14:33:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							46f147a82c 
							
						 
					 
					
						
						
							
							Merge branch 'gradle' into development  
						
						 
						
						... 
						
						
						
						Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib 
						
					 
					
						2014-10-30 15:33:13 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7b4f3637db 
							
						 
					 
					
						
						
							
							only end otr session if there is more than one contact presence. reset otherwise  
						
						 
						
						
						
					 
					
						2014-10-30 10:59:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e4567e7a62 
							
						 
					 
					
						
						
							
							cleanup for clear conversation history. small otr fixes  
						
						 
						
						
						
					 
					
						2014-10-30 00:31:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1b62d94093 
							
						 
					 
					
						
						
							
							replace the exif interface with a small static class from 3d gallery  
						
						 
						
						
						
					 
					
						2014-10-29 18:12:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							03593ba56f 
							
						 
					 
					
						
						
							
							proper error state for images  
						
						 
						
						
						
					 
					
						2014-10-29 11:31:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							64209829f7 
							
						 
					 
					
						
						
							
							fixed 'share image' context menu  
						
						 
						
						
						
					 
					
						2014-10-29 09:57:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bb26a84269 
							
						 
					 
					
						
						
							
							fixed intent managment  
						
						 
						
						
						
					 
					
						2014-10-29 09:57:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							962e8183f6 
							
						 
					 
					
						
						
							
							end otr session if plain text message from another instance is being received  
						
						 
						
						
						
					 
					
						2014-10-28 18:02:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f256a466d8 
							
						 
					 
					
						
						
							
							improvements on findConversation  
						
						 
						
						
						
					 
					
						2014-10-28 17:15:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							161623eca2 
							
						 
					 
					
						
						
							
							always show verify fingerprint if there is an active otr session  
						
						 
						
						
						
					 
					
						2014-10-28 17:15:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7dcce220cb 
							
						 
					 
					
						
						
							
							reworked dns retry  
						
						 
						
						
						
					 
					
						2014-10-27 21:48:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							915def24f9 
							
						 
					 
					
						
						
							
							removed unnecessary logging from avatar service  
						
						 
						
						
						
					 
					
						2014-10-27 21:48:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							698572d218 
							
						 
					 
					
						
						
							
							proper cleanup after pgp image decryption  
						
						 
						
						
						
					 
					
						2014-10-27 21:47:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f45a841caf 
							
						 
					 
					
						
						
							
							fixed url parsing  
						
						 
						
						
						
					 
					
						2014-10-27 21:47:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							da822ebae8 
							
						 
					 
					
						
						
							
							check for links in pgp encrypted messages as well  
						
						 
						
						
						
					 
					
						2014-10-27 11:00:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b045dea549 
							
						 
					 
					
						
						
							
							set divider for image meta information to '|' to not conflict with URL. breaks images downloaded in between 0.7.3 and now  
						
						 
						
						
						
					 
					
						2014-10-26 20:18:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d86b7f3192 
							
						 
					 
					
						
						
							
							Merge pull request  #588  from betheg/remove_unused_cast  
						
						 
						
						... 
						
						
						
						remove some unused cast 
						
					 
					
						2014-10-26 20:17:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							020dc863b1 
							
						 
					 
					
						
						
							
							remove some unused cast  
						
						 
						
						
						
					 
					
						2014-10-26 18:54:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							8dae4b1eb9 
							
						 
					 
					
						
						
							
							fix possible fallthrough.  
						
						 
						
						
						
					 
					
						2014-10-26 18:30:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8171633eb9 
							
						 
					 
					
						
						
							
							don't merge downloadable messages  
						
						 
						
						
						
					 
					
						2014-10-24 23:18:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8fb8985412 
							
						 
					 
					
						
						
							
							added message option to download images  
						
						 
						
						
						
					 
					
						2014-10-24 19:30:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e1f11a5735 
							
						 
					 
					
						
						
							
							also show some text in new image notification  
						
						 
						
						
						
					 
					
						2014-10-24 18:27:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							864f3610b3 
							
						 
					 
					
						
						
							
							picture notification and some drive by bug fixes  
						
						 
						
						
						
					 
					
						2014-10-24 14:34:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cbc3d9bd6f 
							
						 
					 
					
						
						
							
							notify only after image has been received over http. introduced mini grace for catching up with SM or offline messages  
						
						 
						
						
						
					 
					
						2014-10-24 13:29:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d73a77643d 
							
						 
					 
					
						
						
							
							context menu for messages. allow to resend single messages  
						
						 
						
						
						
					 
					
						2014-10-23 21:27:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							281ce3105f 
							
						 
					 
					
						
						
							
							Make conversations the root project  
						
						 
						
						
						
					 
					
						2014-10-22 15:47:11 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d04afe453a 
							
						 
					 
					
						
						
							
							ability to download pgp encrypted files over http as well  
						
						 
						
						
						
					 
					
						2014-10-22 19:05:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c067bf96b0 
							
						 
					 
					
						
						
							
							small bug fixes for the conversation activity  
						
						 
						
						
						
					 
					
						2014-10-22 17:32:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							62b0fc3fda 
							
						 
					 
					
						
						
							
							made httpconnection accept aes encrypted files  
						
						 
						
						
						
					 
					
						2014-10-22 13:06:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							45bdadd915 
							
						 
					 
					
						
						
							
							better aproach on thread saftey  
						
						 
						
						
						
					 
					
						2014-10-22 00:25:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							df2257aed6 
							
						 
					 
					
						
						
							
							added hostname verifier to httpconnection  
						
						 
						
						
						
					 
					
						2014-10-22 00:00:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							40c74b432e 
							
						 
					 
					
						
						
							
							made iterating over hashmap in notification service thread safe  
						
						 
						
						
						
					 
					
						2014-10-21 23:59:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							63704b114c 
							
						 
					 
					
						
						
							
							throw exception when no servers are left to try  
						
						 
						
						
						
					 
					
						2014-10-21 20:13:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3821a72644 
							
						 
					 
					
						
						
							
							fixed   #564  
						
						 
						
						
						
					 
					
						2014-10-21 19:43:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a56ee63a3e 
							
						 
					 
					
						
						
							
							update ui when new avatar was found  
						
						 
						
						
						
					 
					
						2014-10-21 15:26:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0d767c3971 
							
						 
					 
					
						
						
							
							proper avatar caching  
						
						 
						
						
						
					 
					
						2014-10-21 14:57:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							21961673cb 
							
						 
					 
					
						
						
							
							refactored avatar generation. first step  
						
						 
						
						
						
					 
					
						2014-10-20 21:08:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0bb2c3c4d5 
							
						 
					 
					
						
						
							
							keep reference to previous and next message in message  
						
						 
						
						
						
					 
					
						2014-10-20 17:01:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0b61fb0129 
							
						 
					 
					
						
						
							
							Merge pull request  #554  from SamWhited/tls  
						
						 
						
						... 
						
						
						
						Enable TLSv1.1 and 1.2 and add option to enable/disable SSLv3 
						
					 
					
						2014-10-20 00:03:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8263e07336 
							
						 
					 
					
						
						
							
							mtm support for image downloader  
						
						 
						
						
						
					 
					
						2014-10-19 23:42:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							44f9022d95 
							
						 
					 
					
						
						
							
							use new 'api' to add messages to a conversation  
						
						 
						
						
						
					 
					
						2014-10-19 23:15:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c9238ef5ae 
							
						 
					 
					
						
						
							
							force tls for registrations as well  
						
						 
						
						
						
					 
					
						2014-10-19 23:14:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a201f9e53f 
							
						 
					 
					
						
						
							
							got rid of copyonwrite array list for messages  
						
						 
						
						
						
					 
					
						2014-10-19 23:13:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							99ee049115 
							
						 
					 
					
						
						
							
							Make legacy SSL option default to false  
						
						 
						
						
						
					 
					
						2014-10-19 16:11:35 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							6c7c3ddf15 
							
						 
					 
					
						
						
							
							Add "Enable legacy SSL" preference  
						
						 
						
						
						
					 
					
						2014-10-19 15:53:03 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e8bf75d79b 
							
						 
					 
					
						
						
							
							force tls  
						
						 
						
						
						
					 
					
						2014-10-19 20:48:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f824193c56 
							
						 
					 
					
						
						
							
							Merge branch 'srv_fix' of  https://github.com/lactide/Conversations  into lactide-srv_fix  
						
						 
						
						
						
					 
					
						2014-10-19 20:17:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							113b7d1736 
							
						 
					 
					
						
						
							
							Remove support for legacy SSL  
						
						 
						
						
						
					 
					
						2014-10-18 20:22:26 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0605390144 
							
						 
					 
					
						
						
							
							do not attempt to download images when not connected  
						
						 
						
						
						
					 
					
						2014-10-17 13:09:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3372e50155 
							
						 
					 
					
						
						
							
							made grace period on a per account basis  
						
						 
						
						
						
					 
					
						2014-10-17 11:01:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank Zschockelt 
							
						 
					 
					
						
						
						
						
							
						
						
							c725da954c 
							
						 
					 
					
						
						
							
							try all srv responses if necessary  
						
						 
						
						
						
					 
					
						2014-10-16 23:31:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5e3caf9626 
							
						 
					 
					
						
						
							
							additonal safty net for disabling notifications  
						
						 
						
						
						
					 
					
						2014-10-16 19:10:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0fd634ae52 
							
						 
					 
					
						
						
							
							simplified determination whether otr needs starting in a session  
						
						 
						
						
						
					 
					
						2014-10-16 16:09:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							c4b9d42861 
							
						 
					 
					
						
						
							
							Enable all supported protocols including TLSv1.1 and 1.2  
						
						 
						
						
						
					 
					
						2014-10-16 10:02:47 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c1a55608df 
							
						 
					 
					
						
						
							
							log ending otr sessions on disconnect  
						
						 
						
						
						
					 
					
						2014-10-16 15:53:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6cfb14a2e4 
							
						 
					 
					
						
						
							
							forground/background logging without csi  
						
						 
						
						
						
					 
					
						2014-10-16 15:39:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							45e0f99b88 
							
						 
					 
					
						
						
							
							make image download message to type=image only after completion  
						
						 
						
						
						
					 
					
						2014-10-16 15:29:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88d88ffb7b 
							
						 
					 
					
						
						
							
							added file observer to get notified when files are deleted:  fixes   #396  
						
						 
						
						
						
					 
					
						2014-10-16 02:39:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f5019ba966 
							
						 
					 
					
						
						
							
							detect deleted files on start up. got rid of lagecy image provider for performance reasons. NOTE: this will prevent you to access images older than version 0.6  
						
						 
						
						
						
					 
					
						2014-10-15 22:08:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cb4069f0f2 
							
						 
					 
					
						
						
							
							refactored file download status. make image http download available for carbon copied (sent) messages as well  
						
						 
						
						
						
					 
					
						2014-10-15 19:32:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1927a3d99c 
							
						 
					 
					
						
						
							
							Merge pull request  #547  from emdete/p0  
						
						 
						
						... 
						
						
						
						remove warning about <> cast 
						
					 
					
						2014-10-15 15:38:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							f021ee8562 
							
						 
					 
					
						
						
							
							remove warning about <> cast  
						
						 
						
						
						
					 
					
						2014-10-15 15:25:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9d960f2741 
							
						 
					 
					
						
						
							
							synchronization for listeners  
						
						 
						
						
						
					 
					
						2014-10-15 14:41:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f063b1c063 
							
						 
					 
					
						
						
							
							synchronization for notification  
						
						 
						
						
						
					 
					
						2014-10-15 14:33:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1428628a5d 
							
						 
					 
					
						
						
							
							removed unecessary update  
						
						 
						
						
						
					 
					
						2014-10-15 14:32:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d09739d166 
							
						 
					 
					
						
						
							
							changed pgp decoding mechanism  
						
						 
						
						
						
					 
					
						2014-10-15 02:09:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3c557a1bb4 
							
						 
					 
					
						
						
							
							don't show invalid file size  
						
						 
						
						
						
					 
					
						2014-10-14 19:33:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							262128c8f9 
							
						 
					 
					
						
						
							
							recreate http connection after restart. fixes stale download button. better failing  
						
						 
						
						
						
					 
					
						2014-10-14 19:27:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							031b739af8 
							
						 
					 
					
						
						
							
							catch can't open database exception  
						
						 
						
						
						
					 
					
						2014-10-14 18:26:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e98460771b 
							
						 
					 
					
						
						
							
							read image bounds on downloaded image  
						
						 
						
						
						
					 
					
						2014-10-14 18:16:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							470410b389 
							
						 
					 
					
						
						
							
							possible work around for notification bug  
						
						 
						
						
						
					 
					
						2014-10-14 17:14:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c18e986a93 
							
						 
					 
					
						
						
							
							fixed rare npe  
						
						 
						
						
						
					 
					
						2014-10-14 16:25:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4fdc6b2eac 
							
						 
					 
					
						
						
							
							renaming  
						
						 
						
						
						
					 
					
						2014-10-14 12:02:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bbb0693f4a 
							
						 
					 
					
						
						
							
							basic image over http downloading  
						
						 
						
						
						
					 
					
						2014-10-14 01:06:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e373bc89f 
							
						 
					 
					
						
						
							
							Merge pull request  #543  from emdete/dedepricate  
						
						 
						
						... 
						
						
						
						use setAlpha(float) method, not the deprecated one 
						
					 
					
						2014-10-13 18:15:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d61e4cce10 
							
						 
					 
					
						
						
							
							reworked muc details and contact details a bit  
						
						 
						
						
						
					 
					
						2014-10-13 14:36:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							a42f0dd3bc 
							
						 
					 
					
						
						
							
							use setAlpha(float) method, not the depricated one  
						
						 
						
						
						
					 
					
						2014-10-13 14:08:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2ec021a426 
							
						 
					 
					
						
						
							
							redesigned contact details a bit  
						
						 
						
						
						
					 
					
						2014-10-13 12:36:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c6f9b23def 
							
						 
					 
					
						
						
							
							fixed npes  
						
						 
						
						
						
					 
					
						2014-10-09 23:08:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							ce446840fc 
							
						 
					 
					
						
						
							
							remove this.this member  
						
						 
						
						
						
					 
					
						2014-10-08 16:54:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							10411944b1 
							
						 
					 
					
						
						
							
							bullet proofing some code  
						
						 
						
						
						
					 
					
						2014-10-08 14:10:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3d88ffc5cd 
							
						 
					 
					
						
						
							
							fixed possible logout bugs  
						
						 
						
						
						
					 
					
						2014-10-08 12:21:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3737a96dbb 
							
						 
					 
					
						
						
							
							refactored read marker  
						
						 
						
						
						
					 
					
						2014-10-07 16:02:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							919c98207b 
							
						 
					 
					
						
						
							
							made disabled notifications permanent across restarts  
						
						 
						
						
						
					 
					
						2014-10-07 15:18:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d5227e5c25 
							
						 
					 
					
						
						
							
							refactored grace period  
						
						 
						
						
						
					 
					
						2014-10-07 13:37:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7f52435273 
							
						 
					 
					
						
						
							
							fixed regression of not showing status message  
						
						 
						
						
						
					 
					
						2014-10-07 11:51:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b6f5e4a217 
							
						 
					 
					
						
						
							
							cleanung up the scroll fix a little  
						
						 
						
						
						
					 
					
						2014-10-06 22:03:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0a93093bc7 
							
						 
					 
					
						
						
							
							fixed npe  
						
						 
						
						
						
					 
					
						2014-10-06 19:27:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							16d5429f80 
							
						 
					 
					
						
						
							
							muc options clean up  
						
						 
						
						
						
					 
					
						2014-10-06 13:34:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b788b84c31 
							
						 
					 
					
						
						
							
							refactored muc bookmark to extend element. keep all elements the server or other clients added before  
						
						 
						
						
						
					 
					
						2014-10-06 00:33:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6b3097ee27 
							
						 
					 
					
						
						
							
							only delivery get and set iq packets to unhandled iq listener. only create jingle packets with type=get or set  
						
						 
						
						
						
					 
					
						2014-10-05 14:26:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ddb76b0e73 
							
						 
					 
					
						
						
							
							fixed rare npe  
						
						 
						
						
						
					 
					
						2014-10-05 14:05:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7f7a73ce7 
							
						 
					 
					
						
						
							
							Merge pull request  #524  from betheg/muc_errors_conditions  
						
						 
						
						... 
						
						
						
						MUC: differentiated a few more errors. 
						
					 
					
						2014-10-05 13:18:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bf893bee08 
							
						 
					 
					
						
						
							
							Merge pull request  #523  from betheg/leaked_window  
						
						 
						
						... 
						
						
						
						fixed an 'activity has leaked window' 
						
					 
					
						2014-10-05 13:18:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							54e9235bfc 
							
						 
					 
					
						
						
							
							MUC: differentiated a few more errors.  
						
						 
						
						
						
					 
					
						2014-10-05 12:31:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4a260baa12 
							
						 
					 
					
						
						
							
							fixed   #510  
						
						 
						
						
						
					 
					
						2014-10-05 12:05:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							26ce62f365 
							
						 
					 
					
						
						
							
							end otr session instead of only resetting  
						
						 
						
						
						
					 
					
						2014-10-05 11:14:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							45bd0449fb 
							
						 
					 
					
						
						
							
							sending initial ping before going online after login/resume to ensure that all presences and messages have been loaded  
						
						 
						
						
						
					 
					
						2014-10-05 10:46:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							5250ef536f 
							
						 
					 
					
						
						
							
							fixed an 'activity has leaked window'  
						
						 
						
						
						
					 
					
						2014-10-04 18:32:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5371dd025a 
							
						 
					 
					
						
						
							
							no dns retry after nosrv error  
						
						 
						
						
						
					 
					
						2014-10-04 14:33:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d5e62ffe89 
							
						 
					 
					
						
						
							
							added missing status messages after message scroll  
						
						 
						
						
						
					 
					
						2014-10-04 14:32:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							79315bdd61 
							
						 
					 
					
						
						
							
							reset pending subscription request  
						
						 
						
						
						
					 
					
						2014-10-04 14:32:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							18409946c6 
							
						 
					 
					
						
						
							
							implemented ping (xep-0199)  fixed   #517  
						
						 
						
						
						
					 
					
						2014-10-03 19:24:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							9a4b48d1ec 
							
						 
					 
					
						
						
							
							let's own otr-fingerprint copy to clipboard.  
						
						 
						
						
						
					 
					
						2014-10-03 16:20:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9ae52a235f 
							
						 
					 
					
						
						
							
							revised tablet ui.  fixed   #423  
						
						 
						
						
						
					 
					
						2014-10-03 15:00:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0e56ff93e9 
							
						 
					 
					
						
						
							
							fixed possible npe  
						
						 
						
						
						
					 
					
						2014-10-03 11:55:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							facd15f037 
							
						 
					 
					
						
						
							
							check if display is off for notifications  
						
						 
						
						
						
					 
					
						2014-10-02 22:17:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f671938e84 
							
						 
					 
					
						
						
							
							mark conversation as read when displayed marker from another client is received  
						
						 
						
						
						
					 
					
						2014-10-02 21:07:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cc76e15b95 
							
						 
					 
					
						
						
							
							avoided unecessary message searchs  
						
						 
						
						
						
					 
					
						2014-10-02 18:54:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8be57d43f 
							
						 
					 
					
						
						
							
							show displayed by contact on all devices  
						
						 
						
						
						
					 
					
						2014-10-02 18:31:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4b09f0e9d3 
							
						 
					 
					
						
						
							
							properly dismiss notifications  
						
						 
						
						
						
					 
					
						2014-10-02 17:36:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fd6f5b0e84 
							
						 
					 
					
						
						
							
							calculate sample size for thumbnails as well  
						
						 
						
						
						
					 
					
						2014-09-30 16:22:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0733a94127 
							
						 
					 
					
						
						
							
							Merge pull request  #505  from betheg/fix_invite  
						
						 
						
						... 
						
						
						
						fixed muc invite with <body/>. 
						
					 
					
						2014-09-30 11:53:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							511b7a53f4 
							
						 
					 
					
						
						
							
							notifiy only when necessary  
						
						 
						
						
						
					 
					
						2014-09-29 18:28:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							c8160b010d 
							
						 
					 
					
						
						
							
							fixed muc invite with <body/>.  
						
						 
						
						
						
					 
					
						2014-09-29 17:59:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							87010e6094 
							
						 
					 
					
						
						
							
							more improvments for new notification service  
						
						 
						
						
						
					 
					
						2014-09-28 16:33:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bff23c2e23 
							
						 
					 
					
						
						
							
							new notification service. first draft  
						
						 
						
						
						
					 
					
						2014-09-28 15:21:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1ae9338fc9 
							
						 
					 
					
						
						
							
							made muc passwords and prefereced encryption method persistant across restarts  
						
						 
						
						
						
					 
					
						2014-09-27 18:16:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							1d3a6125d2 
							
						 
					 
					
						
						
							
							add false argument to inflate.  
						
						 
						
						
						
					 
					
						2014-09-27 16:45:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2415781ebf 
							
						 
					 
					
						
						
							
							fixed some lint warnings. thanks @betheg  
						
						 
						
						
						
					 
					
						2014-09-27 11:46:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8fb0fb0c0d 
							
						 
					 
					
						
						
							
							anwser to xmpp: style uris. fixed open conversations from android address book  
						
						 
						
						
						
					 
					
						2014-09-27 11:37:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6e77343407 
							
						 
					 
					
						
						
							
							revised send button in landscape mode  
						
						 
						
						
						
					 
					
						2014-09-27 10:51:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							54278febb4 
							
						 
					 
					
						
						
							
							changed method that determins whether or not sm is available  
						
						 
						
						
						
					 
					
						2014-09-23 15:36:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							248a1693ea 
							
						 
					 
					
						
						
							
							refactored options menu handling a bit  
						
						 
						
						
						
					 
					
						2014-09-23 15:06:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b14f693c2e 
							
						 
					 
					
						
						
							
							dont mark message as send on resend  
						
						 
						
						
						
					 
					
						2014-09-23 11:49:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							12c2fde61b 
							
						 
					 
					
						
						
							
							fixed rare npe  
						
						 
						
						
						
					 
					
						2014-09-23 11:48:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							59009ded82 
							
						 
					 
					
						
						
							
							fixed very rare npe  
						
						 
						
						
						
					 
					
						2014-09-22 16:04:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							45aede14bd 
							
						 
					 
					
						
						
							
							fixed   #452  
						
						 
						
						
						
					 
					
						2014-09-22 13:23:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bb065020ff 
							
						 
					 
					
						
						
							
							don't show time stamp within the last 6 hours of a new day  
						
						 
						
						
						
					 
					
						2014-09-22 11:00:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c2bc15f5ba 
							
						 
					 
					
						
						
							
							added 'model' to selectable resources.  fixed   #461  
						
						 
						
						
						
					 
					
						2014-09-22 11:00:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1f91ed11fa 
							
						 
					 
					
						
						
							
							show full date in message list,  fixed   #328  
						
						 
						
						
						
					 
					
						2014-09-21 23:16:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							98a8fd4d05 
							
						 
					 
					
						
						
							
							changed message merger a bit  
						
						 
						
						
						
					 
					
						2014-09-21 22:58:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cca5865ecb 
							
						 
					 
					
						
						
							
							fixed   #454  - added fast srcolling to some lists  
						
						 
						
						
						
					 
					
						2014-09-21 00:45:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d806923d57 
							
						 
					 
					
						
						
							
							Merge pull request  #460  from betheg/receipts  
						
						 
						
						... 
						
						
						
						indicates received messages with a tick. 
						
					 
					
						2014-09-20 19:55:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							37aacbeb74 
							
						 
					 
					
						
						
							
							fixed presence splitting  
						
						 
						
						
						
					 
					
						2014-09-20 16:26:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0b86f65bdc 
							
						 
					 
					
						
						
							
							fixed   #470  
						
						 
						
						
						
					 
					
						2014-09-20 16:02:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							a86a09ab5b 
							
						 
					 
					
						
						
							
							indicates received messages with a tick.  
						
						 
						
						
						
					 
					
						2014-09-20 15:49:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							295bfb7f1d 
							
						 
					 
					
						
						
							
							made xmppconnection service available in generators  
						
						 
						
						
						
					 
					
						2014-09-20 15:29:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c282ef4645 
							
						 
					 
					
						
						
							
							scroll fixes  
						
						 
						
						
						
					 
					
						2014-09-19 21:09:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2a185c8fc9 
							
						 
					 
					
						
						
							
							background daemon doesn't start automatically if there are no enabled accounts.  fixed   #443   fixed   #442  
						
						 
						
						
						
					 
					
						2014-09-19 17:21:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3da0d5adce 
							
						 
					 
					
						
						
							
							fixed   #462  
						
						 
						
						
						
					 
					
						2014-09-19 14:35:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8796af22d1 
							
						 
					 
					
						
						
							
							Merge pull request  #448  from betheg/add_break  
						
						 
						
						... 
						
						
						
						add a forgotten break and remove some unused imports 
						
					 
					
						2014-09-19 10:32:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							b9e7f4870c 
							
						 
					 
					
						
						
							
							add a forgotten break and remove some unused imports  
						
						 
						
						
						
					 
					
						2014-09-13 21:15:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							00ff5c2dbd 
							
						 
					 
					
						
						
							
							MUC: notify also on private messages  
						
						 
						
						
						
					 
					
						2014-09-13 14:02:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							0d873903b8 
							
						 
					 
					
						
						
							
							add proper namespace in carbon  
						
						 
						
						
						
					 
					
						2014-09-12 20:14:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							db816187f8 
							
						 
					 
					
						
						
							
							check if market is available before starting to install openkey chain  
						
						 
						
						
						
					 
					
						2014-09-11 18:02:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dee46f3453 
							
						 
					 
					
						
						
							
							match color in contact details to the colors in the send button. also migrated some other colors from hard coding to using resources  
						
						 
						
						
						
					 
					
						2014-09-11 14:24:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ff41918cb7 
							
						 
					 
					
						
						
							
							missed show=chat for send button colorization  
						
						 
						
						
						
					 
					
						2014-09-11 13:19:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fef41ba2a2 
							
						 
					 
					
						
						
							
							pare body in type=normal messages as well  
						
						 
						
						
						
					 
					
						2014-09-11 13:18:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							31f11070e3 
							
						 
					 
					
						
						
							
							IT'S CHRISTMAS ALREADY!  
						
						 
						
						
						
					 
					
						2014-09-10 17:59:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4b2e06b9c3 
							
						 
					 
					
						
						
							
							version bump, changelog and one last minute change for OTR  
						
						 
						
						
						
					 
					
						2014-09-09 14:30:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c02ef80086 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/eu/siacs/conversations/crypto/PgpEngine.java
	src/eu/siacs/conversations/persistance/FileBackend.java
	src/eu/siacs/conversations/ui/ShareWithActivity.java 
						
					 
					
						2014-09-09 14:16:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							facb1242b6 
							
						 
					 
					
						
						
							
							don't reset images from sending to waiting  
						
						 
						
						
						
					 
					
						2014-09-09 13:56:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d92e8381db 
							
						 
					 
					
						
						
							
							setting to increase font size.  fixed   #420  
						
						 
						
						
						
					 
					
						2014-09-08 23:58:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1871521aed 
							
						 
					 
					
						
						
							
							simplefied some code that might have been the source for some strange bugs  
						
						 
						
						
						
					 
					
						2014-09-08 20:29:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b23f8bd472 
							
						 
					 
					
						
						
							
							introduced downloadable interface. reverted some of the changes made to OTR  
						
						 
						
						
						
					 
					
						2014-09-08 20:09:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a6f0f0cb6e 
							
						 
					 
					
						
						
							
							bug fixes for forcing encryption  
						
						 
						
						
						
					 
					
						2014-09-08 14:29:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5cb11396f6 
							
						 
					 
					
						
						
							
							fixed sending offline pgp messages  
						
						 
						
						
						
					 
					
						2014-09-08 14:08:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							58953e6193 
							
						 
					 
					
						
						
							
							settings to force encryption and setting for not saving messages to disk.  fixed   #353  
						
						 
						
						
						
					 
					
						2014-09-08 13:37:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3b9fd28ef4 
							
						 
					 
					
						
						
							
							don't fail displayed or received messages  
						
						 
						
						
						
					 
					
						2014-09-08 12:51:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							19f98f5143 
							
						 
					 
					
						
						
							
							warn on missing presence subscription  
						
						 
						
						
						
					 
					
						2014-09-08 12:46:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							409fdd8596 
							
						 
					 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development  
						
						 
						
						
						
					 
					
						2014-09-07 23:08:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							449c2a544b 
							
						 
					 
					
						
						
							
							fixed   #321  - delete otr fingerprints  
						
						 
						
						
						
					 
					
						2014-09-07 23:08:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5fe3f207d4 
							
						 
					 
					
						
						
							
							Merge pull request  #426  from betheg/remove_strings  
						
						 
						
						... 
						
						
						
						deleted some unused string-resources and imports, also deleted edit_account_dialog.xml. 
						
					 
					
						2014-09-07 17:13:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							90947597e5 
							
						 
					 
					
						
						
							
							fixed   #425  
						
						 
						
						
						
					 
					
						2014-09-07 16:53:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							f4d86ecff3 
							
						 
					 
					
						
						
							
							deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.  
						
						 
						
						
						
					 
					
						2014-09-07 15:58:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							27ad80afc2 
							
						 
					 
					
						
						
							
							trying to avoid rejectedexection  
						
						 
						
						
						
					 
					
						2014-09-07 15:11:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							ecd613dcdd 
							
						 
					 
					
						
						
							
							MUC: set the password from bookmarks.  
						
						 
						
						
						
					 
					
						2014-09-07 14:06:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d9990e6cd8 
							
						 
					 
					
						
						
							
							made shareing text with conferences possible again  
						
						 
						
						
						
					 
					
						2014-09-07 13:01:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b334ebd0fa 
							
						 
					 
					
						
						
							
							added missing breaks oO  
						
						 
						
						
						
					 
					
						2014-09-07 12:43:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							890fb9a1b4 
							
						 
					 
					
						
						
							
							fixed npe  
						
						 
						
						
						
					 
					
						2014-09-07 00:09:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9a945af6b9 
							
						 
					 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development  
						
						 
						
						
						
					 
					
						2014-09-06 18:21:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0e5a0a07fd 
							
						 
					 
					
						
						
							
							made otr a little bit more solid when there is no presence subscription  
						
						 
						
						
						
					 
					
						2014-09-06 18:21:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							375ec3a686 
							
						 
					 
					
						
						
							
							MUC: set password from invite message.  
						
						 
						
						
						
					 
					
						2014-09-05 22:07:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dc02137106 
							
						 
					 
					
						
						
							
							warn user if no presence subscription exists  
						
						 
						
						
						
					 
					
						2014-09-05 13:29:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							34228d0e78 
							
						 
					 
					
						
						
							
							improved logging for avatar fetches  
						
						 
						
						
						
					 
					
						2014-09-05 13:29:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b8d289a932 
							
						 
					 
					
						
						
							
							fixed   #342  - otr with facebook and other services without resources  
						
						 
						
						
						
					 
					
						2014-09-04 19:56:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							01389e900b 
							
						 
					 
					
						
						
							
							reconnect accounts when resource has been changed in settings  
						
						 
						
						
						
					 
					
						2014-09-04 13:56:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9817251ed5 
							
						 
					 
					
						
						
							
							made muc password dialog hide the password (password field)  
						
						 
						
						
						
					 
					
						2014-09-04 11:46:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7a3bc5dc45 
							
						 
					 
					
						
						
							
							nick parsing (xep 0172) also enabled for messages and for pep  
						
						 
						
						
						
					 
					
						2014-09-04 10:50:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1d6c09e8ff 
							
						 
					 
					
						
						
							
							Merge pull request  #397  from GZep/development  
						
						 
						
						... 
						
						
						
						XEP-0172 
						
					 
					
						2014-09-04 10:28:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							50f90d37b8 
							
						 
					 
					
						
						
							
							Merge pull request  #417  from emdete/unicode_emoticons  
						
						 
						
						... 
						
						
						
						improve regex, implement pattern cache 
						
					 
					
						2014-09-04 10:16:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6b9219c5f4 
							
						 
					 
					
						
						
							
							added support for password protected muc -  fixed   #203  and  fixed   #395  
						
						 
						
						
						
					 
					
						2014-09-03 19:35:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f19b1fb823 
							
						 
					 
					
						
						
							
							changed order of snackbar hints  
						
						 
						
						
						
					 
					
						2014-09-03 18:58:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							0a2c73f246 
							
						 
					 
					
						
						
							
							improve emo mapping  
						
						 
						
						
						
					 
					
						2014-09-03 17:44:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							0a686bc71c 
							
						 
					 
					
						
						
							
							use class, use codepoint  
						
						 
						
						
						
					 
					
						2014-09-03 17:29:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							584984807e 
							
						 
					 
					
						
						
							
							make pattern static  
						
						 
						
						
						
					 
					
						2014-09-03 16:10:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							cb3ba4045e 
							
						 
					 
					
						
						
							
							improve regex, implement pattern cache  
						
						 
						
						
						
					 
					
						2014-09-03 15:39:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b941d19f8 
							
						 
					 
					
						
						
							
							more openpgp bug fixes  
						
						 
						
						
						
					 
					
						2014-09-03 15:39:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							253438e698 
							
						 
					 
					
						
						
							
							more openpgp bug fixes  
						
						 
						
						
						
					 
					
						2014-09-03 15:33:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							664c9c434f 
							
						 
					 
					
						
						
							
							avoiding resource conflicts  
						
						 
						
						
						
					 
					
						2014-09-03 14:57:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f1494f83ff 
							
						 
					 
					
						
						
							
							fixed pgp signature creation  
						
						 
						
						
						
					 
					
						2014-09-03 13:06:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5ae62f18b4 
							
						 
					 
					
						
						
							
							fixed pgp signature creation  
						
						 
						
						
						
					 
					
						2014-09-03 13:05:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1a09a4706b 
							
						 
					 
					
						
						
							
							added ability to disable notifications for specific conversations -  fixed   #322  
						
						 
						
						
						
					 
					
						2014-09-03 12:36:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1f378bffc8 
							
						 
					 
					
						
						
							
							made emoticon parsing enableable - default false  
						
						 
						
						
						
					 
					
						2014-09-03 09:15:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							97b52abaf9 
							
						 
					 
					
						
						
							
							fixed   #410  by removing that config option  
						
						 
						
						
						
					 
					
						2014-09-02 16:00:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0ae852a633 
							
						 
					 
					
						
						
							
							refactored share with activity  
						
						 
						
						
						
					 
					
						2014-09-02 15:51:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							567827ffca 
							
						 
					 
					
						
						
							
							fixed   #406  
						
						 
						
						
						
					 
					
						2014-09-02 11:31:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c62937016b 
							
						 
					 
					
						
						
							
							rotate avatars  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/eu/siacs/conversations/persistance/FileBackend.java 
						
					 
					
						2014-09-02 11:31:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2c9b2e6bf8 
							
						 
					 
					
						
						
							
							fixed   #406  
						
						 
						
						
						
					 
					
						2014-09-02 11:27:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f888b167c6 
							
						 
					 
					
						
						
							
							rotate avatars  
						
						 
						
						
						
					 
					
						2014-09-02 11:19:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6045bcc2eb 
							
						 
					 
					
						
						
							
							Merge pull request  #408  from emdete/unicode_emoticons  
						
						 
						
						... 
						
						
						
						add all whitespaces in regex 
						
					 
					
						2014-09-02 10:39:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							a7b3aa343e 
							
						 
					 
					
						
						
							
							add all whitespaces in regex  
						
						 
						
						
						
					 
					
						2014-09-02 01:18:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6291ebf1a3 
							
						 
					 
					
						
						
							
							Merge pull request  #380  from emdete/unicode_emoticons  
						
						 
						
						... 
						
						
						
						add translation from ascii to unicode emoticons 
						
					 
					
						2014-09-01 23:58:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							546082147a 
							
						 
					 
					
						
						
							
							transform ascii to emoticons (on display only)  
						
						 
						
						
						
					 
					
						2014-09-01 23:48:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d42ea45b1c 
							
						 
					 
					
						
						
							
							fixed   #403  
						
						 
						
						
						
					 
					
						2014-09-01 14:03:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a7881754f5 
							
						 
					 
					
						
						
							
							fixed   #403  
						
						 
						
						
						
					 
					
						2014-09-01 13:51:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							2acf510ea9 
							
						 
					 
					
						
						
							
							optimize string operations a bit  
						
						 
						
						
						
					 
					
						2014-09-01 10:40:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gayaz Yusipov 
							
						 
					 
					
						
						
						
						
							
						
						
							5b24534ab6 
							
						 
					 
					
						
						
							
							Contact presenceName property  
						
						 
						
						
						
					 
					
						2014-08-31 23:14:05 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3558fa5f5b 
							
						 
					 
					
						
						
							
							deleted unnecessary log  
						
						 
						
						
						
					 
					
						2014-08-31 21:02:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							94389ac22a 
							
						 
					 
					
						
						
							
							show merged time and status in message adapter  
						
						 
						
						
						
					 
					
						2014-08-31 18:55:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bda7724e31 
							
						 
					 
					
						
						
							
							improvements for merge conditions  
						
						 
						
						
						
					 
					
						2014-08-31 18:21:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							28fa48704d 
							
						 
					 
					
						
						
							
							add missing blank before nick  
						
						 
						
						
						
					 
					
						2014-08-31 17:48:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bahtiar `kalkin-` Gadimov 
							
						 
					 
					
						
						
						
						
							
						
						
							3e3451bcff 
							
						 
					 
					
						
						
							
							Smarter nickname highlight insert in confernces  
						
						 
						
						
						
					 
					
						2014-08-31 17:24:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1ac5be4855 
							
						 
					 
					
						
						
							
							some code cleanup  
						
						 
						
						
						
					 
					
						2014-08-31 16:28:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d456085e5 
							
						 
					 
					
						
						
							
							Merge pull request  #391  from betheg/fix_typo  
						
						 
						
						... 
						
						
						
						fix forgotten spelling. 
						
					 
					
						2014-08-31 15:56:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1cc16161ef 
							
						 
					 
					
						
						
							
							require encrypted to be the same for messages to get merged  
						
						 
						
						
						
					 
					
						2014-08-31 15:54:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8f8d4e320d 
							
						 
					 
					
						
						
							
							experimental message merging  
						
						 
						
						
						
					 
					
						2014-08-31 14:29:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							969cba5ee6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/development' into fix_typo  
						
						 
						
						
						
					 
					
						2014-08-30 14:00:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gayaz Yusipov 
							
						 
					 
					
						
						
						
						
							
						
						
							ec6220969d 
							
						 
					 
					
						
						
							
							XEP-0172  
						
						 
						
						
						
					 
					
						2014-08-30 14:26:46 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c494f4f7ae 
							
						 
					 
					
						
						
							
							Merge branch 'sm' into development  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/eu/siacs/conversations/services/XmppConnectionService.java 
						
					 
					
						2014-08-30 09:24:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4435b0055e 
							
						 
					 
					
						
						
							
							reset unsend messages to waiting  
						
						 
						
						
						
					 
					
						2014-08-30 09:22:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9075d3854d 
							
						 
					 
					
						
						
							
							properly set stanza count on session resume  
						
						 
						
						
						
					 
					
						2014-08-30 09:22:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4a6a6c8403 
							
						 
					 
					
						
						
							
							basic message acking  
						
						 
						
						
						
					 
					
						2014-08-30 09:22:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9de77b190b 
							
						 
					 
					
						
						
							
							proper namespaces for xep-0352  
						
						 
						
						
						
					 
					
						2014-08-30 09:22:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6d82a69ba3 
							
						 
					 
					
						
						
							
							send inactive or active on every connect and resume  
						
						 
						
						
						
					 
					
						2014-08-30 09:22:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							265bd06250 
							
						 
					 
					
						
						
							
							added basic csi  
						
						 
						
						
						
					 
					
						2014-08-30 09:22:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9ad5c6925d 
							
						 
					 
					
						
						
							
							version bump to 0.6 with changelogs  
						
						 
						
						
						
					 
					
						2014-08-30 08:51:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8840d082ba 
							
						 
					 
					
						
						
							
							brought npe catcher back for kxml parser  
						
						 
						
						
						
					 
					
						2014-08-30 08:31:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							3714947d5f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/development' into fix_typo  
						
						 
						
						
						
					 
					
						2014-08-29 23:30:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5450a2ae46 
							
						 
					 
					
						
						
							
							fixed link to old resource  
						
						 
						
						
						
					 
					
						2014-08-29 14:05:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b0d777d9ca 
							
						 
					 
					
						
						
							
							fixed npe  
						
						 
						
						
						
					 
					
						2014-08-29 12:14:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							33172246c9 
							
						 
					 
					
						
						
							
							fixed   #389  
						
						 
						
						
						
					 
					
						2014-08-29 10:24:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							98dabe9ab4 
							
						 
					 
					
						
						
							
							fix forgotten spelling.  
						
						 
						
						
						
					 
					
						2014-08-28 16:49:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							85b31b8d8b 
							
						 
					 
					
						
						
							
							fixed spelling thanks @betheg  
						
						 
						
						
						
					 
					
						2014-08-28 11:01:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							431d4ed44b 
							
						 
					 
					
						
						
							
							translated missing string in settings  
						
						 
						
						
						
					 
					
						2014-08-27 09:43:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							450b911cb2 
							
						 
					 
					
						
						
							
							fixing duplicate private muc messages  
						
						 
						
						
						
					 
					
						2014-08-25 19:20:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							07b422d4c8 
							
						 
					 
					
						
						
							
							fixed message hint  
						
						 
						
						
						
					 
					
						2014-08-25 15:43:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4e791c8a01 
							
						 
					 
					
						
						
							
							fixed faulty db creation on first install  
						
						 
						
						
						
					 
					
						2014-08-24 20:53:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a30bc8a3e2 
							
						 
					 
					
						
						
							
							use otr encrypiton instead of plain when contact has exactly one online presence and an otr fingerprint  
						
						 
						
						
						
					 
					
						2014-08-24 11:21:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e0b759340d 
							
						 
					 
					
						
						
							
							jump right into edit account if now accounts are configured  
						
						 
						
						
						
					 
					
						2014-08-23 21:31:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d504daec16 
							
						 
					 
					
						
						
							
							changed workflow on inital avatar publication  
						
						 
						
						
						
					 
					
						2014-08-23 20:00:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7437ecc36 
							
						 
					 
					
						
						
							
							experimental muc message deduplication  
						
						 
						
						
						
					 
					
						2014-08-23 15:57:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ee9872277d 
							
						 
					 
					
						
						
							
							removed server compat value in favor of a (small xep list)  
						
						 
						
						
						
					 
					
						2014-08-23 15:56:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9b0bf9b5bc 
							
						 
					 
					
						
						
							
							fixed another npe  
						
						 
						
						
						
					 
					
						2014-08-22 13:22:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c40c8ee910 
							
						 
					 
					
						
						
							
							tiny redesign for private muc messages  
						
						 
						
						
						
					 
					
						2014-08-22 13:22:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4875b52f09 
							
						 
					 
					
						
						
							
							make avatars persisent / available even without internet  
						
						 
						
						
						
					 
					
						2014-08-21 12:32:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							301477c764 
							
						 
					 
					
						
						
							
							save newly taken photos in DCIM dir  
						
						 
						
						
						
					 
					
						2014-08-21 09:19:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7808e5b77f 
							
						 
					 
					
						
						
							
							added roster versioning to calculation of server compat  
						
						 
						
						
						
					 
					
						2014-08-21 07:47:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7f5456e41b 
							
						 
					 
					
						
						
							
							check if service is bound before adding conferences or contacts  
						
						 
						
						
						
					 
					
						2014-08-21 07:46:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9f4043c679 
							
						 
					 
					
						
						
							
							avoid race condition for otr key in jingle  
						
						 
						
						
						
					 
					
						2014-08-21 07:39:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bd467b6b9d 
							
						 
					 
					
						
						
							
							deregister listener in editaccount  
						
						 
						
						
						
					 
					
						2014-08-21 07:38:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							06da080371 
							
						 
					 
					
						
						
							
							revised manage account activity. removed contexual action mode  
						
						 
						
						
						
					 
					
						2014-08-20 11:32:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6345217328 
							
						 
					 
					
						
						
							
							fixed lint error  
						
						 
						
						
						
					 
					
						2014-08-19 15:27:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3b79cc2f23 
							
						 
					 
					
						
						
							
							better error display and additional infos (stats) for the edit account activity  
						
						 
						
						
						
					 
					
						2014-08-19 15:06:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							38f36aa263 
							
						 
					 
					
						
						
							
							more error handling for avatar publication  
						
						 
						
						
						
					 
					
						2014-08-16 17:31:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5aa8afdc1c 
							
						 
					 
					
						
						
							
							some improvements for the edit account activity  
						
						 
						
						
						
					 
					
						2014-08-16 09:44:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							32c3dd4f4a 
							
						 
					 
					
						
						
							
							moved add/edit account from dialog into seperate activity  
						
						 
						
						
						
					 
					
						2014-08-15 17:31:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f7c747ef4b 
							
						 
					 
					
						
						
							
							better handling of null streams  
						
						 
						
						
						
					 
					
						2014-08-15 13:34:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9c18d57e07 
							
						 
					 
					
						
						
							
							refactored Conversations Adapter into seperate class  
						
						 
						
						
						
					 
					
						2014-08-15 13:18:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2ab14a6ff2 
							
						 
					 
					
						
						
							
							fixed   #356  
						
						 
						
						
						
					 
					
						2014-08-15 13:11:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							48c780d15a 
							
						 
					 
					
						
						
							
							fixed muc pm avatar  
						
						 
						
						
						
					 
					
						2014-08-14 22:09:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e73a6525c7 
							
						 
					 
					
						
						
							
							fixed bug in caps hash generation. thanks Asterix of the Gajim project  
						
						 
						
						
						
					 
					
						2014-08-14 13:41:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							510d8a2ae3 
							
						 
					 
					
						
						
							
							another rare npe fixed  
						
						 
						
						
						
					 
					
						2014-08-14 09:59:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b2cc17c362 
							
						 
					 
					
						
						
							
							trying to fix rotation problems  
						
						 
						
						
						
					 
					
						2014-08-13 13:44:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							457e7be5e2 
							
						 
					 
					
						
						
							
							fixed   #348  
						
						 
						
						
						
					 
					
						2014-08-13 11:22:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a4faa158c0 
							
						 
					 
					
						
						
							
							only notify ui on significant muc changes  
						
						 
						
						
						
					 
					
						2014-08-13 11:21:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							07e6873025 
							
						 
					 
					
						
						
							
							try to make openpgp a little more reliable  
						
						 
						
						
						
					 
					
						2014-08-13 11:21:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5477ff1aea 
							
						 
					 
					
						
						
							
							fixed weird snackbar click issues  
						
						 
						
						
						
					 
					
						2014-08-12 23:23:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							721b308f28 
							
						 
					 
					
						
						
							
							fixed long press to bring back default in publish avatar activity  
						
						 
						
						
						
					 
					
						2014-08-12 21:03:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6952e630c4 
							
						 
					 
					
						
						
							
							show user name as well in confernce details if real name was shown  
						
						 
						
						
						
					 
					
						2014-08-12 11:36:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5ed9c2a805 
							
						 
					 
					
						
						
							
							show own avatar in muc details  
						
						 
						
						
						
					 
					
						2014-08-11 23:22:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8a82586d5b 
							
						 
					 
					
						
						
							
							fixed avatar in notification  
						
						 
						
						
						
					 
					
						2014-08-11 23:18:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f247abc2dc 
							
						 
					 
					
						
						
							
							handle bare jid presences. fixes for otr  
						
						 
						
						
						
					 
					
						2014-08-11 13:46:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9960cb819e 
							
						 
					 
					
						
						
							
							Merge pull request  #344  from 1nsan3/development  
						
						 
						
						... 
						
						
						
						Hardware search button 
						
					 
					
						2014-08-11 12:52:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gero Kraus 
							
						 
					 
					
						
						
						
						
							
						
						
							70423204f4 
							
						 
					 
					
						
						
							
							Updated StartConversationActivity to react on Search Button Pressing  
						
						 
						
						
						
					 
					
						2014-08-10 21:03:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b35aa3ed07 
							
						 
					 
					
						
						
							
							added limited private muc chat feature (messages are now properly marked) - long press on user icon will sent private messages.  fixed   #259  
						
						 
						
						
						
					 
					
						2014-08-10 15:27:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6de53791b5 
							
						 
					 
					
						
						
							
							fixed rare npe after race condition  
						
						 
						
						
						
					 
					
						2014-08-10 14:04:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1a6e42e7c1 
							
						 
					 
					
						
						
							
							potential fix for rejected execution exception  
						
						 
						
						
						
					 
					
						2014-08-10 14:04:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0cda7f7819 
							
						 
					 
					
						
						
							
							work around xml parser issues...  
						
						 
						
						
						
					 
					
						2014-08-09 11:37:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d486d5def9 
							
						 
					 
					
						
						
							
							trying to fix activity has been destroyed error  
						
						 
						
						
						
					 
					
						2014-08-09 11:37:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a33bf0b4ae 
							
						 
					 
					
						
						
							
							show add to roster dialog when trying to start otr session  
						
						 
						
						
						
					 
					
						2014-08-09 11:36:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a059dfab2c 
							
						 
					 
					
						
						
							
							fixed very rare npe  
						
						 
						
						
						
					 
					
						2014-08-09 11:35:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							937fc51b50 
							
						 
					 
					
						
						
							
							added warning lable if server doesn't support pubsub. refactored feature identification into seperate class  
						
						 
						
						
						
					 
					
						2014-08-09 10:20:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0bab1a4613 
							
						 
					 
					
						
						
							
							bug fix for 'back to default'  
						
						 
						
						
						
					 
					
						2014-08-09 09:44:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							96a41b5b51 
							
						 
					 
					
						
						
							
							ability to bring default picture back with long press in publish avatar  
						
						 
						
						
						
					 
					
						2014-08-09 09:38:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f6615843f9 
							
						 
					 
					
						
						
							
							grant uri permission on share picture  
						
						 
						
						
						
					 
					
						2014-08-09 09:38:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de2964cd25 
							
						 
					 
					
						
						
							
							more fixes for notfication in conferences  
						
						 
						
						
						
					 
					
						2014-08-09 09:37:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							98a80ffc61 
							
						 
					 
					
						
						
							
							save images to external storage instead of internal. this requires more permissions.  fixed   #150   fixed   #177   fixed   #333  - this might need some more polish though  
						
						 
						
						
						
					 
					
						2014-08-08 11:49:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							620d1df82e 
							
						 
					 
					
						
						
							
							fixed   #320  
						
						 
						
						
						
					 
					
						2014-08-07 14:09:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6536c1aeb1 
							
						 
					 
					
						
						
							
							bug fix for not working notification grace period in muc  
						
						 
						
						
						
					 
					
						2014-08-07 11:02:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b4d9e8b60 
							
						 
					 
					
						
						
							
							fixed problems with sha sum calculation on avatar write. delete avatars with non matching sha sum  
						
						 
						
						
						
					 
					
						2014-08-06 18:36:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ba63727f50 
							
						 
					 
					
						
						
							
							fetch missing avatars from server  
						
						 
						
						
						
					 
					
						2014-08-05 22:58:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							08755e56a5 
							
						 
					 
					
						
						
							
							show own avatar after publication. no persistancy yet  
						
						 
						
						
						
					 
					
						2014-08-05 13:00:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9aba9a4059 
							
						 
					 
					
						
						
							
							error messages for publish avatar  
						
						 
						
						
						
					 
					
						2014-08-05 12:21:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8b4d5f338 
							
						 
					 
					
						
						
							
							publish avatars  
						
						 
						
						
						
					 
					
						2014-08-05 01:36:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							629ff3afcd 
							
						 
					 
					
						
						
							
							proper account send to publish avatar activity  
						
						 
						
						
						
					 
					
						2014-08-03 20:42:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							daab16bdef 
							
						 
					 
					
						
						
							
							activity for future avatar publications. not working yet  
						
						 
						
						
						
					 
					
						2014-08-03 20:28:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88d1bd356c 
							
						 
					 
					
						
						
							
							get rid of 'use phones self contact picture option'  
						
						 
						
						
						
					 
					
						2014-07-31 15:18:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							990f0f6d73 
							
						 
					 
					
						
						
							
							refactored account array adapter into seperate class. added account image  
						
						 
						
						
						
					 
					
						2014-07-31 15:09:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							27b306444b 
							
						 
					 
					
						
						
							
							fixed   #326   fixed   #202  
						
						 
						
						
						
					 
					
						2014-07-31 13:26:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							511f74116f 
							
						 
					 
					
						
						
							
							fixed npe for the rare case that user has disabled his action bar  
						
						 
						
						
						
					 
					
						2014-07-30 21:30:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88e5713a80 
							
						 
					 
					
						
						
							
							fixed npe in start conversation activity  
						
						 
						
						
						
					 
					
						2014-07-30 21:26:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bc24cf93ab 
							
						 
					 
					
						
						
							
							fixed generation of muc pictures with copyonwrite user list  
						
						 
						
						
						
					 
					
						2014-07-30 21:25:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fe46d36137 
							
						 
					 
					
						
						
							
							fixed rare npe in loading of selfi  
						
						 
						
						
						
					 
					
						2014-07-30 21:24:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1521b91b27 
							
						 
					 
					
						
						
							
							fixed   #239  - show contact names and pictures in muc if real jid is known  
						
						 
						
						
						
					 
					
						2014-07-29 14:42:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4c90bd9b46 
							
						 
					 
					
						
						
							
							fixed bug in message parser  
						
						 
						
						
						
					 
					
						2014-07-27 22:31:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0e93e5ce52 
							
						 
					 
					
						
						
							
							trying to work around npe in androids xml parser  
						
						 
						
						
						
					 
					
						2014-07-27 19:06:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8fedeb697 
							
						 
					 
					
						
						
							
							fixe race conditons with newIntent  
						
						 
						
						
						
					 
					
						2014-07-27 19:05:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2e080401b1 
							
						 
					 
					
						
						
							
							migrated some ArrayLists to CopyOnWriteArrayLists  
						
						 
						
						
						
					 
					
						2014-07-27 18:07:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							29f089c954 
							
						 
					 
					
						
						
							
							fixed npe with unsuccesfull bind  
						
						 
						
						
						
					 
					
						2014-07-26 15:44:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5182a92e58 
							
						 
					 
					
						
						
							
							fixed npe when user was very quick with starting to type in startConversationactivity  
						
						 
						
						
						
					 
					
						2014-07-26 15:44:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							52ad718251 
							
						 
					 
					
						
						
							
							removed duplicates from muc suggestions  
						
						 
						
						
						
					 
					
						2014-07-24 17:21:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c7c3db478a 
							
						 
					 
					
						
						
							
							included version string in crash reports  
						
						 
						
						
						
					 
					
						2014-07-24 12:33:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d108a5f2b6 
							
						 
					 
					
						
						
							
							removed more legacy tls error handling stuff  
						
						 
						
						
						
					 
					
						2014-07-24 01:39:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							deab99c997 
							
						 
					 
					
						
						
							
							removed outdated tls error  
						
						 
						
						
						
					 
					
						2014-07-24 01:37:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							983104f2f0 
							
						 
					 
					
						
						
							
							presonalized read up to this point message  
						
						 
						
						
						
					 
					
						2014-07-24 01:17:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7ee2ef5233 
							
						 
					 
					
						
						
							
							answer correctly if both markers and receipts are requested  
						
						 
						
						
						
					 
					
						2014-07-24 01:04:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							23e5fb5d56 
							
						 
					 
					
						
						
							
							fixed bug with otr session being initilized over and over again  
						
						 
						
						
						
					 
					
						2014-07-23 18:04:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5c118f6dd7 
							
						 
					 
					
						
						
							
							more disco. fixed chat markers with jappix  
						
						 
						
						
						
					 
					
						2014-07-23 14:30:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1f4ea552cd 
							
						 
					 
					
						
						
							
							some cleanup  
						
						 
						
						
						
					 
					
						2014-07-22 18:58:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4607e2c546 
							
						 
					 
					
						
						
							
							switched to mtm  
						
						 
						
						
						
					 
					
						2014-07-22 17:27:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9fcc195a6d 
							
						 
					 
					
						
						
							
							brought settings and manage account menu items back  
						
						 
						
						
						
					 
					
						2014-07-22 17:23:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							84642b7492 
							
						 
					 
					
						
						
							
							refactored message adapter into seperate class  
						
						 
						
						
						
					 
					
						2014-07-22 15:31:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							66e3ccc2dc 
							
						 
					 
					
						
						
							
							save login nick for mucs during join  
						
						 
						
						
						
					 
					
						2014-07-21 22:57:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e3ebccc762 
							
						 
					 
					
						
						
							
							back to normal invites.  fixed   #298  
						
						 
						
						
						
					 
					
						2014-07-21 19:55:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b223784560 
							
						 
					 
					
						
						
							
							added hint to explain the contact has read up to this point  
						
						 
						
						
						
					 
					
						2014-07-21 19:54:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a787f58a90 
							
						 
					 
					
						
						
							
							fixed   #292  
						
						 
						
						
						
					 
					
						2014-07-21 18:20:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2fe20ffa8e 
							
						 
					 
					
						
						
							
							fixed   #267  
						
						 
						
						
						
					 
					
						2014-07-21 16:16:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f9ed76f5e1 
							
						 
					 
					
						
						
							
							switched to direct invites.  fixes   #284  
						
						 
						
						
						
					 
					
						2014-07-21 16:04:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							87aff4c6d8 
							
						 
					 
					
						
						
							
							fixed bug where presence requests where sent on display of contact details  
						
						 
						
						
						
					 
					
						2014-07-21 15:17:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							aa844df144 
							
						 
					 
					
						
						
							
							fixed   #290  
						
						 
						
						
						
					 
					
						2014-07-21 15:16:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3b7f89bbb0 
							
						 
					 
					
						
						
							
							disable subscription checkboxes when account is offline  
						
						 
						
						
						
					 
					
						2014-07-20 13:21:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							542cbef53b 
							
						 
					 
					
						
						
							
							hide verify snackbar when otr session is ended. fixed npe  
						
						 
						
						
						
					 
					
						2014-07-20 12:36:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b5005d60de 
							
						 
					 
					
						
						
							
							simplified presence subscription in contact details  
						
						 
						
						
						
					 
					
						2014-07-20 03:14:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							185c485fc6 
							
						 
					 
					
						
						
							
							fixed   #254  
						
						 
						
						
						
					 
					
						2014-07-20 02:34:07 +02:00