conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4	lookshe	2016-05-26	1	-42/+27
\|\
\| *	improved ordering of muc participants	Daniel Gultsch	2016-05-17	1	-6/+1
\| *	change affiliation for in memory users that are currently not joined in a con...	Daniel Gultsch	2016-05-16	1	-3/+9
\| *	keep conference members in memory and show them in conference details	Daniel Gultsch	2016-05-16	1	-19/+18
\| *	removed unused config variables	Daniel Gultsch	2016-04-27	1	-5/+1
\| *	expert setting to manually change presence	Daniel Gultsch	2016-04-22	1	-11/+0
* \|	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	1	-0/+17
\|\\|
\| *	added share uri button to conference details	Daniel Gultsch	2016-04-12	1	-0/+17
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-06	1	-3/+5
\|\ \
* \ \	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	changed single_account config into more simple lock_settings	Daniel Gultsch	2016-02-27	1	-1/+1
* \| \|	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	1	-1/+5
\|\\| \|
\| * \|	optionally lock conference domains as well and hide known domains in ui	Daniel Gultsch	2016-02-24	1	-2/+5
* \| \|	Imports organized	steckbrief	2016-02-12	1	-1/+0
* \| \|	Compilation errors and merge mixups fixed	steckbrief	2016-02-11	1	-2/+2
* \| \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-26/+148
\|\\| \|
\| * \|	opt out handling of the autojoin flag. fixes #1666	Daniel Gultsch	2016-02-01	1	-1/+1
\| * \|	show per conference notification settings in details activity	Daniel Gultsch	2016-01-08	1	-0/+63
\| * \|	set bookmark name to room subject if no subject has been set before	Daniel Gultsch	2015-12-11	1	-0/+1
\| * \|	parse vcard avatars from muc presences	Daniel Gultsch	2015-12-03	1	-6/+2
\| * \|	hide subject edit button if not editable by user	Daniel Gultsch	2015-11-26	1	-0/+2
\| * \|	pgp fixes and revert configuration changes	Daniel Gultsch	2015-11-25	1	-10/+0
\| * \|	Reset the margins manually after rotating	saqura	2015-10-26	1	-0/+10
\| * \|	Show whether MAM is supported in MUCs	saqura	2015-10-06	1	-1/+12
\| * \|	added possibiltiy to set conferences as moderated (only visible in advanced m...	Daniel Gultsch	2015-09-13	1	-6/+31
\| * \|	added Config.java varibale to lock account creation to specfic domain	Daniel Gultsch	2015-08-03	1	-2/+8
\| * \|	allow for private messages being started from muc details in anonymous mucs	Daniel Gultsch	2015-07-21	1	-7/+15
\| * \|	Merge branch 'CryptoNextBeta' into development	Andreas Straub	2015-07-20	1	-2/+1
\| \|\ \
\| \| * \|	Optimize imports	Andreas Straub	2015-07-20	1	-2/+1
\| * \| \|	don't show 'show contact details' context menu item when contact isn not in r...	Daniel Gultsch	2015-07-20	1	-3/+8
\| * \| \|	show contact details in conference details ...	Christian S	2015-07-19	1	-0/+5
\| \|/ /
\| * \|	handle conference invites differently to deal with killed activities. fixes #...	Daniel Gultsch	2015-05-12	1	-0/+4
\| * \|	stop conference details from crashing when rotating the screen	Daniel Gultsch	2015-04-28	1	-0/+3
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-13	1	-4/+4
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-563/+0
\| \|/
* /	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-0/+7
\|/
*	limit ui refresh rate	iNPUTmice	2015-02-17	1	-13/+6
*	sort users in muc	Daniel Gultsch	2015-02-07	1	-3/+12
*	make room persistant when changing subject or other muc options	Daniel Gultsch	2015-01-10	1	-16/+10
*	ensure that everyone is member before making a room private	Daniel Gultsch	2015-01-09	1	-1/+8
*	allow for very basic muc configuration	Daniel Gultsch	2015-01-08	1	-7/+73
*	code cleanup	Daniel Gultsch	2015-01-08	1	-2/+0
*	kick after ban	Daniel Gultsch	2015-01-08	1	-1/+14
*	some clean ups for affiliation change context menu	Daniel Gultsch	2015-01-08	1	-2/+8
*	more muc options	Daniel Gultsch	2015-01-07	1	-1/+26
*	basic affiliation changes in muc	Daniel Gultsch	2015-01-07	1	-13/+63
*	Show affiliation instead of role in MucDetails and offer 'advanced mode' to d...	Daniel Gultsch	2015-01-05	1	-45/+48
*	Add support for XEP-0191 (Blocking command)	Sam Whited	2014-12-22	1	-12/+12
*	set nick and autojoin=true for new bookmarks	iNPUTmice	2014-12-03	1	-0/+4
*	Misc. "fixes" to correct warnings.	Sam Whited	2014-11-29	1	-3/+6