conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'development' of github.com:siacs/Conversations into development	Daniel Gultsch	2015-05-21	1	-2/+8
\|\
\| *	Merge pull request #1212 from emdete/add_jid_to_show_location	Daniel Gultsch	2015-05-20	1	-3/+8
\| \|\ \| \| \| \| \| \|	fix to detect the sender jid correctly
\| \| *	fix to detect the sender jid correctly	M. Dietrich	2015-05-20	1	-3/+8
\| \| \|
\| * \|	Merge pull request #1211 from emdete/add_jid_to_show_location	Daniel Gultsch	2015-05-20	1	-0/+1
\| \|\\| \| \| \| \| \| \|	add extra jid to intend "show location"
\| \| *	add extra jid to intend "show location"	M. Dietrich	2015-05-20	1	-0/+1
\| \| \|
* \| \|	Merge branch 'master' into development	Daniel Gultsch	2015-05-21	2	-2/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	version bump to 1.4.21.4.2	Daniel Gultsch	2015-05-21	1	-2/+2
\| \| \|
\| * \|	fixed with attaching wrong files when returning to activity and background ↵	Daniel Gultsch	2015-05-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	service is still alive
* \| \|	added ShortcutBadger as a dependency to create unread counts on launcher icon	Daniel Gultsch	2015-05-20	3	-8/+22
\| \| \|
* \| \|	pulled translations from transifex	Daniel Gultsch	2015-05-20	7	-0/+35
\| \| \|
* \| \|	Merge branch 'master' into development	Daniel Gultsch	2015-05-20	2	-6/+5
\|\\| \|
\| * \|	don't allow user to accidentally send empty messages1.4.1	Daniel Gultsch	2015-05-20	2	-6/+5
\| \| \|
\| * \|	Merge branch 'development'1.4.0	Daniel Gultsch	2015-05-20	196	-888/+2810
\| \|\ \
\| * \| \|	version bump to 1.3.11.3.1	Daniel Gultsch	2015-05-02	1	-2/+2
\| \| \| \|
\| * \| \|	mark account with incompatible server when no sasl mechansim could be found	Daniel Gultsch	2015-05-02	1	-19/+24
\| \| \| \|
\| * \| \|	shut up linter. fixed build	Daniel Gultsch	2015-05-02	1	-1/+1
\| \| \| \|
\| * \| \|	Merge tag '1.3.0'	Daniel Gultsch	2015-05-02	198	-461/+2996
\| \|\ \ \
\| * \| \| \|	fixed a bug in DNS helper code. fixes #1130	iNPUTmice	2015-04-16	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	proper error parsing. some clean up	Daniel Gultsch	2015-05-20	1	-41/+49
\| \| \| \| \|
* \| \| \| \|	fixed npe in new message parser	Daniel Gultsch	2015-05-20	1	-1/+3
\| \| \| \| \|
* \| \| \| \|	fixed muc mam. added a few security checks	Daniel Gultsch	2015-05-20	2	-25/+35
\| \| \| \| \|
* \| \| \| \|	fixed read/unread markers	Daniel Gultsch	2015-05-20	1	-10/+9
\| \| \| \| \|
* \| \| \| \|	added mam stuff to new message parser	Daniel Gultsch	2015-05-20	3	-9/+28
\| \| \| \| \|
* \| \| \| \|	rewrote parser code. mam id and possible other stuff still missing. also ↵	Daniel Gultsch	2015-05-20	4	-504/+230
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	massivly untested
* \| \| \| \|	provide helper function for getting the content of a child directly	Daniel Gultsch	2015-05-20	6	-21/+38
\| \|_\|/ / \|/\| \| \|
* \| \| \|	version bump to 1.4.0	Daniel Gultsch	2015-05-20	1	-2/+2
\| \| \| \|
* \| \| \|	added fall back package id for voice recorder plugin	Daniel Gultsch	2015-05-20	1	-0/+1
\| \| \| \|
* \| \| \|	hide block contact from context menu when server feature is not available ↵	Daniel Gultsch	2015-05-19	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed #1207
* \| \| \|	use same socket time out for jingle and xmpp connections	Daniel Gultsch	2015-05-18	2	-2/+2
\| \| \| \|
* \| \| \|	use a 20s timeout on socks5 connections	Daniel Gultsch	2015-05-18	2	-2/+6
\| \| \| \|
* \| \| \|	don't offer initiator his own candidates	Daniel Gultsch	2015-05-18	1	-2/+4
\| \| \| \|
* \| \| \|	added changelog for upcoming 1.4.0 release	Daniel Gultsch	2015-05-18	1	-0/+7
\| \|_\|/ \|/\| \|
* \| \|	fixed crash on failed account registry	Daniel Gultsch	2015-05-17	1	-1/+1
\| \| \|
* \| \|	made white space check in bodyContainsDownloadable less aggresive	Daniel Gultsch	2015-05-16	1	-1/+1
\| \| \|
* \| \|	version bump to 1.4.0-beta	Daniel Gultsch	2015-05-16	1	-2/+2
\| \| \|
* \| \|	pulled new translations from transifex	Daniel Gultsch	2015-05-16	3	-52/+302
\| \| \|
* \| \|	let jingle connection and manager handle message status	Daniel Gultsch	2015-05-16	3	-4/+10
\| \| \|
* \| \|	call StartConversationActivity in init mode only after adding the first account	Daniel Gultsch	2015-05-15	2	-2/+6
\| \| \|
* \| \|	Force Nameprepping of JID domain parts	Andreas Straub	2015-05-14	2	-4/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The IDN.toAscii()/IDN.toUnicode() family only namepreps the original domain passed to it if it contained non-ASCII characters. This means that for all-ASCII domains, no canonicalization is performed, which leads to issues like case-sensitivity. This workaround explicitly namepreps domain parts before calling IDN.toAscii() on them, in order to get a canonicalized representation (most notably, case invariance). A basic DB migration is also included.
* \| \|	added a few location questions	Daniel Gultsch	2015-05-14	1	-3/+8
\| \| \|
* \| \|	always log reason for failed file transfer	Daniel Gultsch	2015-05-14	2	-2/+18
\| \| \|
* \| \|	ignore question marks in location question	Daniel Gultsch	2015-05-13	1	-10/+13
\| \| \|
* \| \|	show location quick action after receiving a question about the users location	Daniel Gultsch	2015-05-13	2	-1/+28
\| \| \|
* \| \|	clear avatar cache when uploading new avatar	Daniel Gultsch	2015-05-13	1	-0/+1
\| \| \|
* \| \|	use zero width white space as message seperator	Daniel Gultsch	2015-05-13	1	-1/+1
\| \| \|
* \| \|	version bump to 1.4.0-alpha3	Daniel Gultsch	2015-05-13	1	-2/+2
\| \| \|
* \| \|	removed debug logging	Daniel Gultsch	2015-05-12	1	-2/+0
\| \| \|
* \| \|	handle conference invites differently to deal with killed activities. fixes ↵	Daniel Gultsch	2015-05-12	4	-31/+67
\| \| \| \| \| \| \| \| \| \| \| \|	#1188
* \| \|	don't set unknown error in muc	Daniel Gultsch	2015-05-12	1	-2/+0
\| \| \|
* \| \|	don't reinit conversation when coming back to activity. avoids unnecessary ↵	Daniel Gultsch	2015-05-12	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \|	scrolling