aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixed placeholder string for message input boxsteckbrief2016-02-121-1/+1
|
* Fixed XML errors after mergesteckbrief2016-02-112-0/+3
|
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-116-301/+433
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-0/+2
| |
| * 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-251-0/+3
| |
| * added FormWrapper and form field validationDaniel Gultsch2016-01-231-0/+1
| |
| * changed spacing in create dialogs and notify user when no accounts are activatedDaniel Gultsch2016-01-221-0/+1
| |
| * show toast when image cropper get oomDaniel Gultsch2016-01-151-0/+1
| |
| * show key fetch error in activity when there are no keys to be usedDaniel Gultsch2016-01-131-0/+1
| |
| * s/TOR/Tor/gSam Whited2016-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...
| * don't use the word phone in stringsDaniel Gultsch2016-01-111-6/+5
| |
| * ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-0/+4
| |
| * let the user decide on whether or not to compress picturesDaniel Gultsch2016-01-092-1/+17
| |
| * 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-081-2/+4
| |
| * Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-041-0/+2
| | | | | | | | | | fixes #1611 fixes #1602
| * code cleanupDaniel Gultsch2015-12-231-0/+1
| |
| * show certificate informationDaniel Gultsch2015-12-231-0/+7
| |
| * modified contact permission dialogDaniel Gultsch2015-12-071-2/+1
| |
| * ask for contact permissions when first opening StartConversationActivityDaniel Gultsch2015-12-071-0/+3
| |
| * request storage permission when needed on Android 6.0Daniel Gultsch2015-12-071-0/+1
| |
| * implement direct sharing in android 6.0. fixes #1321Daniel Gultsch2015-12-071-0/+3
| |
| * renamed x509 verified omemo to v\OMEMODaniel Gultsch2015-12-021-3/+3
| |
| * Merge pull request #1545 from SamWhited/show_new_contact_request_messagesDaniel Gultsch2015-12-021-2/+2
| |\ | | | | | | Show status message when contact requests presence
| | * s/.../…/ in default stringsSam Whited2015-12-011-2/+2
| | |
| * | users are now able to crop their avatar pictures using the android-cropPhilip Flohr2015-12-021-0/+1
| | | | | | | | | | | | library
| * | hide message content in notifications in paranoia modeDaniel Gultsch2015-12-021-0/+4
| |/
| * introduce config.java variable to optionally show number of connected ↵Daniel Gultsch2015-12-011-0/+1
| | | | | | | | accounts in notification
| * add error state for unavailable tor networkDaniel Gultsch2015-12-011-1/+1
| |
| * initial tor supportDaniel Gultsch2015-12-011-0/+8
| |
| * indicate cbe in chat message hintDaniel Gultsch2015-10-311-2/+3
| |
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-0/+2
| |
| * Show PGP "please wait" message only when actually decryptingfiaxh2015-10-281-1/+2
| |
| * open manage account + certificate chooser when cbe mode is enabledDaniel Gultsch2015-10-201-0/+1
| |
| * improved error reporting in trust keys activityDaniel Gultsch2015-10-171-0/+2
| |
| * changed some source stringsDaniel Gultsch2015-10-141-2/+2
| |
| * add config variable to enable x509 verificationDaniel Gultsch2015-10-121-1/+1
| |
| * add menu item in account details to renew certificateDaniel Gultsch2015-10-111-1/+4
| |
| * Captcha support.Armin Novak2015-10-111-0/+3
| |
| * Fixed a typo in string.xmlSafwat Halaby2015-10-101-1/+1
| |
| * initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-091-0/+3
| |
| * introduced expert options to set status to away and xa if screen is off or ↵Daniel Gultsch2015-10-081-0/+5
| | | | | | | | if phone is silenced
| * Export logs to SD card preferencefiaxh2015-09-211-0/+3
| |
| * added possibiltiy to set conferences as moderated (only visible in advanced ↵Daniel Gultsch2015-09-131-1/+3
| | | | | | | | mode)
| * indicate broken pep in server infoDaniel Gultsch2015-09-061-0/+1
| |
| * added special error state for dns timeoutDaniel Gultsch2015-09-011-0/+1
| |
| * added XEP number for http file uploadDaniel Gultsch2015-08-271-2/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 10:29:47 +0000