conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \|	update to beta-2 and new logo for betatrz/beta-2	lookshe	2016-04-06	34	-5/+740
\| \| \|
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-05	21	-54/+201
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge tag '1.11.3' into trz/rebase	lookshe	2016-04-05	21	-55/+202
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	version bump to 1.11.3 and changelog1.11.3	Daniel Gultsch	2016-04-02	2	-2/+6
\| \| \|
\| * \|	don't ask for resource when server uses http upload v0.1	Daniel Gultsch	2016-04-02	3	-6/+8
\| \| \|
\| * \|	check max http file size when attaching files	Daniel Gultsch	2016-04-01	6	-12/+83
\| \| \|
\| * \|	add methods to check max file size for http upload	Daniel Gultsch	2016-03-31	5	-12/+41
\| \| \|
\| * \|	save otr fingerprint in message	Daniel Gultsch	2016-03-31	6	-12/+15
\| \| \|
\| * \|	include form fields into caps hash calculation	Daniel Gultsch	2016-03-31	2	-6/+25
\| \| \|
\| * \|	closed some cursors under error conditions	Daniel Gultsch	2016-03-31	1	-3/+13
\| \| \|
\| * \|	made setting aes keys in DownloadableFile more readable	Daniel Gultsch	2016-03-31	1	-12/+8
\| \| \|
\| * \|	Merge pull request #1784 from kriztan/patch-2	Daniel Gultsch	2016-03-28	2	-3/+3
\| \|\ \ \| \| \| \| \| \| \| \|	Update ShortcutBadger to version 1.1.4
\| \| * \|	Update ShortcutBadger to version 1.1.4	Christian S	2016-03-27	2	-3/+3
\| \|/ /
\| \| *	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-04-05	0	-0/+0
\| \| \|\ \| \|_\|/ \|/\| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase (skip translation)	lookshe	2016-04-03	0	-0/+0
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	conversations->conversations+	lookshe	2016-04-03	29	-327/+327
\| \| \|
\| * \|	Pulled translations from transifex	lookshe	2016-04-01	2	-25/+31
\| \| \|
\| * \|	Fixes FS#180: Conference notification icon missing	lookshe	2016-04-01	1	-1/+6
\| \| \|
* \| \|	fixed installation error "W/PackageManager: Can't install because provider ↵trz/beta-1	lookshe	2016-04-03	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	name de.thedevstack.conversationsplus (in package eu.siacs.conversations) is already used by de.thedevstack.conversationsplus"
* \| \|	update build.gradle for beta	lookshe	2016-04-03	1	-2/+2
\| \| \|
* \| \|	fixed build error	lookshe	2016-04-03	1	-0/+2
\| \| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-04-01	3	-26/+37
\|\ \ \
\| * \| \|	Pulled translations from transifex	lookshe	2016-04-01	2	-25/+31
\| \| \| \|
\| * \| \|	Fixes FS#180: Conference notification icon missing	lookshe	2016-04-01	1	-1/+6
\| \| \| \|
* \| \| \|	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 branch 'trz/rename' into trz/rebase	lookshe	2016-03-30	9	-32/+61
\|\\| \|
\| * \|	no resize of input field when inserting emojicon (FS#175)	lookshe	2016-03-30	1	-1/+1
\| \| \|
\| * \|	Fixes FS#174: Displaying of ASCII emoticons differs	lookshe	2016-03-30	5	-31/+54
\| \| \|
\| * \|	Logging for FS#80 to identify calling method	lookshe	2016-03-30	3	-0/+6
\| \| \|
* \| \|	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
\| \|\ \ \| \|/ / \|/\| \|