conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
...
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-08	1	-1/+18
\|\ \
\| * \|	Fixes FS#107, Implements FS#77	steckbrief	2016-01-08	1	-1/+18
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	1	-4/+6
\|\\| \|
\| * \|	Implements FS#83: Reload from last received message	steckbrief	2015-12-04	1	-4/+6
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	19	-95/+95
\|\\| \|
\| * \|	Fixes FS#75 - Change color names to reasonable names	steckbrief	2015-12-04	19	-95/+95
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	2	-0/+26
\|\\| \|
\| * \|	Implements FS#67: Introduce central logging class to use log prefix, new acti...	steckbrief	2015-11-20	2	-0/+26
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-03	1	-0/+20
\|\\| \|
\| * \|	Implements FS#26: Introduction of dialog to choose whether to resize a pictur...	steckbrief	2015-11-03	1	-0/+20
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-16	1	-1/+2
\|\\| \|
\| * \|	Fixes FS#82: Background color of conversation list item set to primary backgr...	steckbrief	2015-10-16	1	-1/+2
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2015-10-05	5	-6/+188
\|\\| \|
\| * \|	Publishing additional information in message details dialog such as message t...	steckbrief	2015-10-04	1	-10/+51
\| * \|	Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op...	steckbrief	2015-10-04	2	-0/+140
\| * \|	Fixes FS#49: Highlight the selected conversation in list	steckbrief	2015-09-02	1	-4/+5
\| * \|	Fixes FS#50: Replace phone numbers and email addresses in messages with links	steckbrief	2015-09-02	2	-2/+2
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-16	1	-0/+8
\| \|\ \ \| \|/ / \|/\| \|
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	24	-201/+227
\| \|\ \
\| * \| \|	Status color added to "create conversation" (refers to ticket #22 in flyspray)	steckbrief	2015-06-19	1	-2/+9
\| * \| \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	2	-3/+3
* \| \| \|	- Introduction of SwipeRefreshLayout for conversation view	steckbrief	2015-08-12	1	-0/+8
\| \|/ / \|/\| \|
* \| \|	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	24	-201/+227
* \| \|	Status color added to "create conversation" (refers to ticket #22 in flyspray)	steckbrief	2015-06-19	1	-2/+9
\|/ /
* \|	moved color picker to libs	lookshe	2015-04-15	2	-145/+0
* \|	changed last message in overview also to EmojiconTextView for displaying smil...	lookshe	2015-04-12	1	-3/+6
* \|	whatsapp-like smiley implementation	lookshe	2015-04-12	3	-7/+22
* \|	Color choose dialog	steckbrief	2015-04-11	2	-0/+145
* \|	Merge master-origin	steckbrief	2015-02-20	10	-136/+209
\|\\|
\| *	Use Material Design Icons on API 21+	Sam Whited	2015-01-29	3	-4/+4
\| *	always allow access to contact details. provide add button in contact details	iNPUTmice	2015-01-21	1	-0/+7
\| *	Fixed action bar search for Android 5.0	iNPUTmice	2015-01-20	1	-4/+4
\| *	explain read marker	iNPUTmice	2015-01-18	1	-0/+13
\| *	Fix bottom padding on about page	Sam Whited	2015-01-13	1	-1/+1
\| *	make use of different dimensions for different screen sizes	Daniel Gultsch	2015-01-13	6	-15/+39
\| *	Use margin instead of padding in about screen	Sam Whited	2015-01-12	1	-4/+4
\| *	shortened some string	Daniel Gultsch	2015-01-11	1	-0/+1
\| *	fixed #860	Daniel Gultsch	2015-01-10	1	-0/+1
\| *	allow for very basic muc configuration	Daniel Gultsch	2015-01-08	1	-115/+142
* \|	- Avoiding accessing shared preferences to know if emoticons should be parsed...	steckbrief	2015-01-20	1	-1/+11
\|/
*	added missing layout file	Daniel Gultsch	2015-01-03	1	-0/+105
*	migrated change password into separate activity	Daniel Gultsch	2015-01-03	1	-9/+0
*	fixed layout file	Daniel Gultsch	2015-01-02	1	-1/+1
*	improved OTR verification part one	Daniel Gultsch	2015-01-02	1	-188/+146
*	code cleanup for change password stuff	Daniel Gultsch	2014-12-25	1	-1/+1
*	Add ability to change password on server	Sam Whited	2014-12-25	1	-2/+9
*	Add more server compatibility info.	Sam Whited	2014-12-23	1	-4/+102
*	Accessibility: Add missing image descriptions	Sam Whited	2014-11-29	2	-3/+6
*	show dynamic tags in contacts activity as well	iNPUTmice	2014-11-18	1	-12/+7
*	happy hanukkah	iNPUTmice	2014-11-16	2	-1/+20