conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Implements FS#173: Move access to colors to separate helper class	steckbrief	2016-03-29	1	-1/+1
\|
*	One more fix in Message.equals() (FS#104)	lookshe	2016-03-21	1	-4/+19
\|
*	FS#104 - Fix Message.equals()	lookshe	2016-03-20	1	-18/+14
\|
*	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	1	-11/+2
\|
*	completely implements FS#161	lookshe	2016-03-17	1	-9/+31
\| \| \| \|	save state of treatAsDownloadable() and set on error to specified value
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-12	2	-9/+22
\|
*	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	2	-106/+3
\|
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	5	-36/+118
\|
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	12	-543/+1166
\|
*	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	1	-2/+1
\|
*	Implements FS#67: Introduce central logging class to use log prefix, new ↵	steckbrief	2015-11-20	1	-11/+11
\| \| \| \|	activity to show logcat output and button to copy contents
*	Access to preferences moved to global utility class ↵	steckbrief	2015-10-21	1	-1/+2
\| \| \| \|	ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-16	4	-29/+51
\| \| \| \| \| \|	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	1	-1/+1
\|
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	11	-218/+328
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
*	Status color added to "create conversation" (refers to ticket #22 in flyspray)	steckbrief	2015-06-19	3	-0/+15
\|
*	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	14	-0/+3447
	"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed