da367dd752 
								
							 
						 
						
							
							
								
								Add option to remove manually approved certificates  
							
							... 
							
							
							
							- "Remove certificates" option brings up a dialog that allows
  to delete certificates from MemorizingTrustManager's keystore
- Reconnect active accounts when certificate-settings are changed
- new preference category "Certificate options" 
							
						 
						
							2015-04-19 18:08:13 +02:00  
				
					
						
							
							
								 
						
							
								570a22206d 
								
							 
						 
						
							
							
								
								increased undo delay  
							
							
							
						 
						
							2015-04-17 20:01:09 +02:00  
				
					
						
							
							
								 
						
							
								c4daa08170 
								
							 
						 
						
							
							
								
								fixed a bug in DNS helper code.  fixes   #1130  
							
							
							
						 
						
							2015-04-16 21:56:03 +02:00  
				
					
						
							
							
								 
						
							
								584ffbd000 
								
							 
						 
						
							
							
								
								bumped version to 1.3.0-alpha  
							
							
							
						 
						
							2015-04-15 16:28:44 +02:00  
				
					
						
							
							
								 
						
							
								65e760aefd 
								
							 
						 
						
							
							
								
								some bug fixes concerning 0byte files.  fixes   #1126  
							
							
							
						 
						
							2015-04-15 15:36:16 +02:00  
				
					
						
							
							
								 
						
							
								f99e234b88 
								
							 
						 
						
							
							
								
								maintain state when rotating settings activity  
							
							
							
						 
						
							2015-04-14 15:53:50 +02:00  
				
					
						
							
							
								 
						
							
								b6cc8c90a0 
								
							 
						 
						
							
							
								
								Merge branch 'BrianBlade-dont_trust_cas_preference' into development  
							
							
							
						 
						
							2015-04-14 15:17:26 +02:00  
				
					
						
							
							
								 
						
							
								defb127d6e 
								
							 
						 
						
							
							
								
								Merge branch 'dont_trust_cas_preference' of  https://github.com/BrianBlade/Conversations  into BrianBlade-dont_trust_cas_preference  
							
							... 
							
							
							
							Conflicts:
	src/main/res/values-de/strings.xml
	src/main/res/values/strings.xml 
							
						 
						
							2015-04-14 15:17:06 +02:00  
				
					
						
							
							
								 
						
							
								261b505f06 
								
							 
						 
						
							
							
								
								always show save button when account info was modified.  fixes   #918  
							
							
							
						 
						
							2015-04-14 15:00:49 +02:00  
				
					
						
							
							
								 
						
							
								2f24b09309 
								
							 
						 
						
							
							
								
								fixed disable account when sliding and not clicking the toggle  
							
							
							
						 
						
							2015-04-13 18:19:40 +02:00  
				
					
						
							
							
								 
						
							
								62faa163f0 
								
							 
						 
						
							
							
								
								fixed typos  
							
							
							
						 
						
							2015-04-13 18:18:25 +02:00  
				
					
						
							
							
								 
						
							
								8486f47dd9 
								
							 
						 
						
							
							
								
								Merge pull request  #1123  from lookshe/development  
							
							... 
							
							
							
							Bugfix for issue #1121  
							
						 
						
							2015-04-13 17:57:33 +02:00  
				
					
						
							
							
								 
						
							
								4bf09bc10b 
								
							 
						 
						
							
							
								
								shut up linter  
							
							
							
						 
						
							2015-04-13 17:35:20 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								85cb1e4a37 
								
							 
						 
						
							
							
								
								Maintain private chat on MUC.  fixes   #1097  
							
							
							
						 
						
							2015-04-13 16:00:04 +02:00  
				
					
						
							
							
								 
						
							
								845b39cdcc 
								
							 
						 
						
							
							
								
								fixed regression where the selected conversation wasn't highlighted anymore on tabled layout  
							
							
							
						 
						
							2015-04-13 15:59:18 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								37d08276a8 
								
							 
						 
						
							
							
								
								allow sharing multiple images at once.  fixes   #1090  
							
							
							
						 
						
							2015-04-11 14:53:10 +02:00  
				
					
						
							
							
								 
						
							
								332fe0fd19 
								
							 
						 
						
							
							
								
								don't resume old session when changing resource  
							
							
							
						 
						
							2015-04-09 12:46:54 +02:00  
				
					
						
							
							
								 
						
							
								f880473435 
								
							 
						 
						
							
							
								
								Merge pull request  #1104  from BrianBlade/feature/swipe_out_conversation  
							
							... 
							
							
							
							Enable end-conversation by swipe gesture 
							
						 
						
							2015-04-09 10:46:26 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								59ea143147 
								
							 
						 
						
							
							
								
								Merge pull request  #1099  from BrianBlade/fix_otr_error_msgs  
							
							... 
							
							
							
							Fix OTR-Error messages (#1021 ) 
							
						 
						
							2015-04-02 11:11:22 +02:00  
				
					
						
							
							
								 
						
							
								ef68084098 
								
							 
						 
						
							
							
								
								Merge branch 'BrianBlade-account_state_switch' into development  
							
							
							
						 
						
							2015-04-01 23:46:54 +02:00  
				
					
						
							
							
								 
						
							
								b7b87e1a8d 
								
							 
						 
						
							
							
								
								do not overlap account title and switch  
							
							
							
						 
						
							2015-04-01 23:45:46 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								1a376cacac 
								
							 
						 
						
							
							
								
								Merge pull request  #1076  from rk4an/patch-1  
							
							... 
							
							
							
							Update french translation 
							
						 
						
							2015-04-01 20:30:00 +02:00  
				
					
						
							
							
								 
						
							
								64d6a2970e 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							
							
						 
						
							2015-04-01 20:26:28 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								2a73173176 
								
							 
						 
						
							
							
								
								Update french translation  
							
							
							
						 
						
							2015-03-22 20:09:53 +01:00  
				
					
						
							
							
								 
						
							
								7eabdfd80f 
								
							 
						 
						
							
							
								
								bump version code  
							
							
							
						 
						
							2015-03-22 19:42:40 +01:00  
				
					
						
							
							
								 
						
							
								ad8f1902d1 
								
							 
						 
						
							
							
								
								pulled translations  
							
							
							
						 
						
							2015-03-22 18:56:28 +01:00  
				
					
						
							
							
								 
						
							
								c47d1e83c1 
								
							 
						 
						
							
							
								
								properly set chat states when receiving otr status messages  
							
							
							
						 
						
							2015-03-21 16:43:03 +01:00  
				
					
						
							
							
								 
						
							
								99b2ef7e9d 
								
							 
						 
						
							
							
								
								respond to unreadable OTR messages with error message.  fixed   #1021  
							
							
							
						 
						
							2015-03-21 16:07:17 +01:00  
				
					
						
							
							
								 
						
							
								825278971e 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							
							
						 
						
							2015-03-20 22:40:06 +01:00  
				
					
						
							
							
								 
						
							
								da099e5fa4 
								
							 
						 
						
							
							
								
								wait for session iq to return sucessfully before sending other stanzas.  fixed   #1017  
							
							
							
						 
						
							2015-03-20 21:48:45 +01:00  
				
					
						
							
							
								 
						
							
								30e2dee456 
								
							 
						 
						
							
							
								
								Update CHANGELOG.md  
							
							... 
							
							
							
							fixed plugin link 
							
						 
						
							2015-03-19 19:45:47 +01:00  
				
					
						
							
							
								 
						
							
								5793fb680f 
								
							 
						 
						
							
							
								
								version bump to 1.2.0-beta  
							
							
							
						 
						
							2015-03-19 19:40:42 +01:00  
				
					
						
							
							
								 
						
							
								442ae12ee5 
								
							 
						 
						
							
							
								
								don't update presence for muc messages  
							
							
							
						 
						
							2015-03-19 19:40:24 +01:00  
				
					
						
							
							
								 
						
							
								0d6475d0d9 
								
							 
						 
						
							
							
								
								pulled more translations  
							
							
							
						 
						
							2015-03-19 19:32:24 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								1c600fefcf 
								
							 
						 
						
							
							
								
								# add delivery receipts for private muc msgs  
							
							... 
							
							
							
							# enable update last-seen for muc-msgs 
							
						 
						
							2015-03-18 21:49:41 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								7ae357f863 
								
							 
						 
						
							
							
								
								Merge pull request  #1036  from QuentinC/development  
							
							... 
							
							
							
							Green led color is better with "full-green" 
							
						 
						
							2015-03-18 17:11:43 +01:00  
				
					
						
							
							
								 
						
							
								ae274ac728 
								
							 
						 
						
							
							
								
								Merge pull request  #1041  from weiss/fix-cached-avatar-size  
							
							... 
							
							
							
							Set file size also for cached avatars 
							
						 
						
							2015-03-17 21:10:02 +01:00  
				
					
						
							
							
								 
						
							
								52af62d298 
								
							 
						 
						
							
							
								
								Set file size also for cached avatars  
							
							
							
						 
						
							2015-03-17 17:36:17 +01:00  
				
					
						
							
							
								 
						
							
								4aab45533a 
								
							 
						 
						
							
							
								
								pulled new translations from transifex  
							
							
							
						 
						
							2015-03-16 11:52:42 +01:00  
				
					
						
							
							
								 
						
							
								3d570f4a08 
								
							 
						 
						
							
							
								
								updated changelong  
							
							
							
						 
						
							2015-03-11 18:18:07 +01:00  
				
					
						
							
							
								 
						
							
								74e5317095 
								
							 
						 
						
							
							
								
								Do not Strigprep JIDs from database  
							
							
							
						 
						
							2015-03-11 15:59:31 +01:00