conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4	lookshe	2016-05-26	1	-18/+28
\|\
\| *	keep conference members in memory and show them in conference details	Daniel Gultsch	2016-05-16	1	-12/+10
\| *	scroll to bottom after sending multi-line message	Daniel Gultsch	2016-05-12	1	-2/+8
\| *	republish pgp signature when changing status	Daniel Gultsch	2016-05-05	1	-1/+1
\| *	expert setting to manually change presence	Daniel Gultsch	2016-04-22	1	-3/+9
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-05-09	1	-4/+4
\|\ \
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-18	1	-3/+1
\|\\| \|
* \| \|	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	1	-1/+3
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	don't show contact details when in conversations with self	Daniel Gultsch	2016-04-09	1	-1/+3
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-06	1	-2/+2
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	Merge tag '1.11.3' into trz/rebase	lookshe	2016-04-05	1	-2/+2
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	save otr fingerprint in message	Daniel Gultsch	2016-03-31	1	-2/+2
* \| \|	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	1	-7/+21
\|\\| \|
\| * \|	allow to delete attachments. fixes #1539	Daniel Gultsch	2016-03-23	1	-7/+25
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	1	-1/+1
\|\\| \|
* \| \|	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	1	-8/+23
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	warn in conversations when account is disabled	Daniel Gultsch	2016-03-06	1	-1/+14
\| * \|	allow to copy original url even while downloading. fixes #1743	Daniel Gultsch	2016-03-04	1	-6/+9
\| * \|	don't break with srcoll events on empty message lists	Daniel Gultsch	2016-03-03	1	-2/+7
* \| \|	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	1	-15/+31
\|\\| \|
\| * \|	Retry decryption from message menu	fiaxh	2016-02-23	1	-0/+13
\| * \|	properly trigger show load more messages in mucs	Daniel Gultsch	2016-02-22	1	-2/+10
\| * \|	turned muc errors into enum. added error codes for service shutdown	Daniel Gultsch	2016-02-22	1	-11/+16
* \| \|	Readded MessageDetailsDialog to message context menu after merge	steckbrief	2016-02-24	1	-0/+4
* \| \|	Removed stupid message correction	steckbrief	2016-02-23	1	-53/+9
* \| \|	Removed useless 'button-message' to load more messages. Implementation alread...	steckbrief	2016-02-23	1	-10/+0
* \| \|	Fix visibility of updateStatusMessages method that LoadMoreMessages can work	steckbrief	2016-02-23	1	-1/+1
* \| \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	1	-19/+73
\|\\| \|
\| * \|	show load more messages when auto loading is disabled and messages are still ...	Daniel Gultsch	2016-02-21	1	-6/+10
\| * \|	don't reset whisper on reInit. fixes #1637	Daniel Gultsch	2016-02-19	1	-3/+0
\| * \|	only offer message correction for the very last message	Daniel Gultsch	2016-02-17	1	-3/+6
\| * \|	basic support for XEP-0308: Last Message Correction. fixes #864	Daniel Gultsch	2016-02-15	1	-14/+58
\| * \|	only show load more messages button when mam is available	Daniel Gultsch	2016-02-14	1	-1/+5
* \| \|	Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4	lookshe	2016-02-16	1	-34/+47
\|\\| \|
\| * \|	fixed performance regression in on scroll listener	Daniel Gultsch	2016-02-04	1	-1/+6
\| * \|	prevent previoulsly cleared messages from reloading. fixes #1110	Daniel Gultsch	2016-02-04	1	-3/+7
\| * \|	Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...	Daniel Gultsch	2016-02-02	1	-34/+35
\| \|\ \
\| \| * \|	Use a Presence class for presence information	Stephen Paul Weber	2016-01-24	1	-34/+35
* \| \| \|	Imports organized	steckbrief	2016-02-12	1	-11/+2
* \| \| \|	green bubbles and setting to choose green or white bubbles removed	steckbrief	2016-02-12	1	-1/+0
* \| \| \|	Compilation errors and merge mixups fixed	steckbrief	2016-02-11	1	-95/+2
* \| \| \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-193/+396
\|\\| \| \|
\| * \| \|	refactored user handling in conferences. show try again button when conferenc...	Daniel Gultsch	2016-02-01	1	-1/+4
\| \|/ /
\| * \|	use extract account from intent method and final EXTRA_ACCOUNT variable	Daniel Gultsch	2016-01-22	1	-1/+1
\| * \|	don't show snackbar when notifications are disabled or paused	Daniel Gultsch	2016-01-08	1	-10/+0
\| * \|	Merge pull request #1595 from fiaxh/pgp_database_signature	Daniel Gultsch	2015-12-04	1	-69/+73
\| \|\ \
\| \| * \|	Unset all PGP signatures once	fiaxh	2015-12-02	1	-69/+73
\| * \| \|	avoid some NPEs	Daniel Gultsch	2015-12-04	1	-1/+1
\| \|/ /
\| * \|	indicate cbe in chat message hint	Daniel Gultsch	2015-10-31	1	-1/+7