conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #1146 from BrianBlade/minor_otr_tweaks	Daniel Gultsch	2015-04-25	3	-6/+17
\|\
\| *	OTR: Fix onContactStatusChanged & dont archive OTR	BrianBlade	2015-04-21	3	-6/+17
* \|	cleaned up file handling	Daniel Gultsch	2015-04-25	3	-71/+87
* \|	send invite to other instanzes after creating ad hoc conference. fixes #1136	Daniel Gultsch	2015-04-23	1	-0/+8
* \|	fixed direct invites	Daniel Gultsch	2015-04-21	1	-12/+28
\|/
*	always hide pgp snackbar after decrypting a message. fixes #1075	Daniel Gultsch	2015-04-20	1	-0/+1
*	removed some dead code	Daniel Gultsch	2015-04-20	1	-19/+0
*	fixed weird touch on snackbar switched conversation bug	Daniel Gultsch	2015-04-20	1	-3/+2
*	some code clean up to fix some rare NPE’s	Daniel Gultsch	2015-04-19	2	-4/+7
*	increased undo delay	iNPUTmice	2015-04-17	1	-1/+1
*	fixed a bug in DNS helper code. fixes #1130	iNPUTmice	2015-04-16	2	-2/+2
*	some bug fixes concerning 0byte files. fixes #1126	iNPUTmice	2015-04-15	2	-1/+2
*	maintain state when rotating settings activity	iNPUTmice	2015-04-14	1	-14/+16
*	Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Con...	iNPUTmice	2015-04-14	2	-4/+18
\|\
\| *	Add option to use MTM without default TrustManager	BrianBlade	2015-04-11	2	-4/+18
* \|	always show save button when account info was modified. fixes #918	iNPUTmice	2015-04-14	1	-5/+9
* \|	fixed disable account when sliding and not clicking the toggle	iNPUTmice	2015-04-13	2	-8/+9
* \|	fixed typos	iNPUTmice	2015-04-13	2	-2/+2
* \|	Merge pull request #1123 from lookshe/development	Daniel Gultsch	2015-04-13	1	-10/+18
\|\ \
\| * \|	Bugfix for issue #1121	lookshe	2015-04-13	1	-10/+18
* \| \|	shut up linter	iNPUTmice	2015-04-13	1	-0/+1
* \| \|	Maintain private chat on MUC. fixes #1097	iNPUTmice	2015-04-13	1	-1/+0
* \| \|	fixed regression where the selected conversation wasn't highlighted anymore o...	iNPUTmice	2015-04-13	2	-12/+11
\|/ /
* \|	allow sharing multiple images at once. fixes #1090	iNPUTmice	2015-04-11	2	-59/+104
* \|	don't resume old session when changing resource	iNPUTmice	2015-04-09	5	-7/+35
* \|	Enable end-conversation by swipe gesture	BrianBlade	2015-04-08	2	-9/+95
* \|	Merge pull request #1099 from BrianBlade/fix_otr_error_msgs	Daniel Gultsch	2015-04-02	2	-18/+24
\|\ \
\| * \|	Fix OTR-Error messages	BrianBlade	2015-04-01	2	-18/+24
\| \|/
* /	Add toggle account-state switch	BrianBlade	2015-04-01	2	-16/+37
\|/
*	properly set chat states when receiving otr status messages	iNPUTmice	2015-03-21	1	-1/+1
*	respond to unreadable OTR messages with error message. fixed #1021	iNPUTmice	2015-03-21	5	-3/+42
*	wait for session iq to return sucessfully before sending other stanzas. fixed...	iNPUTmice	2015-03-20	1	-26/+42
*	don't update presence for muc messages	iNPUTmice	2015-03-19	1	-5/+2
*	Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen	Daniel Gultsch	2015-03-19	4	-8/+24
\|\
\| *	# add delivery receipts for private muc msgs	BrianBlade	2015-03-18	4	-8/+24
* \|	Merge pull request #1043 from strb/choose_contact_multiple_squashed	Daniel Gultsch	2015-03-18	2	-6/+121
\|\ \
\| * \|	Added multiple select to Choose Contact Activity	Andreas Straub	2015-03-18	2	-6/+121
* \| \|	Merge pull request #1036 from QuentinC/development	Daniel Gultsch	2015-03-18	1	-1/+1
\|\ \ \
\| * \| \|	Green led color is better with "full-green"	Quentin	2015-03-04	1	-1/+1
* \| \| \|	Set file size also for cached avatars	Holger Weiß	2015-03-17	1	-29/+31
\| \|/ / \|/\| \|
* \| \|	Do not Strigprep JIDs from database	Mateusz "maxmati" Nowoty?ski	2015-03-11	4	-11/+13
* \| \|	add context menu entries for geo uris	iNPUTmice	2015-03-11	1	-17/+33
* \| \|	open location directly from notification	iNPUTmice	2015-03-10	1	-0/+25
* \| \|	show geo uris as 'location' in overview	iNPUTmice	2015-03-10	1	-1/+7
\| \|/ \|/\|
* \|	Merge pull request #1022 from Boris-de/cipher_blacklist	Daniel Gultsch	2015-03-08	2	-0/+25
\|\ \
\| * \|	disable all really weak cipher suites	Boris Wachtmeister	2015-03-07	2	-0/+25
* \| \|	display geo uris as location. show 'send loction' in share menu if request lo...	iNPUTmice	2015-03-07	5	-48/+215
\|/ /
* \|	fixed enter is send option	iNPUTmice	2015-03-06	2	-6/+10
* \|	fixed npe in message parser	iNPUTmice	2015-03-06	1	-4/+4
* \|	avoid unnecessary thread creation	iNPUTmice	2015-03-05	3	-17/+29