conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \|
* \|	Fixes FS#143 - Displaying of emoticons too large	lookshe	2016-03-20	1	-0/+3
\|/
*	use dedicated colors for primary and primary_dark	Daniel Gultsch	2015-08-26	1	-2/+2
\|
*	Merge branch 'CryptoNextBeta' into development	Andreas Straub	2015-07-20	1	-0/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* CryptoNextBeta: (60 commits) Lock TrustKeys if no trusted keys are available Optimize imports Use MD style for key trust toggle switch Fix set/remove OnUpdateBlocklistListener Fix axolotl database migration Remove device list from EditAccount Add clear devices to overflow menu in EditAccount Ask for key trust when sending messages Encrypt files for HTTP upload in encrypted chats Refactor trust key ui and show in account details Send correct body for HTTP files Handle file transmission properly in axolotl Remove unneccessary code Fix trust status for outgoing messages Don't merge messages with different trust statuses Fix copying of axolotl keys to clipboard Add refresh icon to v21 theme Disable Axolotl option if not usable Show trust status of messages' originating session Add key trust toggle to ContactDetailsActivity ...
\| *	Add refresh icon to v21 theme	Sam Whited	2015-07-19	1	-0/+1
\| \|
\| *	Add key trust toggle to ContactDetailsActivity	Andreas Straub	2015-07-19	1	-0/+1
\| \| \| \| \| \| \| \|	Can now toggle IdentityKey trust
* \|	Change CAB to accent color in v21	Sam Whited	2015-07-19	1	-0/+3
\|/
*	renamed colors	Daniel Gultsch	2015-07-13	1	-2/+2
\|
*	made material icons smaller (24dp)	Daniel Gultsch	2015-04-28	1	-17/+15
\|
*	Use Material Design Icons on API 21+	Sam Whited	2015-01-29	1	-0/+21
\|
*	Add materials theme	Sam Whited	2015-01-06	1	-0/+14