conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	Removed download decision MUST if the message contains jabber:x:oob:oob/urlintroduce_cplus_database_version	steckbrief	2016-04-19	1	-3/+0
\|
*	Persist Message.treatAsDownloadable	steckbrief	2016-04-19	2	-2/+15
\|
*	Related to FS#134: Set Message flags according to httpupload hint	steckbrief	2016-04-19	3	-0/+9
\|
*	Merge branch 'master' into introduce_cplus_database_version	steckbrief	2016-04-18	70	-312/+638
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
\| *	Implements FS#137: build flavors	steckbrief	2016-04-18	4	-50/+89
\| \| \| \| \| \| \| \|	moved Config.java parameters to a flavorable configuration file
\| *	Related to FS#199: fixed merge hickups (message correction setting removed, ↵	steckbrief	2016-04-18	2	-8/+1
\| \| \| \| \| \| \| \|	key for other expert settings readded)
\| *	Related to FS#199: Removed unnecessary build configuration variable to hide ↵	steckbrief	2016-04-18	2	-6/+3
\| \| \| \| \| \| \| \|	disable button on foreground service notification
\| *	Related to FS#199: Removed unnecessary differentiation between a ↵	steckbrief	2016-04-18	3	-16/+1
\| \| \| \|	conversation with the own account
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-16	2	-3/+8
\| \|\
\| * \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-07	6	-56/+131
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
\| * \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-06	12	-144/+135
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
\| * \| \| \|	Merge commit 'remotes/origin/trz/rename~1' into trz/rebase	steckbrief	2016-04-06	0	-0/+0
\| / / /
* \| \| /	DatabaseBackend updated to serve Conversatiosn Database version and ↵	steckbrief	2016-04-17	17	-38/+393
\| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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)
* \| \|	Fixed null pointer exception in case of IOException before uploading file to ↵	steckbrief	2016-04-16	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \|	http host
* \| \|	Fixes FS#197: Decrease verbosity of logging of 'skipping duplicate message'	steckbrief	2016-04-07	1	-1/+1
\| \|/ \|/\|
* \|	Implements FS#187: Add single line copy to logcat view	steckbrief	2016-04-07	6	-56/+129
\|/
*	Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences	steckbrief	2016-04-06	12	-144/+134

*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-30	1	-1/+3
\|
*	Fixes FS#179: Avoid showing always empty list of ressources for mucs	steckbrief	2016-03-30	1	-1/+3

*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	1	-20/+9
\|\
\| *	Fixes FS#172: Conversations list not updated on status changes	steckbrief	2016-03-29	1	-20/+9
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	0	-0/+0
\|\\| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
\| *	Removed unnecessary import	steckbrief	2016-03-29	1	-1/+0
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	6	-70/+103
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.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/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
\| *	Avoid unnecessary text change on activate account button	steckbrief	2016-03-29	1	-2/+3
\| \|
\| *	Introduction of a TextViewUtil to easily set attributes for TextViews	steckbrief	2016-03-29	6	-69/+99
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	17	-102/+246
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Implements FS#173: Move access to colors to separate helper class	steckbrief	2016-03-29	17	-102/+239
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-28	3	-5/+9
\|/
*	Merge branch 'master' of repos.thedevstack.de:conversations-plus	steckbrief	2016-03-28	7	-6/+68
\|
*	Fixes FS#170: Message Details: Status display has different Text color	steckbrief	2016-03-28	2	-4/+2
\|
*	Implements FS#176: error logging for httpupload improved	steckbrief	2016-03-28	1	-1/+7

*	Fixes FS#167: Resized images are larger than original images	steckbrief	2016-03-18	1	-2/+2
\|
*	Merge branch 'master' of git.fucktheforce.de:conversations-plus	steckbrief	2016-03-18	7	-39/+96
\|
*	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-12	5	-97/+16
\| \|\ \| \|/ \|/\|
* \|	Fixes FS#155: Check FileHelper vs. FileUtils	steckbrief	2016-03-12	5	-97/+16
/
*	Merge commit 'remotes/origin/trz/rename~1' into trz/rebase	steckbrief	2016-03-12	0	-0/+0

*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	10	-140/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	10	-139/+13
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	8	-149/+28
\|\\| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java
\| *	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	8	-149/+28
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-10	6	-49/+52
\|\\| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
\| *	Fixes FS#157: Trigger loading messages from MAM in MUC does not end	steckbrief	2016-03-10	3	-37/+45
\| \|
\| *	Fixes FS#158: user decision dialog heading configurable and translateable	steckbrief	2016-03-10	3	-12/+6
\| \|
* \|	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	4	-22/+21
\|
*	Fixes FS#145: Dialog for decision in Android 5	steckbrief	2016-03-08	1	-1/+2

*	reset link and highlight colors to system default	steckbrief	2016-03-08	3	-21/+20

*	Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquare	steckbrief	2016-03-08	1	-1/+1
\|