conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-369/+0
\| \| \| \| \| \|	"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
*	no trim of messages or password	lookshe	2015-04-11	1	-2/+1
\| \| \| \|	check password with only spaces separately
*	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	1	-2/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml
\| *	show geo uris as 'location' in overview	iNPUTmice	2015-03-10	1	-1/+7
\| \|
\| *	trim message bodys on display	Daniel Gultsch	2015-02-07	1	-1/+1
\| \|
* \|	Merge master-origin	steckbrief	2015-02-20	1	-8/+133
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
\| *	fixed text preview for images	iNPUTmice	2015-02-01	1	-1/+1
\| \|
\| *	fix mergable() for /me command.	Michael	2015-01-25	1	-2/+3
\| \|
\| *	proper desc for offering and sending images in conversations overview	iNPUTmice	2015-01-18	1	-0/+8
\| \|
\| *	use same helper methods for images and files	iNPUTmice	2015-01-18	1	-21/+8
\| \|
\| *	Merge pull request #901 from kriztan/patch-2	Daniel Gultsch	2015-01-18	1	-0/+4
\| \|\ \| \| \| \| \| \|	Added new file type names for file transfers
\| \| *	Added new file type names for file transfers	Christian S	2015-01-18	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- apk - vcard
\| * \|	Fix string substitutions with unknown filetypes	Sam Whited	2015-01-17	1	-2/+2
\| \|/
\| *	Correct the download file string on notifications	Sam Whited	2015-01-17	1	-10/+12
\| \| \| \| \| \| \| \|	Fixes #896
\| *	handle muc nicks with white spaces. fixed #884	iNPUTmice	2015-01-14	1	-2/+2
\| \|
\| *	catch bug in guessContentType	Daniel Gultsch	2015-01-12	1	-1/+6
\| \|
\| *	reworked message preview / message meta information (ie file offered, ↵	Daniel Gultsch	2015-01-12	1	-0/+110
\| \| \| \| \| \| \| \| \| \| \| \|	received * file) fixed #837
\| *	refactored UiHelper	Daniel Gultsch	2015-01-07	1	-2/+10
\| \|
\| *	cleanup: removed unused emoticon parsing	iNPUTmice	2014-12-09	1	-42/+0
\| \|
* \|	remaining part of my patch	lookshe	2015-01-03	1	-1/+101
\|/
*	cleaned up avatar / tile creation	iNPUTmice	2014-12-03	1	-0/+3
\|
*	remove unused imports.	Michael	2014-11-21	1	-20/+0
\|
*	put error notification into notification service	iNPUTmice	2014-11-18	1	-42/+0
\|
*	happy hanukkah	iNPUTmice	2014-11-16	1	-0/+7
\|
*	initial smp support	iNPUTmice	2014-11-11	1	-34/+0
\|
*	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	1	-1/+1
\| \| \| \|	Remove `Account.getFullJid()'
*	Update more files to use JID objects	Sam Whited	2014-11-09	1	-3/+3
\|
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+225