conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \|	Merge pull request #933 from betheg/mergeable	Daniel Gultsch	2015-01-25	3	-5/+9
\|\ \ \| \| \| \| \| \|	fix mergable() for /me command.
\| * \|	fix mergable() for /me command.	Michael	2015-01-25	3	-5/+9
\| \|/
* \|	updated translations	iNPUTmice	2015-01-25	4	-432/+476
\| \|
* \|	set jingle file transfer to offer after iq offer has returned	iNPUTmice	2015-01-25	1	-6/+17
\| \|
* \|	Merge pull request #932 from svetlemodry/development	Daniel Gultsch	2015-01-25	1	-0/+1
\|\ \ \| \| \| \| \| \|	Czech translation
\| * \|	Czech translation	Jaroslav Lichtblau	2015-01-25	1	-0/+1
\|/ / \| \| \| \| \| \|	for "hide offline" added
* \|	Merge pull request #931 from betheg/gradle_plugin	Daniel Gultsch	2015-01-25	1	-1/+1
\|\ \ \| \|/ \|/\|	update android gradle plugin to 1.0.1
\| *	update android gradle plugin to 1.0.1	Michael	2015-01-25	1	-1/+1
\|/
*	Merge pull request #927 from betheg/otr_query_message	Daniel Gultsch	2015-01-25	1	-1/+1
\|\ \| \| \| \|	MessageParser: fix the regex for otr query messages.
\| *	MessageParser: fix the regex for otr query messages.	Michael	2015-01-24	1	-1/+1
\|/
*	Merge pull request #924 from andersruneson/changeonlinecolor	Daniel Gultsch	2015-01-24	2	-1/+5
\|\ \| \| \| \|	Changed online color to green instead of primary
\| *	Changed online color to green instead of primary	Anders Sandblad	2015-01-23	2	-1/+5
\| \|
* \|	fixed mam to work with muc	iNPUTmice	2015-01-24	4	-11/+21
\| \|
* \|	mentioned hide offline feature in the changelog	iNPUTmice	2015-01-22	1	-0/+1
\|/
*	show checkbox to hide offline contacts	iNPUTmice	2015-01-21	3	-6/+28
\|
*	fixed bug in find conference in database method	iNPUTmice	2015-01-21	1	-3/+6
\|
*	deal with user entering full jids in join conference dialog	iNPUTmice	2015-01-21	2	-3/+4
\|
*	always allow access to contact details. provide add button in contact details	iNPUTmice	2015-01-21	6	-84/+89
\|
*	Add block/unblock to contact details menu	Sam Whited	2015-01-21	4	-9/+28
\| \| \| \|	See #889
*	Merge pull request #908 from betheg/otr4j	Daniel Gultsch	2015-01-21	4	-3/+9
\|\ \| \| \| \|	otr4j: update to 0.22
\| *	otr4j: update to 0.22	Michael	2015-01-20	4	-3/+9
\| \|
* \|	Merge pull request #912 from SamWhited/update-foreground-notification	Daniel Gultsch	2015-01-21	1	-7/+14
\|\ \ \| \| \| \| \| \|	Add color / category to foreground notification
\| * \|	Add color / category to foreground notification	Sam Whited	2015-01-20	1	-7/+14
\|/ /
* \|	changed message duplicate finder	iNPUTmice	2015-01-20	1	-5/+10
\| \|
* \|	fixed missing image preview	iNPUTmice	2015-01-20	1	-1/+1
\| \|
* \|	fixed up button on v21 devices	iNPUTmice	2015-01-20	1	-2/+6
\|/
*	Fixed action bar search for Android 5.0	iNPUTmice	2015-01-20	1	-4/+4
\|
*	Merge pull request #905 from svetlemodry/development	Daniel Gultsch	2015-01-20	1	-406/+420
\|\ \| \| \| \|	Czech translation updated
\| *	Czech translation updated	Jaroslav Lichtblau	2015-01-19	1	-406/+420
\|/ \| \| \|	for Conversations
*	Merge pull request #904 from SamWhited/remove-ssl	Daniel Gultsch	2015-01-19	12	-30/+12
\|\ \| \| \| \|	Remove legacy SSL support
\| *	Remove legacy SSL support	Sam Whited	2015-01-19	12	-30/+12
\|/
*	don't trim bodies	iNPUTmice	2015-01-19	1	-1/+1
\|
*	fetched translations from transifex	iNPUTmice	2015-01-19	14	-4159/+4412
\|
*	fixed legacy translation of image received	iNPUTmice	2015-01-19	1	-1/+3
\|
*	added changelog for 1.0	iNPUTmice	2015-01-19	3	-3/+10
\|
*	check for deleted files when loading more messages from history	iNPUTmice	2015-01-19	1	-1/+3
\|
*	account for rounding errors when rescheduling wake up	iNPUTmice	2015-01-19	1	-150/+153
\|
*	fixed bug when sharing files from google drive	iNPUTmice	2015-01-18	1	-7/+11
\|
*	proper desc for offering and sending images in conversations overview	iNPUTmice	2015-01-18	2	-0/+10
\|
*	explain read marker	iNPUTmice	2015-01-18	2	-20/+19
\|
*	use same helper methods for images and files	iNPUTmice	2015-01-18	3	-61/+19
\|
*	Merge pull request #899 from SamWhited/api21_notifications	Daniel Gultsch	2015-01-18	1	-0/+4
\|\ \| \| \| \|	Add some Android 21 notification features
\| *	Add some Android 21 notification features	Sam Whited	2015-01-17	1	-0/+4
\| \|
* \|	Merge pull request #901 from kriztan/patch-2	Daniel Gultsch	2015-01-18	2	-0/+6
\|\ \ \| \| \| \| \| \|	Added new file type names for file transfers
\| * \|	Added new file type names for file transfers	Christian S	2015-01-18	2	-0/+6
\| \|/ \| \| \| \| \| \| \| \|	- apk - vcard
* \|	Merge pull request #898 from SamWhited/unknown_filetype_string_fix	Daniel Gultsch	2015-01-18	2	-2/+3
\|\ \ \| \|/ \|/\|	Fix string substitutions with unknown filetypes
\| *	Fix string substitutions with unknown filetypes	Sam Whited	2015-01-17	2	-2/+3
\|/
*	Merge pull request #897 from SamWhited/download_file_fixes	Daniel Gultsch	2015-01-17	8	-24/+18
\|\ \| \| \| \|	Correct the download file string on notifications
\| *	Correct the download file string on notifications	Sam Whited	2015-01-17	8	-24/+18
\|/ \| \| \|	Fixes #896
*	Merge branch 'SamWhited-download-button-notification' into development	iNPUTmice	2015-01-16	8	-29/+71
\|\