archive/conversations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
conversations/art
History
Exact
lookshe 327cfb8ae5 Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet) 
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
2016-05-26 17:46:58 +02: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
conversations_plus_beta_baloons.svg update to beta-2 and new logo for beta 2016-04-06 00:08:12 +02:00
conversations_plus_beta_baloons_notification.svg update to beta-2 and new logo for beta 2016-04-06 00:08:12 +02: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 Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet) 2016-05-26 17:46:58 +02:00