conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4	lookshe	2016-05-26	1	-1/+56
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: README.md art/render.rb build.gradle src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java src/main/java/eu/siacs/conversations/entities/Bookmark.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.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/ListItemAdapter.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/res/layout/activity_contact_details.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml
\| *	also save form elements in disco storage	Daniel Gultsch	2016-05-19	1	-2/+56
\| \|
\| *	use the same typo in both saving disco and reading disco	Daniel Gultsch	2016-05-15	1	-1/+2
\| \|
* \|	Merge tag '1.11.3' into trz/rebase	lookshe	2016-04-05	1	-2/+30
\|\\|
\| *	add methods to check max file size for http upload	Daniel Gultsch	2016-03-31	1	-0/+13
\| \|
\| *	include form fields into caps hash calculation	Daniel Gultsch	2016-03-31	1	-2/+17
\| \|
* \|	Reviewed commit for FS#34 after merge	steckbrief	2016-02-24	1	-1/+1
\|/
*	cache server caps	Daniel Gultsch	2016-02-03	1	-1/+18
\|
*	refactored disco cache. avoid making duplicate call. check hash	Daniel Gultsch	2016-02-03	1	-7/+13
\|
*	Persisitence and loading for ServiceDiscoveryResult	Stephen Paul Weber	2016-01-23	1	-10/+58
\|
*	Implement toJSON on ServiceDiscoveryResult	Stephen Paul Weber	2016-01-23	1	-0/+34
\|
*	Generate capHash from any discovery result	Stephen Paul Weber	2016-01-23	1	-4/+80
\|
*	Factor out a representation of XEP-0030 results	Stephen Paul Weber	2016-01-23	1	-0/+84
	And the parser from Element to this representation.