conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-23	32	-317/+450
\|\
\| *	pulled from transifex	lookshe	2016-03-23	32	-317/+450
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	7	-4/+15
\|\\|
\| *	Fixes FS#143 - Displaying of emoticons too large	lookshe	2016-03-20	7	-4/+15
\| *	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	6	-105/+438
\| \|\
* \| \	Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1	lookshe	2016-03-20	1	-1/+2
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-1/+2
\| \|\\|
\| \| *	Refs FS#140: Rework message display	steckbrief	2016-03-13	1	-1/+2
* \| \|	Merge tag '1.11.1' into trz/merge_1.11.1	lookshe	2016-03-17	6	-105/+438
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	reworked sharewith activity to stay open during sharing	Daniel Gultsch	2016-03-16	1	-0/+3
\| * \|	pulled translations from transifex	Daniel Gultsch	2016-03-13	5	-106/+443
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	6	-62/+3
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Fixes FS#51: Change toggle in Account Management back to standard	steckbrief	2016-03-11	6	-61/+3
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-10	1	-8/+0
\|\\| \|
\| * \|	Fixes FS#158: user decision dialog heading configurable and translateable	steckbrief	2016-03-10	1	-8/+0
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-08	1	-1/+2
\|\\| \|
\| * \|	Merge remote branch 'master'	steckbrief	2016-03-08	2	-4/+0
\| \|\ \
\| * \| \|	Fixes FS#145: Dialog for decision in Android 5	steckbrief	2016-03-08	1	-1/+2
* \| \| \|	Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1	lookshe	2016-03-08	2	-4/+0
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	reset link and highlight colors to system default	steckbrief	2016-03-08	2	-4/+0
\| \|/ /
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	38	-131/+319
\| \|\ \ \| \|/ / \|/\| \|
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-07	2	-9/+0
\| \|\ \
\| * \ \	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	167	-2197/+7492
\| \|\ \ \
* \| \ \ \	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	38	-131/+319
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| / \| \| \|_\|/ \| \|/\| \|
\| * \| \|	pulled translations from transifex	Daniel Gultsch	2016-03-06	28	-82/+272
\| * \| \|	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	7	-0/+9
\| * \| \|	expert option to treat vibrate as silent mode for XA. fixes #1530	Daniel Gultsch	2016-03-01	2	-0/+8
\| * \| \|	let users confirm each member in a conference even if that contact is already...	Daniel Gultsch	2016-03-01	2	-26/+35
\| * \| \|	refactored omemo to take multiple recipients	Daniel Gultsch	2016-02-29	2	-26/+34
* \| \| \|	Finally fixes FS#142	lookshe	2016-03-07	2	-9/+0
\| \|_\|/ \|/\| \|
* \| \|	Fixes FS#147: Disable OMEMO	steckbrief	2016-03-02	5	-3/+16
* \| \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	24	-72/+2
* \| \|	externalized string 'Retry decryption'trz/merge_1.10.1	steckbrief	2016-02-28	3	-1/+3
* \| \|	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	3	-4/+9
\|\\| \|
\| * \|	disallow message correction by default. fixes #1720	Daniel Gultsch	2016-02-26	1	-1/+1
\| * \|	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	2	-1/+4
\| * \|	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	28	-57/+0
* \| \|	Removed useless 'button-message' to load more messages. Implementation alread...	steckbrief	2016-02-23	16	-24/+0
* \| \|	merged string resources	steckbrief	2016-02-23	2	-6/+0
* \| \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	61	-202/+1709
\|\\| \|
\| * \|	pulled translations from transifex	Daniel Gultsch	2016-02-20	2	-0/+49
\| * \|	pulled translations from transifex	Daniel Gultsch	2016-02-19	29	-253/+212
\| * \|	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	2	-16/+23
\| * \|	basic support for XEP-0308: Last Message Correction. fixes #864	Daniel Gultsch	2016-02-15	32	-2/+28