conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge master-origin	steckbrief	2015-02-20	1	-0/+28
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	added more ciphers for old openssl versions	iNPUTmice	2015-02-02	1	-1/+3
\| \|
\| *	Harden the TLS connection cipher suites	Sam Whited	2015-01-14	1	-0/+26
\| \|
* \|	- Avoiding accessing shared preferences to know if emoticons should be ↵	steckbrief	2015-01-20	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	parsed for every single message - Adding support to show online status in Conversations overview (configurable via the setting "send_button_status")
* \|	Merge branch 'master' of ssh://git.fucktheforce.de/conversations	lookshe	2015-01-03	1	-0/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	clean up conversation history after swtiching to a different conversation	iNPUTmice	2014-12-17	1	-0/+1
\| \|
\| *	Handle time comparisons using longs	Sam Whited	2014-12-16	1	-1/+1
\| \|
\| *	go through mam history page by page. load mam dynamically on scroll	iNPUTmice	2014-12-15	1	-2/+4
\| \|
\| *	various mam improvments	iNPUTmice	2014-12-13	1	-1/+3
\| \|
\| *	added max history age (default 1w). automatically sort newly added mam messages	iNPUTmice	2014-12-10	1	-0/+2
\| \|
\| *	cleanup: removed unused emoticon parsing	iNPUTmice	2014-12-09	1	-1/+0
\| \|
* \|	remaining part of my patch	lookshe	2015-01-03	1	-0/+1
\|/
*	progress for ibb transfers	iNPUTmice	2014-11-15	1	-0/+2
\|
*	support for pgp files	iNPUTmice	2014-11-15	1	-1/+1
\|
*	progress for http images as well. fixed open button for sent files	iNPUTmice	2014-11-15	1	-0/+1
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \|	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/+25