conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	axolotl resources changed from maven to jcenter	steckbrief	2016-02-12	4	-0/+0
\|
*	Some runtime dependencies added	steckbrief	2016-02-11	2	-0/+0
\|
*	Fixed third party library references in gradle	steckbrief	2016-02-11	24	-35/+0
\|
*	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	43	-1794/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .travis.yml CHANGELOG.md README.md art/render.rb build.gradle libs/openpgp-api-lib/build.gradle settings.gradle src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/entities/Account.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/entities/DownloadableFile.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/entities/MucOptions.java src/main/java/eu/siacs/conversations/entities/Transferable.java src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.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/AbstractConnectionManager.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.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/AccountAdapter.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/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/CryptoHelper.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/PhoneHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/utils/Xmlns.java src/main/java/eu/siacs/conversations/xml/XmlReader.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java src/main/res/drawable-hdpi/ic_launcher.png src/main/res/drawable-hdpi/ic_notification.png src/main/res/drawable-mdpi/ic_launcher.png src/main/res/drawable-mdpi/ic_notification.png src/main/res/drawable-xhdpi/ic_launcher.png src/main/res/drawable-xhdpi/ic_notification.png src/main/res/drawable-xxhdpi/ic_launcher.png src/main/res/drawable-xxhdpi/ic_notification.png src/main/res/drawable-xxxhdpi/ic_launcher.png src/main/res/drawable-xxxhdpi/ic_notification.png src/main/res/layout/account_row.xml src/main/res/layout/activity_about.xml src/main/res/layout/activity_change_password.xml src/main/res/layout/activity_contact_details.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/activity_publish_profile_picture.xml src/main/res/layout/activity_verify_otr.xml src/main/res/layout/contact.xml src/main/res/layout/contact_key.xml src/main/res/layout/conversation_list_row.xml src/main/res/layout/enter_jid_dialog.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/join_conference_dialog.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/layout/message_status.xml src/main/res/layout/quickedit.xml src/main/res/values-ar-rEG/strings.xml src/main/res/values-bg/strings.xml src/main/res/values-ca/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-el/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-fa-rIR/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-iw/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ko/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ru/strings.xml src/main/res/values-sk/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-v21/themes.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/arrays.xml src/main/res/values/colors.xml src/main/res/values/dimens.xml src/main/res/values/strings.xml src/main/res/values/themes.xml src/main/res/xml/preferences.xml
\| *	Use OpenPGP-API 9.0	fiaxh	2015-11-09	44	-1829/+0
\| \|
\| *	really update build tools	Daniel Gultsch	2015-06-02	2	-2/+2
\| \|
* \|	Log error in case logcat command could not be executed; Show toast in case ↵	steckbrief	2015-12-17	2	-6/+39
\| \| \| \| \| \| \| \|	nothing is copied
* \|	Fixes FS#88, Code cleanup	steckbrief	2015-12-14	1	-4/+5
\| \|
* \|	Fixes FS#88: Avoid smilie repacement in time messages	steckbrief	2015-12-14	1	-4/+9
\| \|
* \|	Build cleanup: libraries added as local resources, removed unused proguard ↵	steckbrief	2015-12-14	27	-2180/+0
\| \| \| \| \| \| \| \|	configs, removed SwipyRefreshLayout as module and added as binary dependency, moved 3rd party binaries to separate folder
* \|	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	12	-1/+496
\| \|
* \|	Implements FS#83: Reload from last received message	steckbrief	2015-12-04	9	-0/+2112
\| \|
* \|	fixes FS#42 - Smilie replacement in url	lookshe	2015-08-21	1	-1/+25
\| \|
* \|	fix wrong class type usage	lookshe	2015-08-16	1	-2/+1
\| \|
* \|	fixes FS#13 - Change smiley replacement patterns to be case insensitive	lookshe	2015-08-16	1	-34/+18
\| \|
* \|	Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module	lookshe	2015-08-16	20	-0/+115
\| \|
* \|	Merged https://github.com/ankushsachdeva/emojicon/pull/16	lookshe	2015-08-15	1	-4/+24
\| \|
* \|	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	2	-2/+2
\| \|
* \|	moved color picker to libs	lookshe	2015-04-15	34	-0/+852
\| \|
* \|	whatsapp-like smiley implementation	lookshe	2015-04-12	1018	-0/+4064
\| \|
* \|	Merge master-origin	steckbrief	2015-02-20	23	-2948/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Switch to maven central minidns	Rene Treffer	2015-01-14	23	-2948/+0
\| \|
* \|	changes to get it working under eclipse	lookshe	2015-01-10	9	-0/+30
\|/
*	update android gradle plugin to 0.14.4	Michael	2014-11-22	1	-2/+5
\| \| \| \| \|	to work with AS >= 0.9.0 plugin >= 0.14.0 is required also update gradle to 2.2.
*	Subtree merged in openpgp api lib	Sam Whited	2014-10-28	45	-6/+1829
\|
*	Subtree merged in minidns	Sam Whited	2014-10-28	23	-0/+2945
\|
*	Remove minidns dir	Sam Whited	2014-10-28	1	-6/+0
\|
*	Subtree merged in MemorizingTrustManager	Sam Whited	2014-10-28	35	-0/+1875
\|
*	Move submodules back to libs/	Sam Whited	2014-10-26	3	-0/+12
\|
*	Pull otr4j form Maven repo	Sam Whited	2014-10-26	1	-0/+0
\|
*	Suppress lint errors and remove bcprov	Sam Whited	2014-10-22	1	-0/+0
\|
*	Add build deps and move build props to build file	Sam Whited	2014-10-22	2	-0/+0