conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	1	-1/+3
\|\
* \	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	1	-8/+8
\|\ \
\| * \|	use startdate as lower bound when querying archive with after=x	Daniel Gultsch	2016-04-09	1	-13/+3
\| * \|	use last received message id when querying archive	Daniel Gultsch	2016-04-09	1	-7/+17
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-10	1	-16/+23
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	1	-1/+0
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	turned muc errors into enum. added error codes for service shutdown	Daniel Gultsch	2016-02-22	1	-1/+0
* \| \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	1	-0/+4
\|\\| \|
\| * \|	show load more messages when auto loading is disabled and messages are still ...	Daniel Gultsch	2016-02-21	1	-0/+4
* \| \|	Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4	lookshe	2016-02-16	1	-29/+33
\|\\| \|
\| * \|	prevent previoulsly cleared messages from reloading. fixes #1110	Daniel Gultsch	2016-02-04	1	-8/+9
\| * \|	add more fault tolerant checks for messages left on server	Daniel Gultsch	2016-02-04	1	-6/+11
\| * \|	count all messages in a query	Daniel Gultsch	2016-02-03	1	-4/+1
\| * \|	Revert "get rid of broken totalMessageCount for mam queries"	Daniel Gultsch	2016-02-03	1	-2/+12
\| * \|	get rid of broken totalMessageCount for mam queries	Daniel Gultsch	2016-02-02	1	-12/+2
* \| \|	Fix flagging no more messages on server for conversation	steckbrief	2016-02-13	1	-16/+18
* \| \|	Imports organized	steckbrief	2016-02-12	1	-2/+0
* \| \|	Fixed NPE while loading messages via MAM	steckbrief	2016-02-12	1	-1/+1
* \| \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-25/+52
\|\\| \|
\| * \|	notfiy after mam catchup only if message count > 0	Daniel Gultsch	2015-12-11	1	-1/+1
\| * \|	get rid of lastMessageTransmitted in favor of db query	Daniel Gultsch	2015-12-11	1	-21/+8
\| * \|	notify on mam catchup messages	Daniel Gultsch	2015-12-10	1	-0/+3
\| * \|	properly clean up timed out mam queries	Daniel Gultsch	2015-12-10	1	-2/+17
\| * \|	Use MAM for MUC initial history retrieval	saqura	2015-10-06	1	-0/+12
\| * \|	fixed bug that prevented newly opened conversations to load the entire histor...	Daniel Gultsch	2015-08-30	1	-1/+9
\| * \|	introduce special iq type for internal timeouts. always use != result to chec...	Daniel Gultsch	2015-08-23	1	-1/+1
\| * \|	fixed muc mam. added a few security checks	Daniel Gultsch	2015-05-20	1	-2/+10
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-10	1	-2/+2
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-06	1	-1/+1
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	1	-4/+4
\|\\| \|
\| * \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-371/+0
\| \|/
* /	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-2/+10
\|/
*	fixed mam to work with muc	iNPUTmice	2015-01-24	1	-8/+13
*	Make IqPacket type an enum	Sam Whited	2015-01-04	1	-1/+1
*	code cleanup	Daniel Gultsch	2015-01-03	1	-2/+7
*	Add support for XEP-0191 (Blocking command)	Sam Whited	2014-12-22	1	-1/+1
*	inject ui callback into running mam query	iNPUTmice	2014-12-20	1	-1/+4
*	made scroling smoother + bug fixes for history loading	iNPUTmice	2014-12-17	1	-3/+7
*	properly count mam messages	iNPUTmice	2014-12-17	1	-2/+5
*	go through mam history page by page. load mam dynamically on scroll	iNPUTmice	2014-12-15	1	-13/+47
*	run mam queries only when online	iNPUTmice	2014-12-14	1	-4/+30
*	reverse through mam history when loading larger chuncks	iNPUTmice	2014-12-13	1	-11/+62
*	various mam improvments	iNPUTmice	2014-12-13	1	-31/+102
*	changed lastMessageReceived into lastMessageTransmitted to account for sent m...	iNPUTmice	2014-12-10	1	-2/+6
*	added max history age (default 1w). automatically sort newly added mam messages	iNPUTmice	2014-12-10	1	-10/+38
*	very basic mam support	iNPUTmice	2014-12-10	1	-0/+137