conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	Related to FS#140, Logo implementation moved to FloatingActionButton	steckbrief	2016-06-07	1	-14/+25
\| \| \| \| \|	- Appcompat v7 dependency added - References adjusted to work correctly with appcompat v7
*	avatar displayed as a circle, positioning adjusted, colors changed back to ↵	steckbrief	2016-05-16	1	-8/+3
\| \| \| \|	correct ones, positioning moved to own class file
*	Merge branch 'master' into message_display_rework	steckbrief	2016-04-20	1	-0/+1
\|\
\| *	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	1	-0/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| *	added share uri button to conference details	Daniel Gultsch	2016-04-12	1	-0/+1
\| \| \|
* \| \|	basic overlay for avatar as 'logo' added to action bar	steckbrief	2016-04-06	1	-3/+9
\|/ /
* /	Fixes FS#143 - Displaying of emoticons too large	lookshe	2016-03-20	1	-0/+4
\|/
*	use dedicated colors for primary and primary_dark	Daniel Gultsch	2015-08-26	1	-2/+2
\|
*	Add key trust toggle to ContactDetailsActivity	Andreas Straub	2015-07-19	1	-0/+1
\| \| \| \|	Can now toggle IdentityKey trust
*	renamed colors	Daniel Gultsch	2015-07-13	1	-2/+2
\|
*	Use Material Design Icons on API 21+	Sam Whited	2015-01-29	1	-0/+21
\|
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+35