conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| *	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
\| \|/
* \|	Implements FS#64: Show who wrote last message in conversation overview	steckbrief	2016-01-15	1	-0/+1
\| \|
* \|	Log error in case logcat command could not be executed; Show toast in case ↵	steckbrief	2015-12-17	1	-0/+1
\| \| \| \| \| \| \| \|	nothing is copied
* \|	Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵	steckbrief	2015-12-16	1	-0/+5
\| \| \| \| \| \| \| \|	distinguishes between image resizing and compressing/saving
* \|	Implements FS#67: Introduce central logging class to use log prefix, new ↵	steckbrief	2015-11-20	1	-0/+5
\| \| \| \| \| \| \| \|	activity to show logcat output and button to copy contents
* \|	Implements FS#26: Introduction of dialog to choose whether to resize a ↵	steckbrief	2015-11-03	1	-0/+4
\| \| \| \| \| \| \| \|	picture or not
* \|	Implements FS#24: Introduce setting for picture resizing	steckbrief	2015-10-30	1	-0/+5
\| \|
* \|	Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵	steckbrief	2015-10-23	1	-1/+1
\| \| \| \| \| \| \| \|	values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class
* \|	Publishing additional information in message details dialog such as message ↵	steckbrief	2015-10-04	1	-0/+21
\| \| \| \| \| \| \| \|	type and message status
* \|	Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵	steckbrief	2015-10-04	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added
* \|	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-49/+70
\| \|
* \|	changed received and read confirmation setting to one list and put it to ↵	lookshe	2015-04-14	1	-4/+5
\| \| \| \| \| \| \| \|	settings class
* \|	added settings for accepting and downloading files	lookshe	2015-04-12	1	-1/+7
\| \| \| \| \| \| \| \|	fix in Settings, initialize with same values like in preferences.xml
* \|	differ between received and read message	lookshe	2015-04-11	1	-2/+4
\| \|
* \|	no trim of messages or password	lookshe	2015-04-11	1	-0/+1
\| \| \| \| \| \| \| \|	check password with only spaces separately
* \|	Configurable LED color (Attention: Expert setting because currently only ↵	steckbrief	2015-03-31	1	-0/+2
\| \| \| \| \| \| \| \|	text input)
* \|	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	1	-42/+56
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml
\| *	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
\| \|
* \|	Merge master-origin	steckbrief	2015-02-20	1	-50/+87
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: 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/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
\| *	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
\| \|
* \|	Setting added for parsing emoticons or not	Tristan Zur	2015-01-11	1	-0/+2
\|/
*	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
\|