aboutsummaryrefslogtreecommitdiffstats
path: root/art (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebasesteckbrief2017-01-113-2/+480
|\
| * Custom toast view addedsteckbrief2017-01-113-0/+478
| |
* | update to beta-2 and new logo for betatrz/beta-2lookshe2016-04-063-3/+738
|/
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-1112-355/+2183
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Cleaned up logofiaxh2016-01-111-327/+364
| |
| * added setting to allow for white backgrounds in incoming message bubblesDaniel Gultsch2015-08-242-0/+166
| |
| * OMEMO logofiaxh2015-08-091-0/+273
| |
| * add new received message bubble drawableDaniel Gultsch2015-07-292-0/+166
| |
| * decreased saturation of received message bubbles by 25 unitsDaniel Gultsch2015-07-211-1/+1
| |
| * changed message bubble appearanceRaphael Pohl2015-07-203-26/+432
| |
| * changed switch widgetDaniel Gultsch2015-07-186-1/+782
| |
| * added choose picture as another quick action. fixes #1221Daniel Gultsch2015-05-265-0/+224
| |
| * changed conversation red to material redDaniel Gultsch2015-05-105-6/+6
| |
| * turn send button in cancel button while in whisper modeDaniel Gultsch2015-05-035-0/+220
| |
| * replace send button with quick action button as long as no text has been enteredDaniel Gultsch2015-05-0218-19/+914
| |
* | Notification icon source svg file addedsteckbrief2016-01-151-0/+229
| |
* | New logo added, fixes FS#56steckbrief2015-10-042-1/+449
| |
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-1126-19/+1358
|/
* Use Material Design Icons on API 21+Sam Whited2015-01-291-0/+1
|
* Update logo in art folderSam Whited2014-12-041-0/+0
|
* Updated launcher icon: Bigger circlesIlia Rostovtsev2014-11-181-113/+78
|
* Notification icon: Solid versionIlia Rostovtsev2014-11-181-115/+52
|
* Notification icon: Dashed-solid versionIlia Rostovtsev2014-11-181-0/+400
| | | Keeping this icon in case it's needed later
* slightly modified logo / launcher iconiNPUTmice2014-11-173-416/+37
|
* adjust path in render scriptM. Dietrich2014-11-011-1/+1
|
* beautify render script to be easier to diff/patchM. Dietrich2014-10-151-2/+12
|
* reworked muc details and contact details a bitiNPUTmice2014-10-132-109/+1
|
* added rendered version of logoiNPUTmice2014-10-121-0/+0
|
* let's own otr-fingerprint copy to clipboard.Michael2014-10-032-1/+109
|
* changed security indicator and changed opacity of received tick to match the ↵iNPUTmice2014-09-201-0/+0
| | | | text
* indicates received messages with a tick.Michael2014-09-202-1/+77
|
* IT'S CHRISTMAS ALREADY!iNPUTmice2014-09-101-0/+69
|
* added rendering script for artworkiNPUTmice2014-06-241-0/+12
|
* changed opacityiNPUTmice2014-06-245-1240/+119
|
* added license file. plus renamingiNPUTmice2014-06-244-0/+1587
|
* Create conversation_mono.svgdiesys2014-06-231-0/+400
|
* conversation_baloon.svgdiesys2014-06-231-0/+381
|
* conversation.svgdiesys2014-06-231-0/+381
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 01:22:02 +0000