conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Bugfix for issue #1121	lookshe	2015-04-13	1	-10/+18
*	allow sharing multiple images at once. fixes #1090	iNPUTmice	2015-04-11	3	-59/+111
*	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	8	-71/+184
*	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
* \|	do not overlap account title and switch	iNPUTmice	2015-04-01	1	-1/+4
* \|	Merge branch 'account_state_switch' of https://github.com/BrianBlade/Conversa...	iNPUTmice	2015-04-01	3	-16/+45
\|\ \
\| * \|	Add toggle account-state switch	BrianBlade	2015-04-01	3	-16/+45
\| \|/
* \|	Merge pull request #1076 from rk4an/patch-1	Daniel Gultsch	2015-04-01	1	-0/+4
\|\ \
\| * \|	Update french translation	Erkan	2015-03-22	1	-0/+4
\| \|/
* /	pulled translations from transifex	iNPUTmice	2015-04-01	7	-15/+466
\|/
*	pulled translations	iNPUTmice	2015-03-22	5	-0/+21
*	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
*	pulled more translations	iNPUTmice	2015-03-19	1	-0/+5
*	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	4	-6/+134
\|\ \
\| * \|	Added multiple select to Choose Contact Activity	Andreas Straub	2015-03-18	4	-6/+134
* \| \|	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
\| \|/ / \|/\| \|
* \| \|	pulled new translations from transifex	iNPUTmice	2015-03-16	10	-11/+348
* \| \|	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	6	-0/+25
* \| \|	show geo uris as 'location' in overview	iNPUTmice	2015-03-10	2	-1/+9
\| \|/ \|/\|
* \|	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	7	-53/+230
\|/ /
* \|	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
* \|	added config option to disable string prep in jids	iNPUTmice	2015-03-05	2	-3/+5
* \|	experimantal in memory jid caching	iNPUTmice	2015-03-04	1	-0/+15
\|/
*	added methods to count number of unread messages	Daniel Gultsch	2015-03-02	2	-0/+21
*	mark all sent messages up to a marker as displayed	Daniel Gultsch	2015-03-01	2	-13/+19
*	merge messages with related status (unsend, send, send_received)	iNPUTmice	2015-03-01	1	-1/+17
*	catching out of memory run time exception in hasEnabledAccounts()	iNPUTmice	2015-02-28	1	-0/+2
*	pulled new translations from transifex	iNPUTmice	2015-02-27	5	-23/+191
*	use conversations green in notification led	iNPUTmice	2015-02-27	1	-1/+1
*	Merge pull request #1006 from QuentinC/development	Daniel Gultsch	2015-02-27	1	-0/+1
\|\
\| *	Update NotificationService.java	QuentinC	2015-02-27	1	-1/+1
\| *	- Update mBuilder in NotificationService.java to ensure that the led is displ...	Quentin	2015-02-27	1	-1/+2
* \|	don't add users with null nicks to muc user list	iNPUTmice	2015-02-27	1	-1/+1
* \|	hide change password menu item if server feature is unavailable	iNPUTmice	2015-02-27	1	-7/+8
\|/
*	reset error status in edit account when reconnecting	iNPUTmice	2015-02-26	1	-0/+4