conversations-plus - improved conversations

	Commit message (Expand)	Author	Age	Files	Lines
*	Added columns to fileparams table: url, original file name, key and iv	steckbrief	2017-01-04	3	-0/+26
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	4	-0/+22
\|\
\| *	Implements FS#235: Deletion of remote files uploaded via httpupload	steckbrief	2016-09-29	2	-0/+15
\| *	Fixes FS#229: prompt for confirmation before deleting a file	steckbrief	2016-08-23	2	-0/+2
\| *	Basic filetransfer http delete implementation; Exceptions for IqPacketError a...	steckbrief	2016-08-22	2	-0/+5
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	2	-0/+23
\|\\|
\| *	Merge branch 'master' into introduce_cplus_database_version	steckbrief	2016-04-18	44	-117/+170
\| \|\
\| * \|	DatabaseBackend updated to serve Conversatiosn Database version and Conversat...	steckbrief	2016-04-17	2	-0/+23
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-18	2	-8/+1
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Related to FS#199: fixed merge hickups (message correction setting removed, k...	steckbrief	2016-04-18	2	-8/+1
\| * \|	removed unused string	lookshe	2016-04-17	1	-1/+0
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-17	44	-116/+177
\| \|\ \ \| \|/ / \|/\| / \| \|/
* \|	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	44	-145/+178
\|\ \
\| * \|	add setting for quick sharing	Daniel Gultsch	2016-04-14	2	-15/+26
\| * \|	added share uri button to conference details	Daniel Gultsch	2016-04-12	14	-14/+26
\| * \|	pulled translations from transifex	Daniel Gultsch	2016-04-10	29	-86/+27
\| * \|	introduced setting to turn of notification led	Daniel Gultsch	2016-04-09	2	-4/+11
\| * \|	pulled translations from transifex	Daniel Gultsch	2016-04-08	2	-3/+23
\| * \|	check file owner when attaching files or using them as avatar	Daniel Gultsch	2016-04-07	1	-0/+1
\| * \|	pulled translations from transifex	Daniel Gultsch	2016-04-04	12	-26/+71
* \| \|	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	29	-327/+327
\| * \|	Pulled translations from transifex	lookshe	2016-04-01	2	-25/+31
* \| \|	update to beta-2 and new logo for beta	lookshe	2016-04-06	30	-0/+0
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-04-01	2	-25/+31
\|\ \ \
\| * \| \|	Pulled translations from transifex	lookshe	2016-04-01	2	-25/+31
\| \|/ /
* \| \|	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 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/rename' into trz/rebase	lookshe	2016-03-27	1	-0/+4
\|\\| \|
\| * \|	Fixes FS#166 - Images cannot be opened since storing in private image folder	lookshe	2016-03-27	1	-0/+4
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	2	-1/+5
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	2	-1/+5
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	allow to delete attachments. fixes #1539	Daniel Gultsch	2016-03-23	2	-1/+5
* \| \|	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.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
\|\\| \|