archive/conversations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
conversations/art
History
lookshe 3824eb172b Merge tag '1.9.3' into trz/merge_1.9.3 
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
2016-02-11 10:45:27 +01:00
..
conversations_baloon.svg Cleaned up logo 2016-01-11 15:57:24 +01:00
conversations_mono.svg Notification icon: Solid version 2014-11-18 00:55:50 +03:00
conversations_mono_dashed.svg Notification icon: Dashed-solid version 2014-11-18 00:55:20 +03:00
conversations_plus_baloons.svg New logo added, fixes FS#56 2015-10-04 14:49:45 +02:00
conversations_plus_baloons_notification.svg Notification icon source svg file added 2016-01-15 12:58:17 +01:00
ic_received_indicator.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_secure_indicator.xcf changed security indicator and changed opacity of received tick to match the text 2014-09-20 22:44:50 +02:00
ic_send_cancel_away.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_cancel_dnd.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_cancel_offline.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_cancel_online.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_location_away.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_location_dnd.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_location_offline.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_location_online.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_photo_away.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_photo_dnd.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_photo_offline.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_photo_online.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_picture_away.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_picture_dnd.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_picture_offline.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_picture_online.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_text_away.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_text_dnd.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_text_offline.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_text_online.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_voice_away.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_voice_dnd.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_voice_offline.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
ic_send_voice_online.svg Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
LICENSE added license file. plus renaming 2014-06-24 00:57:21 +02:00
logo.png Update logo in art folder 2014-12-04 09:35:38 -05:00
md_switch_thumb_disable.svg changed switch widget 2015-07-18 19:38:52 +02:00
md_switch_thumb_off_normal.svg changed switch widget 2015-07-18 19:38:52 +02:00
md_switch_thumb_off_pressed.svg changed switch widget 2015-07-18 19:38:52 +02:00
md_switch_thumb_on_normal.svg changed switch widget 2015-07-18 19:38:52 +02:00
md_switch_thumb_on_pressed.svg changed switch widget 2015-07-18 19:38:52 +02:00
message_bubble_received.svg decreased saturation of received message bubbles by 25 units 2015-07-21 18:29:24 +02:00
message_bubble_received_warning.svg add new received message bubble drawable 2015-07-29 02:01:28 +02:00
message_bubble_received_white.svg added setting to allow for white backgrounds in incoming message bubbles 2015-08-24 20:56:25 +02:00
message_bubble_sent.svg changed message bubble appearance 2015-07-20 16:02:17 +02:00
omemo_logo.svg OMEMO logo 2015-08-09 22:50:35 +02:00
render.rb New logo added, fixes FS#56 2015-10-04 14:49:45 +02:00