PiratX - The new way for communications

	Commit message (Expand)	Author	Age	Files	Lines
*	catch conversations sort exception. not vital at this point	Daniel Gultsch	2016-06-10	1	-1/+14
*	Merge remote-tracking branch 'refs/remotes/siacs/master'	Christian Schneppe	2016-06-06	1	-19/+36
\|\
\| *	opt-in to send last userinteraction in presence	Daniel Gultsch	2016-06-04	1	-19/+36
* \|	Merge remote-tracking branch 'refs/remotes/siacs/master'	Christian Schneppe	2016-06-04	3	-6/+9
\|\\|
\| *	trim nick from bookmark before checking if it's empty	Daniel Gultsch	2016-06-03	1	-2/+2
\| *	don't use a bookmarks name if it's empty	Daniel Gultsch	2016-06-03	2	-4/+7
* \|	Merge remote-tracking branch 'refs/remotes/siacs/master'	Christian Schneppe	2016-06-02	1	-3/+2
\|\\|
\| *	make grace period configurable	Daniel Gultsch	2016-06-02	1	-3/+2
* \|	Merge remote-tracking branch 'refs/remotes/siacs/master'	Christian Schneppe	2016-06-01	1	-1/+3
\|\\|
\| *	don't show empty templates	Daniel Gultsch	2016-06-01	1	-1/+3
* \|	optimize imports	Christian Schneppe	2016-05-31	8	-14/+6
* \|	Merge remote-tracking branch 'refs/remotes/siacs/master'	Christian Schneppe	2016-05-31	1	-1/+1
\|\\|
\| *	use whitespace as message seperator	Daniel Gultsch	2016-05-30	1	-1/+1
* \|	Merge remote-tracking branch 'refs/remotes/siacs/master'	Christian Schneppe	2016-05-30	1	-1/+1
\|\\|
\| *	Revert "always notify by default in conferences"	Daniel Gultsch	2016-05-29	1	-1/+1
* \|	Merge remote-tracking branch 'refs/remotes/siacs/master'	Christian Schneppe	2016-05-29	1	-0/+1
\|\\|
\| *	don't merge messages over the char limit	Daniel Gultsch	2016-05-29	1	-0/+1
* \|	Merge remote-tracking branch 'refs/remotes/siacs/master'	Christian Schneppe	2016-05-28	1	-1/+1
\|\\|
\| *	use EOT as message seperator	Daniel Gultsch	2016-05-28	1	-1/+1
* \|	Merge remote-tracking branch 'refs/remotes/siacs/master'	Christian Schneppe	2016-05-27	3	-4/+17
\|\\|
\| *	don't push default muc conf twice	Daniel Gultsch	2016-05-27	1	-0/+10
\| *	add 'create conference' dialog	Daniel Gultsch	2016-05-26	1	-3/+2
\| *	make newly created conferences private by default	Daniel Gultsch	2016-05-26	1	-0/+1
\| *	show regitration failed try again later in UI	Daniel Gultsch	2016-05-24	1	-1/+4
* \|	don't make OMEMO default	Christian Schneppe	2016-05-22	1	-1/+2
* \|	Merge remote-tracking branch 'refs/remotes/siacs/master'	Christian Schneppe	2016-05-22	1	-0/+15
\|\\|
\| *	show first unread message on top after reinit	Daniel Gultsch	2016-05-22	1	-0/+15
* \|	Merge remote-tracking branch 'refs/remotes/siacs/master'	Christian Schneppe	2016-05-20	4	-80/+269
\|\\|
\| *	sync around individual calls instead of synchronizing entire object	Daniel Gultsch	2016-05-19	1	-49/+79
\| *	remove unwanted 'use previous encryption' lookup	Daniel Gultsch	2016-05-19	1	-22/+1
\| *	also save form elements in disco storage	Daniel Gultsch	2016-05-19	1	-2/+56
\| *	don't NPE on rare race condition while fetching MAM	Daniel Gultsch	2016-05-19	1	-0/+9
\| *	improved ordering of muc participants	Daniel Gultsch	2016-05-17	1	-2/+23
\| *	refactored muc item parsing to also parse muc status messages	Daniel Gultsch	2016-05-17	1	-8/+4
\| *	offer offline members to be invited again	Daniel Gultsch	2016-05-17	1	-2/+16
\| *	change affiliation for in memory users that are currently not joined in a con...	Daniel Gultsch	2016-05-16	1	-3/+5
\| *	keep conference members in memory and show them in conference details	Daniel Gultsch	2016-05-16	1	-45/+129
* \|	Merge remote-tracking branch 'refs/remotes/siacs/master'	Christian Schneppe	2016-05-16	2	-2/+3
\|\\|
\| *	use the same typo in both saving disco and reading disco	Daniel Gultsch	2016-05-15	1	-1/+2
\| *	escape HTML in OTR messages if other client is Pidgin	Daniel Gultsch	2016-05-15	1	-1/+1
\| *	don't show duplicate status message in contact details	Daniel Gultsch	2016-05-13	1	-3/+3
\| *	only default to omemo when all our devices support it	Daniel Gultsch	2016-05-13	1	-0/+1
\| *	show presence of other resources as template	Daniel Gultsch	2016-05-13	3	-0/+35
\| *	make omemo default when all resources support it	Daniel Gultsch	2016-05-12	3	-14/+36
\| *	always show download button when link is encrypted	Daniel Gultsch	2016-05-10	1	-5/+1
\| *	report host-account as account state in UI	Daniel Gultsch	2016-05-10	1	-1/+4
* \|	don't show duplicate status message in contact details	Daniel Gultsch	2016-05-13	1	-3/+3
* \|	only default to omemo when all our devices support it	Daniel Gultsch	2016-05-13	1	-0/+1
* \|	show presence of other resources as template	Daniel Gultsch	2016-05-13	3	-0/+35
* \|	make omemo default when all resources support it	Daniel Gultsch	2016-05-13	3	-14/+36