conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	loading avatars in seperate tasks	iNPUTmice	2015-02-15	3	-18/+203
*	load messages asynchronously	iNPUTmice	2015-02-12	2	-2/+24
*	use time instead of uptime for unmute	iNPUTmice	2015-02-12	2	-5/+2
*	added actions to error notification	iNPUTmice	2015-02-10	3	-1/+52
*	strip fractional seconds from timestamp before parsing	iNPUTmice	2015-02-10	2	-6/+4
*	disabled cipher logging	iNPUTmice	2015-02-09	1	-1/+1
*	Merge pull request #959 from SamWhited/ciphers_fix	Daniel Gultsch	2015-02-09	4	-9/+12
\|\
\| *	Use platform ciphers as well, just prefer ours	Sam Whited	2015-02-02	4	-9/+12
* \|	don't show 'enter pgp key' in non encrypted chats	iNPUTmice	2015-02-09	1	-0/+1
* \|	always add a non resolved SRV record to the list	iNPUTmice	2015-02-09	1	-6/+1
* \|	made delay timestamp parser accept nano seconds	iNPUTmice	2015-02-09	1	-1/+1
* \|	sort users in muc	Daniel Gultsch	2015-02-07	1	-3/+12
* \|	trim message bodys on display	Daniel Gultsch	2015-02-07	2	-3/+3
* \|	refactored how snackbar is displayed	Daniel Gultsch	2015-02-07	1	-82/+105
\|/
*	don't disable any ciphers	iNPUTmice	2015-02-02	1	-3/+4
*	added more ciphers for old openssl versions	iNPUTmice	2015-02-02	1	-1/+3
*	fixed text preview for images	iNPUTmice	2015-02-01	1	-1/+1
*	made version codes ready for release candidate in beta channel	iNPUTmice	2015-01-29	1	-1/+1
*	don't count when attempt failed completly	iNPUTmice	2015-01-29	1	-0/+1
*	Merge branch 'development' of https://github.com/siacs/Conversations into dev...	iNPUTmice	2015-01-29	2	-8/+24
\|\
\| *	Use Material Design Icons on API 21+	Sam Whited	2015-01-29	2	-8/+24
* \|	Merge branch 'development' of https://github.com/siacs/Conversations into dev...	iNPUTmice	2015-01-29	1	-10/+10
\|\\|
\| *	Merge pull request #941 from SamWhited/snackbar_ordering	Daniel Gultsch	2015-01-28	1	-10/+10
\| \|\
\| \| *	Show errors before mute snackbar	Sam Whited	2015-01-27	1	-10/+10
* \| \|	properly clear notifications. fixed #921	iNPUTmice	2015-01-29	1	-2/+8
\|/ /
* /	fixed broken caps	iNPUTmice	2015-01-28	2	-14/+17
\|/
*	muc tics for consistency	iNPUTmice	2015-01-26	1	-1/+1
*	changed version code and version name to 1.0-beta2	iNPUTmice	2015-01-26	1	-1/+1
*	adapt caps on whether or not message confirmation is on	iNPUTmice	2015-01-26	5	-11/+31
*	don't put ejabberds status code muc messages into an actual conversation	iNPUTmice	2015-01-26	1	-0/+1
*	made connect time out more failsave	iNPUTmice	2015-01-25	1	-5/+8
*	Merge pull request #930 from betheg/otr	Daniel Gultsch	2015-01-25	2	-0/+3
\|\
\| *	otr: switch to the otr-state the partner alternate.	Michael	2015-01-25	2	-0/+3
* \|	Merge pull request #933 from betheg/mergeable	Daniel Gultsch	2015-01-25	3	-5/+9
\|\ \
\| * \|	fix mergable() for /me command.	Michael	2015-01-25	3	-5/+9
\| \|/
* /	set jingle file transfer to offer after iq offer has returned	iNPUTmice	2015-01-25	1	-6/+17
\|/
*	MessageParser: fix the regex for otr query messages.	Michael	2015-01-24	1	-1/+1
*	Merge pull request #924 from andersruneson/changeonlinecolor	Daniel Gultsch	2015-01-24	2	-1/+5
\|\
\| *	Changed online color to green instead of primary	Anders Sandblad	2015-01-23	2	-1/+5
* \|	fixed mam to work with muc	iNPUTmice	2015-01-24	4	-11/+21
\|/
*	show checkbox to hide offline contacts	iNPUTmice	2015-01-21	1	-6/+19
*	fixed bug in find conference in database method	iNPUTmice	2015-01-21	1	-3/+6
*	deal with user entering full jids in join conference dialog	iNPUTmice	2015-01-21	2	-3/+4
*	always allow access to contact details. provide add button in contact details	iNPUTmice	2015-01-21	4	-72/+82
*	Add block/unblock to contact details menu	Sam Whited	2015-01-21	3	-9/+15
*	Merge pull request #908 from betheg/otr4j	Daniel Gultsch	2015-01-21	3	-2/+8
\|\
\| *	otr4j: update to 0.22	Michael	2015-01-20	3	-2/+8
* \|	Add color / category to foreground notification	Sam Whited	2015-01-20	1	-7/+14
* \|	changed message duplicate finder	iNPUTmice	2015-01-20	1	-5/+10
* \|	fixed missing image preview	iNPUTmice	2015-01-20	1	-1/+1