conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-07	1	-0/+1
\|\
\| *	Implements FS#187: Add single line copy to logcat view	steckbrief	2016-04-07	1	-0/+1
\| *	conversations->conversations+	lookshe	2016-04-03	1	-14/+14
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	1	-1/+13
\|\\|
\| *	Implements FS#173: Move access to colors to separate helper class	steckbrief	2016-03-29	1	-1/+13
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	1	-0/+1
\| \|\ \| \|/ \|/\|
* \|	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	1	-0/+1
\|\ \
\| * \|	allow to delete attachments. fixes #1539	Daniel Gultsch	2016-03-23	1	-0/+1
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-23	1	-2/+2
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	pulled from transifex	lookshe	2016-03-23	1	-2/+2
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	2	-0/+7
\|\\| \|
\| * \|	Fixes FS#143 - Displaying of emoticons too large	lookshe	2016-03-20	2	-0/+7
\| * \|	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	1	-0/+3
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge tag '1.11.1' into trz/merge_1.11.1	lookshe	2016-03-17	1	-0/+3
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	reworked sharewith activity to stay open during sharing	Daniel Gultsch	2016-03-16	1	-0/+3
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	1	-13/+0
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Fixes FS#51: Change toggle in Account Management back to standard	steckbrief	2016-03-11	1	-13/+0
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	1	-0/+6
\| \|\ \ \| \|/ / \|/\| \|
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	7	-298/+436
\| \|\ \
* \| \ \	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	1	-0/+6
\|\ \ \ \ \| \|_\|/ / \|/\| \| / \| \| \|/ \| \|/\|
\| * \|	warn in conversations when account is disabled	Daniel Gultsch	2016-03-06	1	-0/+1
\| * \|	show host in file size checker	Daniel Gultsch	2016-03-04	1	-0/+1
\| * \|	don't automatically crop avatar	Daniel Gultsch	2016-03-04	1	-0/+1
\| * \|	expert option to treat vibrate as silent mode for XA. fixes #1530	Daniel Gultsch	2016-03-01	1	-0/+2
\| * \|	let users confirm each member in a conference even if that contact is already...	Daniel Gultsch	2016-03-01	1	-0/+1
* \| \|	Fixes FS#147: Disable OMEMO	steckbrief	2016-03-02	2	-0/+6
* \| \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	1	-3/+0
* \| \|	externalized string 'Retry decryption'trz/merge_1.10.1	steckbrief	2016-02-28	1	-0/+1
* \| \|	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	1	-3/+5
\|\\| \|
\| * \|	optionally lock conference domains as well and hide known domains in ui	Daniel Gultsch	2016-02-24	1	-0/+2
\| * \|	Retry decryption from message menu	fiaxh	2016-02-23	1	-1/+0
\| * \|	turned muc errors into enum. added error codes for service shutdown	Daniel Gultsch	2016-02-22	1	-2/+3
* \| \|	Fixes FS#89 after merge conflict	steckbrief	2016-02-24	1	-3/+6
* \| \|	Removed stupid message correction	steckbrief	2016-02-23	1	-2/+0
* \| \|	Removed useless 'button-message' to load more messages. Implementation alread...	steckbrief	2016-02-23	1	-1/+0
* \| \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	1	-15/+18
\|\\| \|
\| * \|	made clear that archiving preferences are server side	Daniel Gultsch	2016-02-16	1	-4/+4
\| * \|	added setting to opt-out of message correction. renamed preferences and optio...	Daniel Gultsch	2016-02-16	1	-15/+17
\| * \|	basic support for XEP-0308: Last Message Correction. fixes #864	Daniel Gultsch	2016-02-15	1	-0/+2
\| * \|	client side support for XEP-0357: Push Notifications	Daniel Gultsch	2016-02-12	1	-0/+1
* \| \|	Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4	lookshe	2016-02-16	2	-0/+10
\|\\| \|
\| * \|	allow user to set MAM preferences	Daniel Gultsch	2016-02-09	2	-0/+9
\| * \|	prevent previoulsly cleared messages from reloading. fixes #1110	Daniel Gultsch	2016-02-04	1	-0/+1
* \| \|	Unused preference 'picture_compression'. This feature is configured in our va...	steckbrief	2016-02-13	2	-14/+0
* \| \|	green bubbles and setting to choose green or white bubbles removed	steckbrief	2016-02-12	1	-2/+0
* \| \|	Fixed placeholder string for message input box	steckbrief	2016-02-12	1	-1/+1
* \| \|	Fixed XML errors after merge	steckbrief	2016-02-11	2	-0/+3
* \| \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	6	-301/+433
\|\\| \|
\| * \|	opt out handling of the autojoin flag. fixes #1666	Daniel Gultsch	2016-02-01	1	-0/+2
\| * \|	refactored user handling in conferences. show try again button when conferenc...	Daniel Gultsch	2016-02-01	1	-0/+1