conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\|
*	One more fix in Message.equals() (FS#104)	lookshe	2016-03-21	1	-4/+19
\|
*	Show file name instead of mime type (FS#102)	lookshe	2016-03-20	1	-1/+1
\|
*	FS#104 - Fix Message.equals()	lookshe	2016-03-20	1	-18/+14
\|
*	Fixes FS#168 - Not possible to share more than one picture at once	lookshe	2016-03-20	1	-59/+83
\|
*	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
\|\
\| *	fixed merge errors	lookshe	2016-03-20	5	-21/+29
\| \|
* \|	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	8	-74/+115
\|\\|
\| *	Merge tag '1.11.1' into trz/merge_1.11.1	lookshe	2016-03-17	8	-74/+115
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| *	made it possible to share text files	Daniel Gultsch	2016-03-16	1	-7/+8
\| \| \|
\| \| *	reworked sharewith activity to stay open during sharing	Daniel Gultsch	2016-03-16	2	-30/+66
\| \| \| \| \| \| \| \| \| \| \| \|	closing the activity prematuraly caused uri permissions to be revoked
\| \| *	Check if path for URI is accessible	fiaxh	2016-03-15	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The path extracted from the Cursor might not be accessible for Conversations. FileUtils accesses URI information through the ContentProvider, so this wouldn't be noticed. Fixes sharing from open-keychain's TemporaryContentProvider
\| \| *	simplified getUsers(max) code	Daniel Gultsch	2016-03-13	1	-11/+2
\| \| \|
\| \| *	added logging in case fragment wasn't attached	Daniel Gultsch	2016-03-13	1	-0/+5
\| \| \|
\| \| *	fixed recursive call instead of call to super in PublishProfileActivity	Daniel Gultsch	2016-03-13	1	-5/+1
\| \| \|
\| \| *	log reason for bind failure	Daniel Gultsch	2016-03-11	1	-2/+2
\| \| \|
\| \| *	close cursor in caps db query	Daniel Gultsch	2016-03-11	1	-1/+3
\| \| \|
\| * \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-15	2	-4/+4
\| \|\ \
\| * \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-12	5	-97/+16
\| \|\ \ \
* \| \| \| \|	Fixes FS#167: Resized images are larger than original images	steckbrief	2016-03-18	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	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
* \| \| \|	once again: FS#34 - review all calls for String.trim()	lookshe	2016-03-14	2	-4/+4
\| \|/ / \|/\| \|
* \| \|	Fixes FS#155: Check FileHelper vs. FileUtils	steckbrief	2016-03-12	5	-97/+16
\| \| \|
* \| \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-12	7	-55/+93
\|\\| \|
\| * \|	fixed possible NPE	lookshe	2016-03-12	1	-0/+6
\| \| \|
\| * \|	small bugfixes	lookshe	2016-03-12	2	-1/+4
\| \| \|
\| * \|	removed duplicated source	lookshe	2016-03-12	4	-36/+41
\| \| \|
\| * \|	Added method to get body from message if hasMeCommand and harmonized ↵	lookshe	2016-03-12	6	-44/+67
\| \| \| \| \| \| \| \| \| \| \| \|	extraction of fileextension (FS#38)
\| * \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	3	-77/+11
\| \|\ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	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
\| * \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-10	5	-41/+52
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
\| * \ \ \	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-08	1	-17/+20
\| \|\ \ \ \
* \| \| \| \| \|	Fixes FS#51: Change toggle in Account Management back to standard	steckbrief	2016-03-11	3	-77/+10
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	8	-149/+28
\| \|_\|/ / \|/\| \| \|
* \| \| \|	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	2	-4/+6
\| \|/ / \|/\| \|
* \| \|	reset link and highlight colors to system default	steckbrief	2016-03-08	1	-17/+20
\| \| \|
* \| \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	31	-477/+874
\|\\| \|
\| * \|	Fixes FS#153 - Check if url, phone and email are linkified correctly	lookshe	2016-03-08	1	-6/+31
\| \| \|
\| * \|	Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquare	steckbrief	2016-03-08	1	-1/+1
\| \| \|
\| * \|	Fixed merge issue with AxolotlService (differentiation between impl and ↵	steckbrief	2016-03-08	3	-133/+171
\| \| \| \| \| \| \| \| \| \| \| \|	interface)
\| * \|	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	28	-340/+668
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.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/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values-bg/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-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
\| \| *	don't show opt-out of battery optimization dialog when push is enabled	Daniel Gultsch	2016-03-06	3	-4/+17
\| \| \|
\| \| *	warn in conversations when account is disabled	Daniel Gultsch	2016-03-06	1	-1/+14
\| \| \|
\| \| *	Merge branch 'Mess' of https://github.com/tarun018/Conversations into ↵	Daniel Gultsch	2016-03-04	1	-0/+10
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	tarun018-Mess