conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	moved merged files to correct location	lookshe	2015-08-16	3	-0/+167
\|
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-16	14	-409/+222
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
* \|	resolve of some compiler errors	lookshe	2015-08-13	3	-1/+3
\| \|
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	61	-2115/+3783
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \|	Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference	steckbrief	2015-06-19	1	-2/+5
\| \|
* \|	Status color added to "create conversation" (refers to ticket #22 in flyspray)	steckbrief	2015-06-19	5	-0/+34
\| \|
* \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	126	-0/+26180
\|/ \| \| \| \| \|	"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	-1/+19
\| \| \| \|	settings class
*	new settings to initialisation of Settings	lookshe	2015-04-12	1	-1/+1
\|
*	added settings for accepting and downloading files	lookshe	2015-04-12	1	-2/+16
\| \| \| \|	fix in Settings, initialize with same values like in preferences.xml
*	Color choose dialog	steckbrief	2015-04-11	1	-1/+8
\|
*	- Avoiding accessing shared preferences to know if emoticons should be ↵	steckbrief	2015-01-20	1	-0/+55
	parsed for every single message - Adding support to show online status in Conversations overview (configurable via the setting "send_button_status")