conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
...
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-06-06	1	-3/+7
\|\ \
\| * \	Merge pull request #178 from kruks23/development	Daniel Gultsch	2014-06-05	1	-3/+7
\| \|\ \
\| \| * \|	Update Spanish Translations	kruks23	2014-06-05	1	-3/+7
* \| \| \|	basic last seen feature. no peristancy just yet. no polish	iNPUTmice	2014-06-06	9	-380/+556
\|/ / /
* / /	read marker is now a little less in your face	iNPUTmice	2014-06-05	2	-30/+4
\|/ /
* \|	image provider path name now with .webp ending	iNPUTmice	2014-06-04	2	-3/+6
* \|	experimental gui to display read status	iNPUTmice	2014-06-04	3	-11/+122
* \|	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	10	-67/+116
* \|	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
* \|	Merge branch 'feature/xep-0333' into development	iNPUTmice	2014-06-03	5	-16/+76
\|\ \
\| * \|	answer to xep 184 message receipts. fixes #95	iNPUTmice	2014-06-03	5	-16/+76
* \| \|	Merge pull request #176 from imaginator/patch-1	Daniel Gultsch	2014-06-03	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	small type	Simon Tennant	2014-06-03	1	-1/+1
\|/ /
* \|	version bump to 0.30.3	iNPUTmice	2014-06-03	2	-2/+4
* \|	added pgp sig on muc rename	iNPUTmice	2014-06-03	1	-3/+9
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-06-02	8	-8/+8
\|\ \
\| * \	Merge pull request #169 from alethea/self-typo	Daniel Gultsch	2014-06-02	8	-8/+8
\| \|\ \
\| \| * \|	Fixed typo in source "sefl" -> "self"	Alethea Rose Butler	2014-06-01	8	-8/+8
\| \|/ /
* / /	long press on images revails share with intent	iNPUTmice	2014-06-02	1	-0/+13
\|/ /
* \|	version bump0.3-beta	iNPUTmice	2014-06-01	1	-2/+2
* \|	updated changelog and readme for the 0.3 release	iNPUTmice	2014-06-01	2	-0/+20
* \|	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	3	-23/+18
* \|	added warning when public keys are missing	iNPUTmice	2014-06-01	2	-0/+7
* \|	Merge pull request #168 from strb/mucicons	Daniel Gultsch	2014-06-01	1	-1/+1
\|\ \
\| * \|	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	4	-6/+44
* \|	OpenPGP key display in muc details is now prettier and linked to openkeychain	iNPUTmice	2014-06-01	3	-9/+46
* \|	Merge pull request #167 from alethea/up-navigation	Daniel Gultsch	2014-06-01	3	-8/+24
\|\ \
\| * \|	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
\| * \|	Made ConversationActivity singleTask	Alethea Butler	2014-05-31	1	-1/+2
\|/ /
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-05-31	14	-69/+113
\|\ \
\| * \	Merge pull request #164 from alethea/development	Daniel Gultsch	2014-05-31	3	-0/+11
\| \|\ \
\| \| * \|	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
\| * \| \|	Merge pull request #165 from alethea/openpgp-capitalization	Daniel Gultsch	2014-05-31	7	-39/+39
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Capitalized openPGP -> OpenPGP	Alethea Butler	2014-05-31	7	-39/+39
\| \|/ /
\| * \|	Merge pull request #153 from 9034725985/patch-1	Daniel Gultsch	2014-05-30	1	-1/+1
\| \|\ \
\| \| * \|	Update README.md	Kushal	2014-05-26	1	-1/+1
\| * \| \|	Merge pull request #160 from alethea/development	Daniel Gultsch	2014-05-30	1	-2/+2
\| \|\ \ \
\| \| * \| \|	Changed "unsuccessful delivery" to "delivery failed"	Alethea Butler	2014-05-30	1	-1/+1
\| \| * \| \|	Added question mark to remove_contact_text	Alethea Butler	2014-05-30	1	-1/+1
\| * \| \| \|	Merge pull request #157 from kruks23/development	Daniel Gultsch	2014-05-30	6	-27/+60
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	More harcoded translations + updated Spanish	kruks23	2014-05-29	6	-27/+60
\| \|/ / /
* / / /	fixed regression that led to the wakelock not being released again	iNPUTmice	2014-05-31	1	-1/+1
\|/ / /