aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | merged string resourcessteckbrief2016-02-232-6/+0
| | |
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-2261-202/+1709
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml src/main/res/values-cs/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-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml
| * | pulled translations from transifexDaniel Gultsch2016-02-202-0/+49
| | |
| * | pulled translations from transifexDaniel Gultsch2016-02-1929-253/+212
| | |
| * | made clear that archiving preferences are server sideDaniel Gultsch2016-02-161-4/+4
| | |
| * | added setting to opt-out of message correction. renamed preferences and ↵Daniel Gultsch2016-02-162-16/+23
| | | | | | | | | | | | options to settings
| * | basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-1532-2/+28
| | |
| * | pulled translations from transifexDaniel Gultsch2016-02-1511-9/+656
| | |
| * | client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-122-2/+22
| | |
| * | pulled translations from transifexDaniel Gultsch2016-02-115-16/+768
| | |
* | | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-164-15/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values/arrays.xml
| * | allow user to set MAM preferencesDaniel Gultsch2016-02-093-15/+29
| | |
| * | prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-042-0/+10
| | |
* | | Unused preference 'picture_compression'. This feature is configured in our ↵steckbrief2016-02-1319-52/+0
| | | | | | | | | | | | variant via 'resize_picture'
* | | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-1221-47/+4
| | |
* | | Fixed placeholder string for message input boxsteckbrief2016-02-122-2/+2
| | |
* | | Fixed layout issue with emojicon tastatur buttonsteckbrief2016-02-121-1/+0
| | |
* | | Fixed XML errors after mergesteckbrief2016-02-116-8/+14
| | |
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-11158-2075/+6063
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-012-0/+8
| | |
| * | refactored user handling in conferences. show try again button when ↵Daniel Gultsch2016-02-011-0/+1
| | | | | | | | | | | | conference has errors
| * | expert setting to trigger extended connection optionsDaniel Gultsch2016-01-252-0/+8
| | |
| * | added FormWrapper and form field validationDaniel Gultsch2016-01-231-0/+1
| | |
| * | introduced boolean form field wrapperDaniel Gultsch2016-01-232-1/+14
| | |
| * | added UI wrapper for (some) form fieldsDaniel Gultsch2016-01-221-0/+21
| | |
| * | changed spacing in create dialogs and notify user when no accounts are activatedDaniel Gultsch2016-01-223-6/+11
| | |
| * | increased padding in create contact/conference dialogDaniel Gultsch2016-01-212-15/+21
| | |
| * | pulled translations from transifexDaniel Gultsch2016-01-2015-13/+718
| | |
| * | pulled translations from transifexDaniel Gultsch2016-01-164-3/+49
| | |
| * | show toast when image cropper get oomDaniel Gultsch2016-01-151-0/+1
| | |
| * | pulled translations for 1.9.0 release from transifexDaniel Gultsch2016-01-1420-26/+169
| | |
| * | show key fetch error in activity when there are no keys to be usedDaniel Gultsch2016-01-131-0/+1
| | |
| * | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-01-121-2/+2
| |\ \
| | * | s/TOR/Tor/gSam Whited2016-01-121-2/+2
| | | |
| * | | pulled translations from transifexDaniel Gultsch2016-01-1225-75/+117
| |/ /
| * | use match_parent as height in conversations overviewDaniel Gultsch2016-01-121-2/+2
| | |
| * | Revert "Add additional warnings to OMEMO purge key function"Daniel Gultsch2016-01-121-2/+0
| | | | | | | | | | | | This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03.
| * | Add additional warnings to OMEMO purge key functionAndreas Straub2016-01-121-0/+2
| | | | | | | | | | | | | | | | | | People continue to press the "don't press this" button. Maybe adding some warnings indicating that this button will not fix their problems will help...
| * | new art rendersDaniel Gultsch2016-01-1125-0/+0
| | |
| * | don't use the word phone in stringsDaniel Gultsch2016-01-111-6/+5
| | |
| * | pulled translations from transifexDaniel Gultsch2016-01-1125-63/+14
| | |
| * | ask to be excluded from battery optimizationDaniel Gultsch2016-01-112-169/+216
| | |
| * | let the user decide on whether or not to compress picturesDaniel Gultsch2016-01-093-11/+33
| | |
| * | don't show snackbar when notifications are disabled or pausedDaniel Gultsch2016-01-081-1/+0
| | |
| * | show per conference notification settings in details activityDaniel Gultsch2016-01-088-8/+31
| | |
| * | show icon in conversations overview when notifications are disabledDaniel Gultsch2016-01-0816-76/+97
| | |
| * | Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-043-2/+10
| | | | | | | | | | | | | | | fixes #1611 fixes #1602
| * | properly rotate avatarsDaniel Gultsch2016-01-041-2/+2
| | |
| * | code cleanupDaniel Gultsch2015-12-231-0/+1
| | |
| * | show certificate informationDaniel Gultsch2015-12-232-0/+95
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 08:04:10 +0000