conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	improve regex, implement pattern cache	M. Dietrich	2014-09-03	1	-15/+23
*	add all whitespaces in regex	M. Dietrich	2014-09-02	1	-1/+1
*	transform ascii to emoticons (on display only)	M. Dietrich	2014-09-01	3	-2/+25
*	deleted unnecessary log	iNPUTmice	2014-08-31	1	-2/+0
*	show merged time and status in message adapter	iNPUTmice	2014-08-31	2	-3/+21
*	improvements for merge conditions	iNPUTmice	2014-08-31	2	-3/+9
*	add missing blank before nick	iNPUTmice	2014-08-31	1	-0/+3
*	Smarter nickname highlight insert in confernces	Bahtiar `kalkin-` Gadimov	2014-08-31	1	-6/+3
*	some code cleanup	iNPUTmice	2014-08-31	75	-1263/+1482
*	Merge pull request #391 from betheg/fix_typo	Daniel Gultsch	2014-08-31	1	-4/+4
\|\
\| *	Merge remote-tracking branch 'upstream/development' into fix_typo	Michael	2014-08-30	7	-164/+354
\| \|\
\| * \	Merge remote-tracking branch 'upstream/development' into fix_typo	Michael	2014-08-29	3	-3/+11
\| \|\ \
\| * \| \|	fix forgotten spelling.	Michael	2014-08-28	1	-4/+4
* \| \| \|	require encrypted to be the same for messages to get merged	iNPUTmice	2014-08-31	1	-1/+3
* \| \| \|	experimental message merging	iNPUTmice	2014-08-31	2	-44/+107
\| \|_\|/ \|/\| \|
* \| \|	Merge branch 'sm' into development	iNPUTmice	2014-08-30	3	-146/+250
\|\ \ \
\| * \| \|	reset unsend messages to waiting	iNPUTmice	2014-08-30	2	-2/+17
\| * \| \|	properly set stanza count on session resume	iNPUTmice	2014-08-30	1	-3/+21
\| * \| \|	basic message acking	iNPUTmice	2014-08-30	3	-131/+200
* \| \| \|	proper namespaces for xep-0352	iNPUTmice	2014-08-30	3	-3/+3
* \| \| \|	send inactive or active on every connect and resume	iNPUTmice	2014-08-30	1	-3/+10
* \| \| \|	added basic csi	iNPUTmice	2014-08-30	4	-0/+86
\|/ / /
* \| \|	version bump to 0.6 with changelogs0.6	iNPUTmice	2014-08-30	1	-28/+17
* \| \|	brought npe catcher back for kxml parser	iNPUTmice	2014-08-30	1	-0/+4
\| \|/ \|/\|
* \|	fixed link to old resource	iNPUTmice	2014-08-29	1	-2/+2
* \|	fixed npe	iNPUTmice	2014-08-29	1	-0/+4
* \|	fixed #389	iNPUTmice	2014-08-29	1	-1/+5
\|/
*	fixed spelling thanks @betheg	iNPUTmice	2014-08-28	6	-24/+24
*	translated missing string in settings	iNPUTmice	2014-08-27	1	-2/+6
*	fixing duplicate private muc messages	iNPUTmice	2014-08-25	1	-3/+10
*	fixed message hint	iNPUTmice	2014-08-25	1	-51/+61
*	fixed faulty db creation on first install	iNPUTmice	2014-08-24	1	-9/+12
*	use otr encrypiton instead of plain when contact has exactly one online prese...	Daniel Gultsch	2014-08-24	1	-0/+10
*	jump right into edit account if now accounts are configured	Daniel Gultsch	2014-08-23	2	-9/+18
*	changed workflow on inital avatar publication	Daniel Gultsch	2014-08-23	2	-11/+39
*	experimental muc message deduplication	Daniel Gultsch	2014-08-23	3	-2/+25
*	removed server compat value in favor of a (small xep list)	Daniel Gultsch	2014-08-23	2	-41/+23
*	fixed another npe	iNPUTmice	2014-08-22	1	-7/+10
*	tiny redesign for private muc messages	iNPUTmice	2014-08-22	2	-21/+29
*	make avatars persisent / available even without internet	iNPUTmice	2014-08-21	6	-19/+65
*	save newly taken photos in DCIM dir	iNPUTmice	2014-08-21	3	-33/+42
*	added roster versioning to calculation of server compat	iNPUTmice	2014-08-21	1	-0/+5
*	check if service is bound before adding conferences or contacts	iNPUTmice	2014-08-21	1	-25/+30
*	avoid race condition for otr key in jingle	iNPUTmice	2014-08-21	1	-1/+1
*	deregister listener in editaccount	iNPUTmice	2014-08-21	1	-0/+8
*	revised manage account activity. removed contexual action mode	iNPUTmice	2014-08-20	2	-172/+109
*	fixed lint error	iNPUTmice	2014-08-19	1	-1/+0
*	better error display and additional infos (stats) for the edit account activity	iNPUTmice	2014-08-19	8	-211/+240
*	more error handling for avatar publication	iNPUTmice	2014-08-16	2	-1/+17
*	some improvements for the edit account activity	iNPUTmice	2014-08-16	3	-31/+25