conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	new settings to initialisation of Settings	lookshe	2015-04-12	1	-1/+1
*	implementation for downloading only when enabled wlan	lookshe	2015-04-12	4	-3/+30
*	added settings for accepting and downloading files	lookshe	2015-04-12	24	-29/+77
*	add missing resource files	lookshe	2015-04-12	8	-0/+0
*	Merge remote-tracking branch 'origin/trz/master' into trz/master	lookshe	2015-04-12	1	-3/+1
\|\
\| *	adjusted todo	lookshe	2015-04-12	1	-3/+1
* \|	whatsapp-like smiley implementation	lookshe	2015-04-12	1026	-27/+4231
* \|	whatsapp-like smiley implemantation	lookshe	2015-04-12	1	-1/+2
\|/
*	Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...	steckbrief	2015-04-11	7	-22/+38
\|\
\| *	show online status under avatar in same way for muc as the send button does	lookshe	2015-04-11	1	-13/+18
\| *	differ between received and read message	lookshe	2015-04-11	6	-9/+20
* \|	Color choose dialog	steckbrief	2015-04-11	26	-15/+688
\|/
*	no trim of messages or password	lookshe	2015-04-11	7	-9/+15
*	correct parsing of led color	lookshe	2015-04-11	1	-1/+1
*	todo added	lookshe	2015-04-11	1	-0/+1
*	Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...	lookshe	2015-04-11	88	-635/+3322
\|\
\| *	timestamp parsing reverted	steckbrief	2015-03-31	2	-16/+31
\| *	Configurable LED color (Attention: Expert setting because currently only text...	steckbrief	2015-03-31	4	-3/+19
\| *	Changes for emoticon parser reactivated	steckbrief	2015-03-31	5	-8/+290
\| *	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	86	-617/+2991
\| \|\
\| \| *	bump version code1.2.0	iNPUTmice	2015-03-22	1	-2/+2
\| \| *	pulled translations	iNPUTmice	2015-03-22	5	-0/+21
\| \| *	properly set chat states when receiving otr status messages	iNPUTmice	2015-03-21	1	-1/+1
\| \| *	respond to unreadable OTR messages with error message. fixed #1021	iNPUTmice	2015-03-21	5	-3/+42
\| \| *	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2015-03-20	1	-1/+1
\| \| \|\
\| \| \| *	Update CHANGELOG.md	Daniel Gultsch	2015-03-19	1	-1/+1
\| \| * \|	wait for session iq to return sucessfully before sending other stanzas. fixed...	iNPUTmice	2015-03-20	1	-26/+42
\| \| \|/
\| \| *	version bump to 1.2.0-beta1.2.0-beta	iNPUTmice	2015-03-19	2	-3/+5
\| \| *	don't update presence for muc messages	iNPUTmice	2015-03-19	1	-5/+2
\| \| *	pulled more translations	iNPUTmice	2015-03-19	1	-0/+5
\| \| *	Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen	Daniel Gultsch	2015-03-19	4	-8/+24
\| \| \|\
\| \| \| *	# add delivery receipts for private muc msgs	BrianBlade	2015-03-18	4	-8/+24
\| \| * \|	Merge pull request #1043 from strb/choose_contact_multiple_squashed	Daniel Gultsch	2015-03-18	4	-6/+134
\| \| \|\ \
\| \| \| * \|	Added multiple select to Choose Contact Activity	Andreas Straub	2015-03-18	4	-6/+134
\| \| * \| \|	Merge pull request #1036 from QuentinC/development	Daniel Gultsch	2015-03-18	1	-1/+1
\| \| \|\ \ \
\| \| \| * \| \|	Green led color is better with "full-green"	Quentin	2015-03-04	1	-1/+1
\| \| * \| \| \|	Merge pull request #1041 from weiss/fix-cached-avatar-size	Daniel Gultsch	2015-03-17	1	-29/+31
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| \| * \| \|	Set file size also for cached avatars	Holger Weiß	2015-03-17	1	-29/+31
\| \| \|/ / /
\| \| * \| \|	pulled new translations from transifex	iNPUTmice	2015-03-16	10	-11/+348
\| \| * \| \|	updated changelong	iNPUTmice	2015-03-11	1	-0/+9
\| \| * \| \|	Do not Strigprep JIDs from database	Mateusz "maxmati" Nowoty?ski	2015-03-11	4	-11/+13
\| \| * \| \|	add context menu entries for geo uris	iNPUTmice	2015-03-11	1	-17/+33
\| \| * \| \|	open location directly from notification	iNPUTmice	2015-03-10	6	-0/+25
\| \| * \| \|	show geo uris as 'location' in overview	iNPUTmice	2015-03-10	2	-1/+9
\| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge pull request #1022 from Boris-de/cipher_blacklist	Daniel Gultsch	2015-03-08	2	-0/+25
\| \| \|\ \
\| \| \| * \|	disable all really weak cipher suites	Boris Wachtmeister	2015-03-07	2	-0/+25
\| \| * \| \|	display geo uris as location. show 'send loction' in share menu if request lo...	iNPUTmice	2015-03-07	7	-53/+230
\| \| \|/ /
\| \| * \|	fixed enter is send option	iNPUTmice	2015-03-06	2	-6/+10
\| \| * \|	fixed npe in message parser	iNPUTmice	2015-03-06	1	-4/+4
\| \| * \|	another teaser task for gsoc	iNPUTmice	2015-03-06	1	-0/+5