conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	pulled updated translations from transifex	Daniel Gultsch	2015-08-28	1	-1/+1
\|
*	added XEP number for http file upload	Daniel Gultsch	2015-08-27	1	-3/+6
\|
*	pulled translations from transifex	Daniel Gultsch	2015-08-24	1	-2/+4
\|
*	renamed plain text to unencrypted. fixes #1331	Daniel Gultsch	2015-08-24	1	-2/+2
\|
*	pulled translations from transifex1.6.0	Daniel Gultsch	2015-08-19	1	-1/+28
\|
*	sync translations with transifex	Daniel Gultsch	2015-08-03	1	-3/+0
\|
*	pulled new translations from transifex	Daniel Gultsch	2015-07-20	1	-1/+1
\|
*	pulled translations	Daniel Gultsch	2015-07-18	1	-0/+2
\|
*	made 'check image on http host' message more generic. fixed #1281	Daniel Gultsch	2015-07-16	1	-5/+3
\|
*	pulled translations from transifex	Daniel Gultsch	2015-05-20	1	-0/+5
\|
*	pulled translations from transifex	Daniel Gultsch	2015-04-26	1	-1/+1
\|
*	Add option to remove manually approved certificates	BrianBlade	2015-04-19	1	-0/+11
\| \| \| \| \| \| \|	- "Remove certificates" option brings up a dialog that allows to delete certificates from MemorizingTrustManager's keystore - Reconnect active accounts when certificate-settings are changed - new preference category "Certificate options"
*	Merge branch 'dont_trust_cas_preference' of ↵	iNPUTmice	2015-04-14	1	-0/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference Conflicts: src/main/res/values-de/strings.xml src/main/res/values/strings.xml
\| *	Add option to use MTM without default TrustManager	BrianBlade	2015-04-11	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Add a new "Don't trust system CAs" preference under advanced options that will change the behaviour of the MemorizingTrustManager. All formerly unknown certificates will raise a warning if checked.
* \|	Enable end-conversation by swipe gesture	BrianBlade	2015-04-08	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4 to enable swipe-out for ListViews Re-enable selectableItemBackground Dont end selectedConversation on swipe Call mConversationFragment.reinit() instead. Add separate undo string for swipe MUC. Add blacklistedConversation for undo swipe Update title_undo_swipe_* strings Fix undo(), rename blacklistedConversation Fix discardUndo(); re-init selectedConversation maintain scroll position after undo clear notification when dismissing a conversation modified / simplified maintain scroll position code simplify handling of selectedConversation change undo_muc string, remove notifyDataSetChanged()
* \|	pulled translations from transifex	iNPUTmice	2015-04-01	1	-6/+6
\|/
*	pulled translations	iNPUTmice	2015-03-22	1	-0/+4
\|
*	pulled new translations from transifex	iNPUTmice	2015-03-16	1	-0/+5
\|
*	pulled new translations from transifex	iNPUTmice	2015-02-27	1	-22/+22
\|
*	pulled new translations from transifex	iNPUTmice	2015-02-23	1	-21/+25
\|
*	pulled translations from transifex	iNPUTmice	2015-02-16	1	-1/+2
\|
*	pulled translations from transifex	iNPUTmice	2015-02-01	1	-0/+1
\|
*	Removes some unused strings (the legacy SSL stuff)	Sam Whited	2015-02-01	1	-2/+0
\|
*	Remove title_activity_conversations and use app_name instead	kruks23	2015-01-30	1	-1/+0
\|
*	updated translations	iNPUTmice	2015-01-25	1	-0/+15
\|
*	Remove legacy SSL support	Sam Whited	2015-01-19	1	-1/+0
\|
*	fetched translations from transifex	iNPUTmice	2015-01-19	1	-402/+406
\|
*	Correct the download file string on notifications	Sam Whited	2015-01-17	1	-1/+0
\| \| \| \|	Fixes #896
*	allow for very basic muc configuration	Daniel Gultsch	2015-01-08	1	-1/+9
\|
*	fixed german translation	Daniel Gultsch	2015-01-08	1	-2/+2
\|
*	Updated German translations for more muc options	Christian S.	2015-01-07	1	-9/+12
\|
*	Updated German translations...	Christian S	2015-01-07	1	-4/+15
\| \| \| \| \| \| \| \| \| \|	...I'm not sure if "Weitere Einstellungen" is the right translation for "advanced mode". Has anybody a better translation? I've changed the translations. Updated German translations... Updated German translations...
*	corrected German spellings	Christian Schneppe	2015-01-05	1	-16/+16
\| \| \|	and shorten some strings
*	corrected German 'private_message_to'	kriztan	2015-01-04	1	-1/+1
\|
*	Added and modified German translations	kriztan	2015-01-03	1	-5/+11
\|
*	Added German translations	kriztan	2015-01-02	1	-0/+7
\|
*	Make `app_name' string untranslatable	Sam Whited	2014-12-29	1	-1/+0
\| \| \| \| \| \|	Remove untranslatable about message Escape single quote in NL translation
*	Update german translations	kriztan	2014-12-27	1	-0/+4
\|
*	Update german translations	kriztan	2014-12-25	1	-0/+20
\|
*	Update german translations	kriztan	2014-12-18	1	-0/+8
\|
*	Update/improve German translations	Holger Weiß	2014-12-02	1	-2/+4
\|
*	Update german translations	kriztan	2014-11-26	1	-1/+1
\| \| \|	modified translations a bit
*	Update german translations	kriztan	2014-11-23	1	-0/+2
\|
*	Update german translations	kriztan	2014-11-20	1	-16/+20
\|
*	Update german translations	kriztan	2014-11-19	1	-0/+41
\|
*	Spelling fix in German translation	Sam Whited	2014-11-14	1	-1/+1
\|
*	Update German language	kriztan	2014-11-12	1	-24/+0
\| \| \|	deleted 'pref_about_message'
*	Update German language	kriztan	2014-11-12	1	-5/+34
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-7/+23
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+269