conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	experimental gui to display read status	iNPUTmice	2014-06-04	2	-11/+73
*	fixed regression with newly created conversations not being shown properly	iNPUTmice	2014-06-04	1	-1/+2
*	received and displayed messages (xep 333) are now marked properly	iNPUTmice	2014-06-04	7	-46/+109
*	more bug fixes for the pgp problem	iNPUTmice	2014-06-04	1	-49/+73
*	fixed pgp on incoming carbon messages	iNPUTmice	2014-06-04	2	-19/+17
*	answer to xep 184 message receipts. fixes #95	iNPUTmice	2014-06-03	2	-14/+52
*	added pgp sig on muc rename	iNPUTmice	2014-06-03	1	-3/+9
*	long press on images revails share with intent	iNPUTmice	2014-06-02	1	-0/+13
*	linked openkeychain install dialog from decrypt messages box	iNPUTmice	2014-06-01	1	-49/+62
*	changed roster to concurrent hashmap	iNPUTmice	2014-06-01	1	-2/+2
*	unified crypto messages and made lock icon work for conferences	iNPUTmice	2014-06-01	2	-21/+17
*	added warning when public keys are missing	iNPUTmice	2014-06-01	1	-0/+6
*	Fix tile rendering for larger conferences	Andreas Straub	2014-06-01	1	-1/+1
*	show dialog when no contact in a muc has pgp support	iNPUTmice	2014-06-01	3	-6/+42
*	OpenPGP key display in muc details is now prettier and linked to openkeychain	iNPUTmice	2014-06-01	2	-9/+37
*	Removed TASK_ON_HOME flag from intent created from share	Alethea Butler	2014-05-31	1	-1/+3
*	Made the navigateUp override behave like a navigate up	Alethea Butler	2014-05-31	1	-1/+9
*	Refactored into onNavigateUp	Alethea Butler	2014-05-31	1	-6/+11
*	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-05-31	4	-13/+24
\|\
\| *	Up button goes to contacts after initial setup	Alethea Butler	2014-05-30	1	-0/+6
\| *	Disabled the Home button when it's not the Up button	Alethea Butler	2014-05-30	3	-0/+5
\| *	More harcoded translations + updated Spanish	kruks23	2014-05-29	2	-13/+13
* \|	fixed regression that led to the wakelock not being released again	iNPUTmice	2014-05-31	1	-1/+1
\|/
*	display pgp key id in muc details and use keys to encrypt groupchat	Daniel Gultsch	2014-05-28	3	-4/+29
*	encrypted group messages are now properly decrypted	Daniel Gultsch	2014-05-28	2	-7/+11
*	first tries on crypto muc	Daniel Gultsch	2014-05-28	6	-41/+80
*	possible fix for #149 and #142	iNPUTmice	2014-05-28	1	-1/+1
*	error msg on offline subscription changes	Daniel Gultsch	2014-05-24	1	-12/+29
*	Merge pull request #146 from kruks23/development	Daniel Gultsch	2014-05-24	2	-7/+7
\|\
\| *	More harcoded translations + Spanish	kruks23	2014-05-24	2	-7/+7
* \|	Merge pull request #140 from strb/mucicons	Daniel Gultsch	2014-05-24	1	-108/+41
\|\ \ \| \|/ \|/\|
\| *	Refactored unknown contact picture generation	Andreas Straub	2014-05-21	1	-108/+41
* \|	Title activities translations + contacts translations + update Spanish Transl...	kruks23	2014-05-23	2	-11/+11
* \|	end otr sessions earlier / more often. can lead to unesessary handshakes but ...	Daniel Gultsch	2014-05-23	3	-17/+32
* \|	fixed possible npe	Daniel Gultsch	2014-05-23	1	-0/+6
* \|	code cleanup	Daniel Gultsch	2014-05-23	2	-10/+0
* \|	Contact details translations + update spanish translations	kruks23	2014-05-22	1	-18/+18
* \|	offline crud of contacts	Daniel Gultsch	2014-05-22	5	-17/+48
* \|	implementet missing methods on the new roster mgmt	Daniel Gultsch	2014-05-22	2	-3/+17
* \|	fixed #136	Daniel Gultsch	2014-05-22	2	-24/+36
* \|	write contacts on system shutdown	Daniel Gultsch	2014-05-21	4	-132/+197
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	Daniel Gultsch	2014-05-21	1	-2/+17
\|\\|
\| *	Fix highlight detection in MUC channels	Andreas Straub	2014-05-21	1	-2/+17
* \|	further improvment trying to deal with large images	Daniel Gultsch	2014-05-21	1	-1/+6
\|/
*	cleaned up shared text	Daniel Gultsch	2014-05-21	6	-26/+41
*	auto retry image compression with decreasing sample size	Daniel Gultsch	2014-05-21	1	-17/+15
*	close input stream	Daniel Gultsch	2014-05-20	1	-0/+1
*	trying to deal with larger images	Daniel Gultsch	2014-05-20	1	-4/+17
*	Update Spanish Translations + harcoded just_now	kruks23	2014-05-20	3	-8/+8
*	highlight people in conferences by clicken on their picture	Daniel Gultsch	2014-05-20	1	-14/+27