conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	1	-68/+76
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java 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/MessageAdapter.java src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
\| *	add a few more know file extensions	Daniel Gultsch	2016-03-04	1	-1/+1
\| \|
\| *	fix cancelation of http downloads and enable resume	Daniel Gultsch	2015-12-11	1	-8/+35
\| \|
\| *	request storage permission when needed on Android 6.0	Daniel Gultsch	2015-12-07	1	-1/+1
\| \|
\| *	initial tor support	Daniel Gultsch	2015-12-01	1	-2/+19
\| \|
\| *	pgp fixes and revert configuration changes	Daniel Gultsch	2015-11-25	1	-0/+3
\| \|
\| *	allow redownloading files from remote hosts. fixes #1504	Daniel Gultsch	2015-10-17	1	-2/+11
\| \|
\| *	use Conversations 1.x.y as user agent string in http upload and download	Daniel Gultsch	2015-09-23	1	-0/+2
\| \|
\| *	put wake locks on out of band file transfers	Daniel Gultsch	2015-08-10	1	-0/+4
\| \|
\| *	provide more detailed error toasts for http file download	Daniel Gultsch	2015-08-10	1	-37/+58
\| \|
\| *	enable axolotl encryption for jingle supported file transfers	Daniel Gultsch	2015-08-01	1	-17/+8
\| \|
\| *	use gcm for file encryption over http	Daniel Gultsch	2015-07-29	1	-5/+16
\| \|
\| *	use 'interactive mode' when starting downloads from the context menu	Daniel Gultsch	2015-07-22	1	-1/+0
\| \|
\| *	rely on refreshUi/refreshUiReal and make sure it is being used everywhere	Daniel Gultsch	2015-07-20	1	-4/+1
\| \|
\| *	Optimize imports	Andreas Straub	2015-07-20	1	-1/+1
\| \|
\| *	Encrypt files for HTTP upload in encrypted chats	Andreas Straub	2015-07-19	1	-2/+4
\| \|
\| *	fixed inactive http download	Daniel Gultsch	2015-07-17	1	-1/+1
\| \|
\| *	renamed HttpConnection to HttpDownloadConnection	Daniel Gultsch	2015-07-10	1	-0/+269
\|
*	Fixes FS#151 - Missing button on image-links	lookshe	2016-03-07	1	-1/+3
\|
*	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	1	-14/+2
\|
*	Imports organized	steckbrief	2016-02-12	1	-3/+1
\|
*	Compilation errors and merge mixups fixed	steckbrief	2016-02-11	1	-98/+177
\|
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-16	1	-1/+2
\|
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-10	1	-1/+1
\|
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	1	-3/+3
\|
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-06	1	-2/+4
\|
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-23	1	-1/+2
\|
*	fixes FS#44 - IOException if content-length is not present	lookshe	2015-08-21	1	-3/+3
\|
*	Merge tag '1.5.2' into trz/rebase	lookshe	2015-08-11	1	-0/+269