conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \|
* \| \|	wrong import in new classtrz/1.11.2.1	lookshe	2016-03-27	1	-1/+1
\| \| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-27	2	-2/+10
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	adjusted changelog and corrected wrong version in build.gradle due to merge	lookshe	2016-03-27	2	-3/+11
\| \| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-27	5	-3/+57
\|\\| \|
\| * \|	Fixes FS#166 - Images cannot be opened since storing in private image folder	lookshe	2016-03-27	5	-3/+57
\| \|/
* \|	Merge branch 'trz/rename' (early part) into trz/rebase	lookshe	2016-03-27	0	-0/+0
\|\\|
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	18	-42/+96
\| \|\ \| \|/ \|/\|
* \|	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	18	-42/+95
\|\ \
\| * \|	version bump to 1.11.2 and changelog1.11.2	Daniel Gultsch	2016-03-23	2	-2/+7
\| \| \|
\| * \|	allow to delete attachments. fixes #1539	Daniel Gultsch	2016-03-23	8	-31/+46
\| \| \|
\| * \|	only add image files to media scanner	Daniel Gultsch	2016-03-23	6	-13/+26
\| \| \|
\| * \|	update build deps	Daniel Gultsch	2016-03-23	1	-2/+2
\| \| \|
\| * \|	Merge pull request #1780 from licaon-kter/patch-1	Daniel Gultsch	2016-03-22	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Typo `attempt`
\| \| * \|	Typo `attempt`	licaon-kter	2016-03-22	1	-1/+1
\| \|/ /
\| * \|	show room nick for /me command in sent muc messages. fixes #1773	Daniel Gultsch	2016-03-20	1	-4/+5
\| \| \|
\| * \|	be less strict when sharing EXTRA_TEXT intents	Daniel Gultsch	2016-03-20	1	-1/+1
\| \| \|
\| * \|	be more careful to avoid creating multiple connections	Daniel Gultsch	2016-03-20	2	-3/+8
\| \| \|
\| * \|	don't show v\omemo keys as such if not enabled	Daniel Gultsch	2016-03-20	2	-4/+5
\| \| \|
\| \| *	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-25	0	-0/+0
\| \| \|\ \| \|_\|/ \|/\| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-23	1	-0/+0
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	deleted unused library (FS#51)	lookshe	2016-03-23	1	-0/+0
\| \| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-23	32	-317/+450
\|\\| \|
\| * \|	pulled from transifex	lookshe	2016-03-23	32	-317/+450
\| \| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-22	2	-26/+42
\|\\| \|
\| * \|	Correct notifications to user if swiping with disabled or not connected ↵	lookshe	2016-03-22	1	-25/+37
\| \| \| \| \| \| \| \| \| \| \| \|	account (FS#159)
\| * \|	Fixes FS#87 - Crash on load messages after delete account	lookshe	2016-03-22	1	-1/+5
\| \| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-21	1	-4/+19
\|\\| \|
\| * \|	One more fix in Message.equals() (FS#104)	lookshe	2016-03-21	1	-4/+19
\| \| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-1/+2
\|\\| \|
\| * \|	changed configuration to conversations+ project (FS#32)	lookshe	2016-03-20	1	-1/+2
\| \| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-1/+1
\|\\| \|
\| * \|	Show file name instead of mime type (FS#102)	lookshe	2016-03-20	1	-1/+1
\| \| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-18/+14
\|\\| \|
\| * \|	FS#104 - Fix Message.equals()	lookshe	2016-03-20	1	-18/+14
\| \| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	7	-4/+15
\|\\| \|
\| * \|	Fixes FS#143 - Displaying of emoticons too large	lookshe	2016-03-20	7	-4/+15
\| \| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-59/+83
\|\\| \|