conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	conversations->conversations+	lookshe	2016-04-03	1	-13/+13
\|
*	pulled from transifex	lookshe	2016-03-23	1	-0/+3
\|
*	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	1	-3/+11
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	pulled translations from transifex	Daniel Gultsch	2016-03-06	1	-3/+11
\| \|
* \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	1	-3/+0
\| \|
* \|	Removed stupid message correction	steckbrief	2016-02-23	1	-2/+0
\| \|
* \|	Removed useless 'button-message' to load more messages. Implementation ↵	steckbrief	2016-02-23	1	-1/+0
\| \| \| \| \| \| \| \|	already done with a more convenient method
* \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	1	-9/+27
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml
\| *	pulled translations from transifex	Daniel Gultsch	2016-02-20	1	-0/+21
\| \|
\| *	pulled translations from transifex	Daniel Gultsch	2016-02-19	1	-15/+0
\| \|
\| *	pulled translations from transifex	Daniel Gultsch	2016-02-15	1	-0/+12
\| \|
* \|	Unused preference 'picture_compression'. This feature is configured in our ↵	steckbrief	2016-02-13	1	-2/+0
\| \| \| \| \| \| \| \|	variant via 'resize_picture'
* \|	green bubbles and setting to choose green or white bubbles removed	steckbrief	2016-02-12	1	-2/+0
\|/
*	pulled translations from transifex	Daniel Gultsch	2016-01-20	1	-1/+32
\|
*	pulled translations for 1.9.0 release from transifex1.9.0	Daniel Gultsch	2016-01-14	1	-2/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2016-01-12	1	-4/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2016-01-11	1	-3/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2015-12-13	1	-0/+43
\|
*	pulled new translations from transifex	Daniel Gultsch	2015-12-02	1	-24/+69
\|
*	pulled translations from transifex	Daniel Gultsch	2015-10-14	1	-1/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2015-09-14	1	-1/+0
\|
*	pulled updated translations from transifex	Daniel Gultsch	2015-08-28	1	-1/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2015-08-24	1	-2/+0
\|
*	renamed plain text to unencrypted. fixes #1331	Daniel Gultsch	2015-08-24	1	-2/+2
\|
*	sync translations with transifex	Daniel Gultsch	2015-08-03	1	-3/+0
\|
*	made 'check image on http host' message more generic. fixed #1281	Daniel Gultsch	2015-07-16	1	-5/+0
\|
*	pulled new translations from transifex	Daniel Gultsch	2015-06-10	1	-0/+5
\|
*	pulled new translations from transifex	Daniel Gultsch	2015-05-16	1	-50/+245
\|
*	Remove title_activity_conversations and use app_name instead	kruks23	2015-01-30	1	-1/+0
\|
*	fetched translations from transifex	iNPUTmice	2015-01-19	1	-257/+251
\|
*	make project translatable via transifex	Daniel Gultsch	2015-01-09	1	-40/+0
\|
*	Updated languages for higher auto accept file sizes and changed labeling to ↵	Christian Schneppe	2015-01-05	1	-37/+38
\| \| \| \|	MiB and KiB
*	Make `app_name' string untranslatable	Sam Whited	2014-12-29	1	-2/+1
\| \| \| \| \| \|	Remove untranslatable about message Escape single quote in NL translation
*	Make conversations the root project	Sam Whited	2014-10-22	2	-0/+299