conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added columns to fileparams table: url, original file name, key and ivtrz/beta-5	steckbrief	2017-01-04	1	-0/+22
\| \| \| \| \|	auto download of files moved from MessageParser to MessageAdapter download and open file representation cleaned up
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	1	-0/+12
\|\
\| *	Implements FS#235: Deletion of remote files uploaded via httpupload	steckbrief	2016-09-29	1	-0/+12
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	1	-0/+22
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
\| *	DatabaseBackend updated to serve Conversatiosn Database version and ↵	steckbrief	2016-04-17	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conversations+ Database version HttpUpload Flag introduced for message to identify if a link was sent after httpupload message hint for httpupload added (message parsing and message generating)
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-30	1	-1/+1
\|\\|
\| *	no resize of input field when inserting emojicon (FS#175)	lookshe	2016-03-30	1	-1/+1
\| \|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	4	-4/+5
\|\\|
\| *	Fixes FS#143 - Displaying of emoticons too large	lookshe	2016-03-20	4	-4/+5
\| \|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-1/+2
\|\\|
\| *	Refs FS#140: Rework message display	steckbrief	2016-03-13	1	-1/+2
\| \| \| \| \| \| \| \|	hide own avatar in message display
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	2	-6/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/widget/Switch.java src/main/res/layout/account_row.xml src/main/res/layout/contact_key.xml
\| *	Fixes FS#51: Change toggle in Account Management back to standard	steckbrief	2016-03-11	2	-5/+3
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-10	1	-8/+0
\|\\| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
\| *	Fixes FS#158: user decision dialog heading configurable and translateable	steckbrief	2016-03-10	1	-8/+0
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-08	1	-1/+2
\|\\| \| \| \| \| \| \| \| \|	Conflicts: build.gradle
\| *	Merge remote branch 'master'	steckbrief	2016-03-08	2	-4/+0
\| \|\
\| * \|	Fixes FS#145: Dialog for decision in Android 5	steckbrief	2016-03-08	1	-1/+2
\| \| \|
* \| \|	Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1	lookshe	2016-03-08	2	-4/+0
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	reset link and highlight colors to system default	steckbrief	2016-03-08	2	-4/+0
\| \|/
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	2	-26/+42
\| \|\ \| \|/ \|/\|
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	19	-298/+945
\| \|\
* \| \	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	2	-26/+42
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	let users confirm each member in a conference even if that contact is ↵	Daniel Gultsch	2016-03-01	1	-26/+34
\| \| \| \| \| \| \| \| \| \| \| \|	already trusted
\| * \|	refactored omemo to take multiple recipients	Daniel Gultsch	2016-02-29	2	-26/+34
\| \| \|
* \| \|	Fixes FS#147: Disable OMEMO	steckbrief	2016-03-02	1	-1/+2
\| \| \|
* \| \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	1	-1/+1
\| \| \|
* \| \|	Removed stupid message correction	steckbrief	2016-02-23	2	-20/+0
\| \| \|
* \| \|	Removed useless 'button-message' to load more messages. Implementation ↵	steckbrief	2016-02-23	1	-9/+0
\| \| \| \| \| \| \| \| \| \| \| \|	already done with a more convenient method
* \| \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	3	-2/+42
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	basic support for XEP-0308: Last Message Correction. fixes #864	Daniel Gultsch	2016-02-15	2	-2/+22
\| \| \|
\| * \|	client side support for XEP-0357: Push Notifications	Daniel Gultsch	2016-02-12	1	-2/+21
\| \| \|
* \| \|	Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4	lookshe	2016-02-16	1	-0/+9
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: build.gradle src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.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/ui/adapter/MessageAdapter.java src/main/res/values/arrays.xml
\| * \|	prevent previoulsly cleared messages from reloading. fixes #1110	Daniel Gultsch	2016-02-04	1	-0/+9
\| \| \|
* \| \|	green bubbles and setting to choose green or white bubbles removed	steckbrief	2016-02-12	1	-4/+4
\| \| \|
* \| \|	Fixed layout issue with emojicon tastatur button	steckbrief	2016-02-12	1	-1/+0
\| \| \|
* \| \|	Fixed XML errors after merge	steckbrief	2016-02-11	3	-8/+9
\| \| \|
* \| \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	19	-297/+923
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .travis.yml CHANGELOG.md README.md art/render.rb build.gradle libs/openpgp-api-lib/build.gradle settings.gradle src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/entities/Account.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/entities/DownloadableFile.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/entities/MucOptions.java src/main/java/eu/siacs/conversations/entities/Transferable.java src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.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/ConferenceDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.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/ManageAccountActivity.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/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/CryptoHelper.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/PhoneHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/utils/Xmlns.java src/main/java/eu/siacs/conversations/xml/XmlReader.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java src/main/res/drawable-hdpi/ic_launcher.png src/main/res/drawable-hdpi/ic_notification.png src/main/res/drawable-mdpi/ic_launcher.png src/main/res/drawable-mdpi/ic_notification.png src/main/res/drawable-xhdpi/ic_launcher.png src/main/res/drawable-xhdpi/ic_notification.png src/main/res/drawable-xxhdpi/ic_launcher.png src/main/res/drawable-xxhdpi/ic_notification.png src/main/res/drawable-xxxhdpi/ic_launcher.png src/main/res/drawable-xxxhdpi/ic_notification.png src/main/res/layout/account_row.xml src/main/res/layout/activity_about.xml src/main/res/layout/activity_change_password.xml src/main/res/layout/activity_contact_details.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/activity_publish_profile_picture.xml src/main/res/layout/activity_verify_otr.xml src/main/res/layout/contact.xml src/main/res/layout/contact_key.xml src/main/res/layout/conversation_list_row.xml src/main/res/layout/enter_jid_dialog.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/join_conference_dialog.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/layout/message_status.xml src/main/res/layout/quickedit.xml src/main/res/values-ar-rEG/strings.xml src/main/res/values-bg/strings.xml src/main/res/values-ca/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-el/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-fa-rIR/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-iw/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ko/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ru/strings.xml src/main/res/values-sk/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-v21/themes.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/arrays.xml src/main/res/values/colors.xml src/main/res/values/dimens.xml src/main/res/values/strings.xml src/main/res/values/themes.xml src/main/res/xml/preferences.xml
\| * \|	introduced boolean form field wrapper	Daniel Gultsch	2016-01-23	2	-1/+14
\| \| \|
\| * \|	added UI wrapper for (some) form fields	Daniel Gultsch	2016-01-22	1	-0/+21
\| \| \|
\| * \|	changed spacing in create dialogs and notify user when no accounts are activated	Daniel Gultsch	2016-01-22	2	-6/+10
\| \| \|
\| * \|	increased padding in create contact/conference dialog	Daniel Gultsch	2016-01-21	2	-15/+21
\| \| \|
\| * \|	use match_parent as height in conversations overview	Daniel Gultsch	2016-01-12	1	-2/+2
\| \| \|
\| * \|	ask to be excluded from battery optimization	Daniel Gultsch	2016-01-11	1	-169/+212
\| \| \|
\| * \|	show per conference notification settings in details activity	Daniel Gultsch	2016-01-08	1	-0/+27
\| \| \|
\| * \|	show icon in conversations overview when notifications are disabled	Daniel Gultsch	2016-01-08	1	-76/+97
\| \| \|
\| * \|	Allow entering a JID from 'choose contact'. thanks @singpolyma	Daniel Gultsch	2016-01-04	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #1611 fixes #1602
\| * \|	properly rotate avatars	Daniel Gultsch	2016-01-04	1	-2/+2
\| \| \|
\| * \|	show certificate information	Daniel Gultsch	2015-12-23	1	-0/+88
\| \| \|
\| * \|	initial tor support	Daniel Gultsch	2015-12-01	1	-1/+53
\| \| \|