conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rename' into trz/rebase	steckbrief	2017-01-11	2	-1/+23
\|\
\| *	Formatting of remote file status adjustedtrz/rename	steckbrief	2017-01-11	1	-1/+1
\| *	Custom toast view added	steckbrief	2017-01-11	1	-0/+22
\| *	Merge branch 'trz/rebase' into trz/rename	steckbrief	2017-01-05	1	-0/+22
\| \|\ \| \|/ \|/\|
* \|	Merge remote-tracking branch 'origin/trz/rename' into trz/rebase	steckbrief	2017-01-05	3	-31/+49
\|\\|
\| *	Implement FS#239: Show number of unread messages in conversations overview	steckbrief	2016-12-28	1	-30/+42
\| *	Fixes FS#237: Enable long click in layout instead of programmatically	steckbrief	2016-10-23	2	-1/+7
* \|	Added columns to fileparams table: url, original file name, key and ivtrz/beta-5	steckbrief	2017-01-04	1	-0/+22
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	1	-0/+12
\|\\|
\| *	Implements FS#235: Deletion of remote files uploaded via httpupload	steckbrief	2016-09-29	1	-0/+12
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	1	-0/+22
\|\\|
\| *	DatabaseBackend updated to serve Conversatiosn Database version and Conversat...	steckbrief	2016-04-17	1	-0/+22
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-30	1	-1/+1
\|\\|
\| *	no resize of input field when inserting emojicon (FS#175)	lookshe	2016-03-30	1	-1/+1
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	4	-4/+5
\|\\|
\| *	Fixes FS#143 - Displaying of emoticons too large	lookshe	2016-03-20	4	-4/+5
* \|	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 remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	2	-6/+3
\|\\|
\| *	Fixes FS#51: Change toggle in Account Management back to standard	steckbrief	2016-03-11	2	-5/+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	2	-26/+42
\| \|\ \| \|/ \|/\|
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	19	-298/+945
\| \|\
* \| \	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	2	-26/+42
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	let users confirm each member in a conference even if that contact is already...	Daniel Gultsch	2016-03-01	1	-26/+34
\| * \|	refactored omemo to take multiple recipients	Daniel Gultsch	2016-02-29	2	-26/+34
* \| \|	Fixes FS#147: Disable OMEMO	steckbrief	2016-03-02	1	-1/+2
* \| \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	1	-1/+1
* \| \|	Removed stupid message correction	steckbrief	2016-02-23	2	-20/+0
* \| \|	Removed useless 'button-message' to load more messages. Implementation alread...	steckbrief	2016-02-23	1	-9/+0
* \| \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	3	-2/+42
\|\\| \|
\| * \|	basic support for XEP-0308: Last Message Correction. fixes #864	Daniel Gultsch	2016-02-15	2	-2/+22
\| * \|	client side support for XEP-0357: Push Notifications	Daniel Gultsch	2016-02-12	1	-2/+21
* \| \|	Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4	lookshe	2016-02-16	1	-0/+9
\|\\| \|
\| * \|	prevent previoulsly cleared messages from reloading. fixes #1110	Daniel Gultsch	2016-02-04	1	-0/+9
* \| \|	green bubbles and setting to choose green or white bubbles removed	steckbrief	2016-02-12	1	-4/+4
* \| \|	Fixed layout issue with emojicon tastatur button	steckbrief	2016-02-12	1	-1/+0
* \| \|	Fixed XML errors after merge	steckbrief	2016-02-11	3	-8/+9
* \| \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	19	-297/+923
\|\\| \|
\| * \|	introduced boolean form field wrapper	Daniel Gultsch	2016-01-23	2	-1/+14
\| * \|	added UI wrapper for (some) form fields	Daniel Gultsch	2016-01-22	1	-0/+21
\| * \|	changed spacing in create dialogs and notify user when no accounts are activated	Daniel Gultsch	2016-01-22	2	-6/+10
\| * \|	increased padding in create contact/conference dialog	Daniel Gultsch	2016-01-21	2	-15/+21
\| * \|	use match_parent as height in conversations overview	Daniel Gultsch	2016-01-12	1	-2/+2