conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rename' into trz/rebase	steckbrief	2017-01-11	1	-5/+3
\|\
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	1	-94/+25
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-05-09	1	-84/+8
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	1	-45/+3
\|\\|
* \|	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	1	-12/+13
\|\ \
\| * \|	removed unnecessary call to stopSelf() after logging out	Daniel Gultsch	2016-04-14	1	-5/+11
\| * \|	removed unused call to cancel events	Daniel Gultsch	2016-04-14	1	-1/+0
\| * \|	hacky workaround to determine if uri points to private file on < lolipop	Daniel Gultsch	2016-04-13	1	-2/+2
\| * \|	minor code cleanup	Daniel Gultsch	2016-04-12	1	-3/+1
\| * \|	republish avatar if server offers non-persistent pep :-(	Daniel Gultsch	2016-04-11	1	-25/+79
\| * \|	check file owner when attaching files or using them as avatar	Daniel Gultsch	2016-04-07	1	-0/+10
\| * \|	better detect broken pep	Daniel Gultsch	2016-04-05	1	-0/+1
\| * \|	removed unnecessary wait for disconnect	Daniel Gultsch	2016-04-04	1	-6/+0
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-06	1	-64/+32
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	Merge tag '1.11.3' into trz/rebase	lookshe	2016-04-05	1	-9/+11
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	check max http file size when attaching files	Daniel Gultsch	2016-04-01	1	-4/+7
\| * \|	add methods to check max file size for http upload	Daniel Gultsch	2016-03-31	1	-2/+1
\| * \|	save otr fingerprint in message	Daniel Gultsch	2016-03-31	1	-2/+2
\| * \|	Update ShortcutBadger to version 1.1.4	Christian S	2016-03-27	1	-2/+2
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-30	1	-0/+1
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	1	-1/+2
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Typo `attempt`	licaon-kter	2016-03-22	1	-1/+1
\| * \|	be more careful to avoid creating multiple connections	Daniel Gultsch	2016-03-20	1	-0/+1
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-22	1	-1/+5
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	fixed merge errors	lookshe	2016-03-20	1	-1/+1
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-12	1	-3/+2
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	1	-25/+15
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-10	1	-19/+21
\|\\| \|
* \| \|	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	1	-19/+63
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	moved avatarfetcher reset code to bind	Daniel Gultsch	2016-03-03	1	-8/+8
\| * \|	avoid unnecessary disconnect. prevent NetworkOnMainThreadException	Daniel Gultsch	2016-03-03	1	-3/+3
\| * \|	expert option to treat vibrate as silent mode for XA. fixes #1530	Daniel Gultsch	2016-03-01	1	-1/+9
\| * \|	use correct jid when leaving a conference. fixes #1732	Daniel Gultsch	2016-02-29	1	-5/+5
\| * \|	refactored omemo to take multiple recipients	Daniel Gultsch	2016-02-29	1	-2/+38
* \| \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	1	-4/+0
* \| \|	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	1	-15/+23
\|\\| \|
\| * \|	disallow message correction by default. fixes #1720	Daniel Gultsch	2016-02-26	1	-1/+1
\| * \|	execute pending mam queries every time we come online	Daniel Gultsch	2016-02-26	1	-1/+1
\| * \|	made hard coded choice for encryptions more flexible and disable parsing	Daniel Gultsch	2016-02-24	1	-12/+17
\| * \|	set noMessagesLeftOnServer before conference configuration fetch	Daniel Gultsch	2016-02-23	1	-1/+2
\| * \|	turned muc errors into enum. added error codes for service shutdown	Daniel Gultsch	2016-02-22	1	-1/+3
* \| \|	Unused imports / methods removed	steckbrief	2016-02-24	1	-3/+0
* \| \|	Packet sending helper moved to XmppSendUtil and methods in XmppConnectionServ...	steckbrief	2016-02-23	1	-18/+9
* \| \|	Removed useless 'button-message' to load more messages. Implementation alread...	steckbrief	2016-02-23	1	-3/+1
* \| \|	Removed unnecessary dependencies to XmppConnectionService and added allowMess...	steckbrief	2016-02-23	1	-16/+4
* \| \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	1	-26/+90
\|\\| \|
\| * \|	change uuid when replacing messages	Daniel Gultsch	2016-02-20	1	-0/+5
\| * \|	don't log start reason	Daniel Gultsch	2016-02-17	1	-1/+0
\| * \|	fixed regression that caused messages in muc not being send	Daniel Gultsch	2016-02-17	1	-6/+7
\| * \|	fixed regression that caused ui to redraw a lot	Daniel Gultsch	2016-02-16	1	-4/+8