Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb70df7a34 
							
						 
					 
					
						
						
							
							added XEP number for http file upload  
						
						
						
					 
					
						2015-08-27 19:18:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eff9e417e0 
							
						 
					 
					
						
						
							
							use dedicated colors for primary and primary_dark  
						
						
						
					 
					
						2015-08-26 21:17:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							730a5c644b 
							
						 
					 
					
						
						
							
							renamed plain text to unencrypted.  fixes   #1331  
						
						
						
					 
					
						2015-08-24 21:15:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb0b4bb445 
							
						 
					 
					
						
						
							
							added setting to allow for white backgrounds in incoming message bubbles  
						
						
						
					 
					
						2015-08-24 20:56:25 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6aec49f06d 
							
						 
					 
					
						
						
							
							Update license string with libraries  
						
						
						
					 
					
						2015-08-15 19:07:55 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							45d68c200e 
							
						 
					 
					
						
						
							
							Display error message if all contact keys purged  
						
						
						
					 
					
						2015-08-15 18:52:47 +02:00 
						 
				 
			
				
					
						
							
							
								hlad 
							
						 
					 
					
						
						
						
						
							
						
						
							4539643f27 
							
						 
					 
					
						
						
							
							show HTTP upload availability on Edit account screen  
						
						
						
					 
					
						2015-08-14 22:24:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5e90850d8 
							
						 
					 
					
						
						
							
							provide more detailed error toasts for http file download  
						
						
						
					 
					
						2015-08-10 12:15:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8b9b74ff7e 
							
						 
					 
					
						
						
							
							renamed multi-end / axolotl to OMEMO  
						
						
						
					 
					
						2015-08-08 13:29:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e10e9942de 
							
						 
					 
					
						
						
							
							changed text selection color  
						
						
						
					 
					
						2015-08-05 18:30:49 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c617cf6ef8 
							
						 
					 
					
						
						
							
							added Config.java varibale to lock account creation to specfic domain  
						
						
						
					 
					
						2015-08-03 22:58:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2bf30bb296 
							
						 
					 
					
						
						
							
							temporarily renamed new encryption method to 'Multi-End' until a better name has been found  
						
						
						
					 
					
						2015-08-01 23:36:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5191e4ce95 
							
						 
					 
					
						
						
							
							removed expert setting to 'force encryption'. merged certifcate and encryption settings into same category  
						
						
						
					 
					
						2015-07-31 00:51:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1ed550b5c5 
							
						 
					 
					
						
						
							
							fixed some colors in message adapter  
						
						
						
					 
					
						2015-07-30 12:40:50 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							2b3bb02261 
							
						 
					 
					
						
						
							
							Highlight selected message's fingerprint in list  
						
						
						
					 
					
						2015-07-29 20:21:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cd204d5931 
							
						 
					 
					
						
						
							
							show warning when trying to highlight users that have left the conference  
						
						
						
					 
					
						2015-07-22 15:57:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7634a85be 
							
						 
					 
					
						
						
							
							treat private, non-anonymous mucs like 1:1 chats notification wise  
						
						
						
					 
					
						2015-07-22 15:31:00 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							92b5081b5e 
							
						 
					 
					
						
						
							
							Add INACTIVE state for removed keys  
						
						... 
						
						
						
						We introduce a new trust state: INACTIVE. This state is intended for
old keys that have been removed.
When a TRUSTED device is removed from the PEP devicelist, it's status
will be set to INACTIVE. INACTIVE keys are shown in the UI as greyed
out, non-interactible key rows. Messages are not encrypted for INACTIVE
devices.
When an INACTIVE device reappears in PEP, or a message is received from
an INACTIVE device, it is set back to trusted. 
						
					 
					
						2015-07-21 14:24:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1aeb5874b0 
							
						 
					 
					
						
						
							
							allow for private messages being started from muc details in anonymous mucs  
						
						
						
					 
					
						2015-07-21 13:15:59 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							ab2d114bbc 
							
						 
					 
					
						
						
							
							Add purge axolotl key option  
						
						... 
						
						
						
						Can now long-press a key to permanently purge it. 
						
					 
					
						2015-07-20 22:18:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dcf9117451 
							
						 
					 
					
						
						
							
							changed sizes of avatars and padding in new message bubbles  
						
						
						
					 
					
						2015-07-20 16:02:18 +02:00 
						 
				 
			
				
					
						
							
							
								Raphael Pohl 
							
						 
					 
					
						
						
						
						
							
						
						
							e6cb12dfe4 
							
						 
					 
					
						
						
							
							changed message bubble appearance  
						
						
						
					 
					
						2015-07-20 16:02:17 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							576330f6a9 
							
						 
					 
					
						
						
							
							Use MD style for key trust toggle switch  
						
						
						
					 
					
						2015-07-20 14:14:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							480b1cde81 
							
						 
					 
					
						
						
							
							Add clear devices to overflow menu in EditAccount  
						
						
						
					 
					
						2015-07-19 23:35:03 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							14010bf5a6 
							
						 
					 
					
						
						
							
							Ask for key trust when sending messages  
						
						... 
						
						
						
						If the contact (or the own account) has keys that have UNDECIDED trust,
we now drop the user into the new TrustKeysActivity, where they have to
decide for each new key whether it should be TRUSTED or UNTRUSTED. 
						
					 
					
						2015-07-19 22:27:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6f67469bda 
							
						 
					 
					
						
						
							
							Refactor trust key ui and show in account details  
						
						... 
						
						
						
						Refactored the trust key row UI element so it can be used in multiple
places. It now also uses a slider to toggle the trust state, and the
redundant trust state description was removed.
EditAccountActivity now shows the keys of other devices associated with
that account. 
						
					 
					
						2015-07-19 22:24:03 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							3d33946088 
							
						 
					 
					
						
						
							
							Add key trust toggle to ContactDetailsActivity  
						
						... 
						
						
						
						Can now toggle IdentityKey trust 
						
					 
					
						2015-07-19 22:23:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							2628662a7f 
							
						 
					 
					
						
						
							
							Display axolotl chat message hint  
						
						
						
					 
					
						2015-07-19 22:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							7049904c32 
							
						 
					 
					
						
						
							
							Add basic PEP managemend UI to EditAccountActivity  
						
						... 
						
						
						
						EditAccountActivity now show own fingerprint, and gives an option to
