conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Implements FS#176: error logging for httpupload improved	steckbrief	2016-03-28	1	-1/+7
\|
*	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
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Fixes FS#168 - Not possible to share more than one picture at once	lookshe	2016-03-20	1	-59/+83
\| \| \|
\| * \|	Merge branch 'trz/rename' (early part) into trz/rebase	lookshe	2016-03-20	0	-0/+0
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	fixed merge error	lookshe	2016-03-20	1	-1/+1
\| \| \|
* \| \|	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	3	-19/+27
\|\ \ \
* \ \ \	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	16	-181/+558
\|\ \ \ \
* \ \ \ \	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	0	-0/+0
\|\ \ \ \ \
\| \| \| \| * \|	Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1	lookshe	2016-03-20	7	-38/+96
\| \| \| \|/\| \|
\| \| \| \| * \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	7	-38/+96
\| \| \|_\|/\| \| \| \|/\| \|/ / \| \| \|/\| \| \| \|/\| \| \| \|/\| \| \| \|
* \| \| \| \|	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
\|\ \ \ \ \
\| * \| \| \| \|	Fixes FS#164	lookshe	2016-03-18	1	-8/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Fixes FS#156 and FS#135 (occured again)	lookshe	2016-03-17	1	-4/+10
\| \| \| \| \| \|
\| * \| \| \| \|	completely implements FS#161	lookshe	2016-03-17	3	-14/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	save state of treatAsDownloadable() and set on error to specified value
\| * \| \| \| \|	partially implements FS#161	lookshe	2016-03-16	2	-17/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do not show download button on 404
* \| \| \| \| \|	Refs FS#140: Rework message display	steckbrief	2016-03-13	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hide own avatar in message display
\| \| \| \| * \|	fixed merge errors	lookshe	2016-03-20	5	-21/+29
\| \| \| \|/ /
\| \| \| * /	Merge tag '1.11.1' into trz/merge_1.11.1	lookshe	2016-03-17	16	-181/+558
\| \| \|/\| \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.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/utils/FileUtils.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-de/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ru/strings.xml
\| \| \| *	version bump to 1.11.1 and changelog1.11.1	Daniel Gultsch	2016-03-16	2	-2/+5
\| \| \| \|