conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-604/+0
\| \| \| \| \| \|	"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
*	whatsapp-like smiley implementation	lookshe	2015-04-12	1	-3/+4
\|
*	Changes for emoticon parser reactivated	steckbrief	2015-03-31	1	-5/+5
\|
*	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	1	-4/+32
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	display geo uris as location. show 'send loction' in share menu if request ↵	iNPUTmice	2015-03-07	1	-1/+31
\| \| \| \| \| \| \| \|	location intent can be resolved
\| *	added typing notifications through XEP-0085. fixed #210	iNPUTmice	2015-02-21	1	-3/+1
\| \|
* \|	Merge master-origin	steckbrief	2015-02-20	1	-180/+154
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	fix mergable() for /me command.	Michael	2015-01-25	1	-1/+2
\| \|
\| *	explain read marker	iNPUTmice	2015-01-18	1	-20/+6
\| \|
\| *	use same helper methods for images and files	iNPUTmice	2015-01-18	1	-33/+8
\| \|
\| *	reworked message preview / message meta information (ie file offered, ↵	Daniel Gultsch	2015-01-12	1	-38/+14
\| \| \| \| \| \| \| \| \| \| \| \|	received * file) fixed #837
\| *	Add XEP-0245 (/me command) support	Sam Whited	2015-01-11	1	-131/+157
\| \|
\| *	added debug info + possible platform bug work arounds to message adapter	Daniel Gultsch	2015-01-05	1	-0/+10
\| \|
\| *	added higher auto accept file sizes	Daniel Gultsch	2015-01-04	1	-2/+2
\| \| \| \| \| \| \| \|	also changed labeling to MiB and KiB
* \|	- Avoiding accessing shared preferences to know if emoticons should be ↵	steckbrief	2015-01-20	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	parsed for every single message - Adding support to show online status in Conversations overview (configurable via the setting "send_button_status")
* \|	Setting added for parsing emoticons or not	Tristan Zur	2015-01-11	1	-1/+4
\| \|
* \|	Fixed missing symbol for eu.siacs.conversations.Config and wrong parameter ↵	Tristan Zur	2015-01-10	1	-1/+2
\| \| \| \| \| \| \| \|	for method eu.siacs.conversations.utils.UIHelper.transformAscii..
* \|	Merge branch 'master' of ssh://git.fucktheforce.de/conversations	lookshe	2015-01-03	1	-31/+30
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/Config.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
\| *	avoid npe on weird platform bugs	iNPUTmice	2014-12-15	1	-30/+30
\| \|
\| *	cleanup: removed unused emoticon parsing	iNPUTmice	2014-12-09	1	-5/+1
\| \|
* \|	remaining part of my patch	lookshe	2015-01-03	1	-3/+2
\|/
*	possible work around for some weird - possibly sdk - bugs	iNPUTmice	2014-12-07	1	-4/+5
\|
*	refactored the message adapter a bit	iNPUTmice	2014-12-03	1	-32/+33
\|
*	remove unused imports.	Michael	2014-11-21	1	-5/+0
\|
*	handled more error cases	iNPUTmice	2014-11-15	1	-5/+20
\|
*	fixed description in notifications and conversation overview	iNPUTmice	2014-11-15	1	-1/+5
\|
*	some mime and pgp fixes for file transfer	iNPUTmice	2014-11-15	1	-34/+27
\|
*	progress for http images as well. fixed open button for sent files	iNPUTmice	2014-11-15	1	-2/+7
\|
*	bug fixes and various improvements for file transfer	iNPUTmice	2014-11-15	1	-4/+9
\|
*	basic arbitrary file transfer	iNPUTmice	2014-11-15	1	-32/+65
\|
*	use isBareJid instead of getResourcePart().isEmpty()	iNPUTmice	2014-11-09	1	-1/+1
\|
*	fixed muc sender history for some cases (where the previous nick was a valid ↵	iNPUTmice	2014-11-09	1	-4/+12
\| \| \| \|	jid)
*	refactored code to always contain full jid for counterpart	iNPUTmice	2014-11-09	1	-16/+8
\|
*	Fix bug introduced by rebase	Sam Whited	2014-11-09	1	-5/+4
\|
*	Fix letter avatar selection in MUC	Sam Whited	2014-11-09	1	-13/+1
\|
*	More formatting fixes in MUC	Sam Whited	2014-11-09	1	-1/+5
\|
*	Format contact names in MUC properly	Sam Whited	2014-11-09	1	-12/+13
\|
*	Update more files to use JID objects	Sam Whited	2014-11-09	1	-3/+16
\|
*	bug fixes for the previous ui refactoring	iNPUTmice	2014-11-07	1	-1/+1
\|
*	UI code refactoring	iNPUTmice	2014-11-07	1	-74/+61
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-25/+20
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+560