conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	@Overrides addedtrz/merge_1.11.7	lookshe	2016-04-17	1	-0/+6
\|
*	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	71	-310/+573
	Conflicts: README.md build.gradle gradle/wrapper/gradle-wrapper.properties src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.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/ShareWithActivity.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java 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-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
*	Merge branch 'trz/rebase' into trz/rename (skip beta logo)	lookshe	2016-04-06	0	-0/+0
\|\
\| *	update to beta-2 and new logo for betatrz/beta-2	lookshe	2016-04-06	34	-5/+740
\| \|
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-05	21	-54/+201
\|\\|
\| *	Merge tag '1.11.3' into trz/rebase	lookshe	2016-04-05	21	-55/+202
\| \|
* \|	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-04-05	0	-0/+0
\|\\|
\| *	Merge branch 'trz/rename' into trz/rebase (skip translation)	lookshe	2016-04-03	0	-0/+0
\| \|\ \| \|/ \|/\|
* \|	conversations->conversations+	lookshe	2016-04-03	29	-327/+327
\| \|
* \|	Pulled translations from transifex	lookshe	2016-04-01	2	-25/+31
\| \|
* \|	Fixes FS#180: Conference notification icon missing	lookshe	2016-04-01	1	-1/+6
/
*	fixed installation error "W/PackageManager: Can't install because provider ↵trz/beta-1	lookshe	2016-04-03	3	-3/+3
\| \| \| \|	name de.thedevstack.conversationsplus (in package eu.siacs.conversations) is already used by de.thedevstack.conversationsplus"
*	update build.gradle for beta	lookshe	2016-04-03	1	-2/+2
\|
*	fixed build error	lookshe	2016-04-03	1	-0/+2
\|
*	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-04-01	3	-26/+37
\|
*	Pulled translations from transifex	lookshe	2016-04-01	2	-25/+31
\|
*	Fixes FS#180: Conference notification icon missing	lookshe	2016-04-01	1	-1/+6
\|
\| *	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-30	9	-32/+61
\|/
*	no resize of input field when inserting emojicon (FS#175)	lookshe	2016-03-30	1	-1/+1
\|
*	Fixes FS#174: Displaying of ASCII emoticons differs	lookshe	2016-03-30	5	-31/+54
\|
*	Logging for FS#80 to identify calling method	lookshe	2016-03-30	3	-0/+6

*	wrong import in new classtrz/1.11.2.1	lookshe	2016-03-27	1	-1/+1
\|
*	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-27	2	-2/+10
\|\
\| *	adjusted changelog and corrected wrong version in build.gradle due to merge	lookshe	2016-03-27	2	-3/+11
\| \|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-27	5	-3/+57
\|\\|
\| *	Fixes FS#166 - Images cannot be opened since storing in private image folder	lookshe	2016-03-27	5	-3/+57
\| \|
* \|	Merge branch 'trz/rename' (early part) into trz/rebase	lookshe	2016-03-27	0	-0/+0
\|\\|
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	18	-42/+96
\| \|\ \| \|/ \|/\|
* \|	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	18	-42/+95
\| \|
\| *	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-25	0	-0/+0
\| \|\ \| \|/ \|/\|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-23	1	-0/+0
\|\\|
\| *	deleted unused library (FS#51)	lookshe	2016-03-23	1	-0/+0
\| \|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-23	32	-317/+450
\|\\|
\| *	pulled from transifex	lookshe	2016-03-23	32	-317/+450
\| \|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-22	2	-26/+42
\|\\|
\| *	Correct notifications to user if swiping with disabled or not connected ↵	lookshe	2016-03-22	1	-25/+37
\| \| \| \| \| \| \| \|	account (FS#159)
\| *	Fixes FS#87 - Crash on load messages after delete account	lookshe	2016-03-22	1	-1/+5
\| \|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-21	1	-4/+19
\|\\|
\| *	One more fix in Message.equals() (FS#104)	lookshe	2016-03-21	1	-4/+19
\| \|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-1/+2
\|\\|
\| *	changed configuration to conversations+ project (FS#32)	lookshe	2016-03-20	1	-1/+2
\| \|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-1/+1
\|\\|
\| *	Show file name instead of mime type (FS#102)	lookshe	2016-03-20	1	-1/+1
\| \|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-18/+14
\|\\|
\| *	FS#104 - Fix Message.equals()	lookshe	2016-03-20	1	-18/+14
\| \|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	7	-4/+15
\|\\|
\| *	Fixes FS#143 - Displaying of emoticons too large	lookshe	2016-03-20	7	-4/+15
\| \|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-59/+83
\|\\|
\| *	Fixes FS#168 - Not possible to share more than one picture at once	lookshe	2016-03-20	1	-59/+83
\| \|
* \|	Merge branch 'trz/rename' (early part) into trz/rebase	lookshe	2016-03-20	0	-0/+0
\|\\|