regenerate local keying material (and wipe all sessions associated with
the old keys in the process).
It also now displays a list of other own devices, and gives an option to
remove all but the current device. 
						
					 
					
						2015-07-19 22:17:55 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							077932eb55 
							
						 
					 
					
						
						
							
							CryptoNext Menu entries added  
						
						
						
					 
					
						2015-07-19 21:32:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f58b2afcaa 
							
						 
					 
					
						
						
							
							changed switch widget  
						
						
						
					 
					
						2015-07-18 19:38:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4f62793a67 
							
						 
					 
					
						
						
							
							version bump to 1.5.0-beta.2  
						
						
						
					 
					
						2015-07-16 14:27:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7bd66549d8 
							
						 
					 
					
						
						
							
							made 'check image on http host' message more generic.  fixed   #1281  
						
						
						
					 
					
						2015-07-16 13:25:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ffffca10f0 
							
						 
					 
					
						
						
							
							renamed colors  
						
						
						
					 
					
						2015-07-13 12:55:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0f5c87ca1f 
							
						 
					 
					
						
						
							
							display toast in ui on failed http download  
						
						... 
						
						
						
						fixes  #954  
					
						2015-07-10 13:28:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f5ba9d4223 
							
						 
					 
					
						
						
							
							refactored message context menu  
						
						
						
					 
					
						2015-07-02 23:13:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							997b11dbec 
							
						 
					 
					
						
						
							
							added choose picture as another quick action.  fixes   #1221  
						
						
						
					 
					
						2015-05-26 05:34:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1e28f60038 
							
						 
					 
					
						
						
							
							changed conversation red to material red  
						
						
						
					 
					
						2015-05-10 03:14:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53fea9e1fe 
							
						 
					 
					
						
						
							
							replace send button with quick action button as long as no text has been entered  
						
						
						
					 
					
						2015-05-02 11:38:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							92d14c4a00 
							
						 
					 
					
						
						
							
							increased padding on image buttons on v21 to match material guidelines  
						
						
						
					 
					
						2015-04-28 14:46:52 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5132cd7234 
							
						 
					 
					
						
						
							
							show geo uris as 'location' in overview  
						
						
						
					 
					
						2015-03-10 17:20:50 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							7ee5e95959 
							
						 
					 
					
						
						
							
							added typing notifications through XEP-0085.  fixed   #210  
						
						
						
					 
					
						2015-02-21 11:06:52 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							44ee746681 
							
						 
					 
					
						
						
							
							added actions to error notification  
						
						
						
					 
					
						2015-02-10 17:13:34 +01:00 
						 
				 
			
				
					
						
							
							
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							e76a9c06c3 
							
						 
					 
					
						
						
							
							Remove title_activity_conversations and use app_name instead  
						
						
						
					 
					
						2015-01-30 17:02:53 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							48604a6620 
							
						 
					 
					
						
						
							
							Use Material Design Icons on API 21+  
						
						
						
					 
					
						2015-01-29 15:28:26 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4e50098e31 
							
						 
					 
					
						
						
							
							show checkbox to hide offline contacts  
						
						
						
					 
					
						2015-01-21 17:24:02 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							503237087f 
							
						 
					 
					
						
						
							
							Remove legacy SSL support  
						
						
						
					 
					
						2015-01-19 11:02:13 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							149a6716b8 
							
						 
					 
					
						
						
							
							proper desc for offering and sending images in conversations overview  
						
						
						
					 
					
						2015-01-18 20:26:22 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d58fadd05f 
							
						 
					 
					
						
						
							
							use same helper methods for images and files  
						
						
						
					 
					
						2015-01-18 13:00:57 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							7d2a9624b5 
							
						 
					 
					
						
						
							
							make use of different dimensions for different screen sizes  
						
						
						
					 
					
						2015-01-13 11:52:41 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							0aa50cb5a1 
							
						 
					 
					
						
						
							
							shortened some string  
						
						
						
					 
					
						2015-01-11 01:01:33 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							734a9934a3 
							
						 
					 
					
						
						
							
							make project translatable via transifex  
						
						
						
					 
					
						2015-01-09 02:06:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a9159568b9 
							
						 
					 
					
						
						
							
							allow for very basic muc configuration  
						
						
						
					 
					
						2015-01-08 21:29:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f8aa1bfec4 
							
						 
					 
					
						
						
							
							kick after ban  
						
						
						
					 
					
						2015-01-08 01:23:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							061de5205e 
							
						 
					 
					
						
						
							
							some clean ups for affiliation change context menu  
						
						
						
					 
					
						2015-01-08 00:23:26 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							45bb59dba8 
							
						 
					 
					
						
						
							
							Add materials theme  
						
						
						
					 
					
						2015-01-06 21:37:49 -05: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 
							
						 
					 
					
						
						
						
						
							
						
						
							e6cd92a663 
							
						 
					 
					
						
						
							
							added higher auto accept file sizes  
						
						... 
						
						
						
						also changed labeling to MiB and KiB 
						
					 
					
						2015-01-04 17:53:06 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							3833e6dfef 
							
						 
					 
					
						
						
							
							improved OTR verification part one  
						
						
						
					 
					
						2015-01-02 01:21:14 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d4b0aec5 
							
						 
					 
					
						
						
							
							Add quiet hours feature  
						
						
						
					 
					
						2014-12-14 15:07:41 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e43ac27e8f 
							
						 
					 
					
						
						
							
							Accessibility: Add missing image descriptions  
						
						
						
					 
					
						2014-11-29 08:03:35 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de0b36fc78 
							
						 
					 
					
						
						
							
							verify contacts key only on initiating side of smp  
						
						
						
					 
					
						2014-11-21 13:42:25 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0ad6d0616f 
							
						 
					 
					
						
						
							
							brought ad hoc conferences back.  fixed   #688   fixed   #367  
						
						
						
					 
					
						2014-11-20 18:20:42 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							240d2d68c8 
							
						 
					 
					
						
						
							
							context menu for conversations.  fixed   #630  
						
						
						
					 
					
						2014-11-18 00:07:27 +01:00 
						 
				 
			
				
					
						
							
							
								ferdev1 
							
						 
					 
					
						
						
						
						
							
						
						
							c147f44cf1 
							
						 
					 
					
						
						
							
							Fix string  
						
						
						
					 
					
						2014-11-16 18:11:14 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cf00f3fade 
							
						 
					 
					
						
						
							
							happy hanukkah  
						
						
						
					 
					
						2014-11-16 17:21:21 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2067b9bd8d 
							
						 
					 
					
						
						
							
							made scan and show qr code more accessible in VerifyOtrActivity  
						
						
						
					 
					
						2014-11-16 02:10:29 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							251f4d6d7f 
							
						 
					 
					
						
						
							
							Add incompatible server status  
						
						
						
					 
					
						2014-11-15 11:29:58 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							c09d450db8 
							
						 
					 
					
						
						
							
							Add security error status  
						
						
						
					 
					
						2014-11-15 11:21:47 -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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							47d44448f3 
							
						 
					 
					
						
						
							
							fixed description in notifications and conversation overview  
						
						
						
					 
					
						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 
							
						 
					 
					
						
						
						
						
							
						
						
							e7a70a46e0 
							
						 
					 
					
						
						
							
							some mime and pgp fixes for file transfer  
						
						
						
					 
					
						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 
							
						 
					 
					
						
						
						
						
							
						
						
							7a90ca429b 
							
						 
					 
					
						
						
							
							basic arbitrary file transfer  
						
						
						
					 
					
						2014-11-15 15:34:11 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8650bc2e13 
							
						 
					 
					
						
						
							
							Make licenses info untranslatable  
						
						
						
					 
					
						2014-11-14 22:33:18 -05: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 
							
						 
					 
					
						
						
						
						
							
						
						
							26b4788733 
							
						 
					 
					
						
						
							
							formating  
						
						
						
					 
					
						2014-11-09 21:27:37 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							b1da9ae3cc 
							
						 
					 
					
						
						
							
							add libidn to pref_about_message.  
						
						
						
					 
					
						2014-11-09 21:02:35 +01: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 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8d5d6b2b5 
							
						 
					 
					
						
						
							
							reformated license a bit  
						
						
						
					 
					
						2014-11-04 23:47:15 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							df786cbf01 
							
						 
					 
					
						
						
							
							Shorten license text and fix height of scrollview  
						
						
						
					 
					
						2014-11-04 13:26:48 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							55c81eaf15 
							
						 
					 
					
						
						
							
							Make links clickable in about text  
						
						
						
					 
					
						2014-11-04 13:09:56 -05: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 
							
						 
					 
					
						
						
						
						
							
						
						
							df54ee75b4 
							
						 
					 
					
						
						
							
							Add about dialog with license info  
						
						
						
					 
					
						2014-11-04 12:47:58 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cd5a56e8e7 
							
						 
					 
					
						
						
							
							show avatar in editaccount  
						
						
						
					 
					
						2014-11-04 17:38:41 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d458919c8f 
							
						 
					 
					
						
						
							
							unfinishd qr code implemenation. thanks to @emdete  
						
						
						
					 
					
						2014-11-03 22:47:07 +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 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							281ce3105f 
							
						 
					 
					
						
						
							
							Make conversations the root project  
						
						
						
					 
					
						2014-10-22 15:47:11 -04:00