conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	Implements FS#247 and FS#248: Show online status and typing notification in ↵	steckbrief	2017-08-02	3	-3/+41
\| \| \| \|	title
*	Implements FS#106: Add expert setting to log xml trace	steckbrief	2017-08-01	3	-0/+9
\|
*	relates FS#241: Implementation of http download based on okhttp	steckbrief	2017-02-06	1	-0/+2
\|
*	Formatting of remote file status adjusted	steckbrief	2017-01-11	1	-1/+1
\|
*	Improved error handling for filetransfer:http:delete, Check for httpupload ↵	steckbrief	2017-01-11	1	-0/+2
\| \| \| \|	feature available extended to include filetransfer:http as well, method to check if http upload is available moved from data class 'Account' to 'AccountUtil'
*	Custom toast view added	steckbrief	2017-01-11	3	-0/+22
\|
*	Merge branch 'trz/rebase' into trz/rename	steckbrief	2017-01-05	3	-0/+26
\|\
\| *	Merge remote-tracking branch 'origin/trz/rename' into trz/rebase	steckbrief	2017-01-05	3	-31/+49
\| \|\ \| \|/ \|/\|
\| *	Added columns to fileparams table: url, original file name, key and iv	steckbrief	2017-01-04	3	-0/+26
\| \| \| \| \| \| \| \| \| \|	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	4	-0/+22
\| \|\
\| * \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	2	-0/+23
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-18	2	-8/+1
\| \|\ \ \
* \| \| \| \|	Implement FS#239: Show number of unread messages in conversations overview	steckbrief	2016-12-28	1	-30/+42
\| \| \| \| \|
* \| \| \| \|	Fixes FS#237: Enable long click in layout instead of programmatically	steckbrief	2016-10-23	2	-1/+7
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Implements FS#235: Deletion of remote files uploaded via httpupload	steckbrief	2016-09-29	2	-0/+15
\| \| \| \|
* \| \| \|	Fixes FS#229: prompt for confirmation before deleting a file	steckbrief	2016-08-23	2	-0/+2
\| \| \| \|
* \| \| \|	Basic filetransfer http delete implementation; Exceptions for IqPacketError ↵	steckbrief	2016-08-22	2	-0/+5
\| \|_\|/ \|/\| \| \| \| \| \| \| \|	added
* \| \|	Merge branch 'master' into introduce_cplus_database_version	steckbrief	2016-04-18	44	-117/+170
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
\| * \|	Related to FS#199: fixed merge hickups (message correction setting removed, ↵	steckbrief	2016-04-18	2	-8/+1
\| \| \| \| \| \| \| \| \| \| \| \|	key for other expert settings readded)
\| * \|	removed unused string	lookshe	2016-04-17	1	-1/+0
\| \| \|
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-17	44	-116/+177
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java src/main/res/values-bg/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
\| \| *	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	44	-145/+178
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| *	add setting for quick sharing	Daniel Gultsch	2016-04-14	2	-15/+26
\| \| \| \|
\| \| \| *	added share uri button to conference details	Daniel Gultsch	2016-04-12	14	-14/+26
\| \| \| \|
\| \| \| *	pulled translations from transifex	Daniel Gultsch	2016-04-10	29	-86/+27
\| \| \| \|
\| \| \| *	introduced setting to turn of notification led	Daniel Gultsch	2016-04-09	2	-4/+11
\| \| \| \|
\| \| \| *	pulled translations from transifex	Daniel Gultsch	2016-04-08	2	-3/+23
\| \| \| \|
\| \| \| *	check file owner when attaching files or using them as avatar	Daniel Gultsch	2016-04-07	1	-0/+1
\| \| \| \|
\| \| \| *	pulled translations from transifex	Daniel Gultsch	2016-04-04	12	-26/+71
\| \| \| \|
\| \| * \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-07	1	-0/+1
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
\| \| * \|	update to beta-2 and new logo for beta	lookshe	2016-04-06	30	-0/+0
\| \| \| \|
\| \| * \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-04-01	2	-25/+31
\| \| \|\ \
\| \| \| * \|	Pulled translations from transifex	lookshe	2016-04-01	2	-25/+31
\| \| \| \| \|
\| \| * \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-30	1	-1/+1
\| \| \|\\| \|
\| \| * \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	1	-1/+13
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
\| \| * \ \ \	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-27	1	-0/+4
\| \| \|\ \ \ \
* \| \| \| \| \| \|	DatabaseBackend updated to serve Conversatiosn Database version and ↵	steckbrief	2016-04-17	2	-0/+23
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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)
* \| \| \| \| \|	Implements FS#187: Add single line copy to logcat view	steckbrief	2016-04-07	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	conversations->conversations+	lookshe	2016-04-03	29	-327/+327
\| \| \| \| \| \|
* \| \| \| \| \|	Pulled translations from transifex	lookshe	2016-04-01	2	-25/+31
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	no resize of input field when inserting emojicon (FS#175)	lookshe	2016-03-30	1	-1/+1
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Implements FS#173: Move access to colors to separate helper class	steckbrief	2016-03-29	1	-1/+13
\| \|/ / \|/\| \|
* \| \|	Fixes FS#166 - Images cannot be opened since storing in private image folder	lookshe	2016-03-27	1	-0/+4
\| \| \|
* \| \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	2	-1/+5
\|\\| \|
\| * \|	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	2	-1/+5
\| \|\\|
\| \| *	allow to delete attachments. fixes #1539	Daniel Gultsch	2016-03-23	2	-1/+5
\| \| \|
\| * \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-23	32	-317/+450
\| \|\ \ \| \|/ / \|/\| \|
\| * \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	7	-4/+15
\| \|\ \
\| * \ \	Merge branch 'trz/rebase' into trz/merge_1.11.1	lookshe	2016-03-20	1	-1/+2
\| \|\ \ \
\| \| * \ \	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-1/+2
\| \| \|\ \ \