conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	1	-2/+24
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java src/main/java/de/thedevstack/conversationsplus/entities/Account.java src/main/java/de/thedevstack/conversationsplus/entities/Contact.java src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java src/main/java/de/thedevstack/conversationsplus/entities/Message.java src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java src/main/java/eu/siacs/conversations/crypto/OtrEngine.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java src/main/java/eu/siacs/conversations/http/HttpConnection.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/res/layout/activity_about.xml
\| *	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-2/+24
\| \|
* \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-3/+3
\|/ \| \| \| \| \|	"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
*	changed received and read confirmation setting to one list and put it to ↵	lookshe	2015-04-14	1	-61/+62
\| \| \| \|	settings class
*	added settings for accepting and downloading files	lookshe	2015-04-12	1	-6/+25
\| \| \| \|	fix in Settings, initialize with same values like in preferences.xml
*	Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵	steckbrief	2015-04-11	1	-0/+6
\|\ \| \| \| \| \| \|	trz/master
\| *	differ between received and read message	lookshe	2015-04-11	1	-0/+6
\| \|
* \|	Color choose dialog	steckbrief	2015-04-11	1	-3/+5
\|/
*	Configurable LED color (Attention: Expert setting because currently only ↵	steckbrief	2015-03-31	1	-0/+5
\| \| \| \|	text input)
*	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	1	-0/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	added typing notifications through XEP-0085. fixed #210	iNPUTmice	2015-02-21	1	-0/+7
\| \|
* \|	Merge master-origin	steckbrief	2015-02-20	1	-5/+12
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Remove legacy SSL support	Sam Whited	2015-01-19	1	-5/+0
\| \|
\| *	Add option to swap enter/emoticon key	Sam Whited	2015-01-14	1	-0/+5
\| \|
\| *	Introduced expert options to control enter-is-send	Daniel Gultsch	2015-01-09	1	-0/+7
\| \| \| \| \| \| \| \|	(default == off)
* \|	Setting added for parsing emoticons or not	Tristan Zur	2015-01-11	1	-0/+5
\|/
*	Add quiet hours feature	Sam Whited	2014-12-14	1	-2/+23
\|
*	happy hanukkah	iNPUTmice	2014-11-16	1	-0/+5
\|
*	turn on foreground service in expert settings	iNPUTmice	2014-11-15	1	-0/+5
\|
*	Convert about dialog to activity	Sam Whited	2014-11-04	1	-6/+2
\|
*	Add about dialog with license info	Sam Whited	2014-11-04	1	-0/+7
\|
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+114