aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | show warning when trying to highlight users that have left the conferenceDaniel Gultsch2015-07-221-0/+1
| | |
| * | treat private, non-anonymous mucs like 1:1 chats notification wiseDaniel Gultsch2015-07-221-2/+2
| | |
| * | allow for private messages being started from muc details in anonymous mucsDaniel Gultsch2015-07-211-0/+1
| | |
| * | Add purge axolotl key optionAndreas Straub2015-07-201-0/+3
| | | | | | | | | | | | Can now long-press a key to permanently purge it.
| * | Add clear devices to overflow menu in EditAccountAndreas Straub2015-07-191-0/+2
| | |
| * | Ask for key trust when sending messagesAndreas Straub2015-07-191-0/+3
| | | | | | | | | | | | | | | | | | If the contact (or the own account) has keys that have UNDECIDED trust, we now drop the user into the new TrustKeysActivity, where they have to decide for each new key whether it should be TRUSTED or UNTRUSTED.
| * | Refactor trust key ui and show in account detailsAndreas Straub2015-07-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored the trust key row UI element so it can be used in multiple places. It now also uses a slider to toggle the trust state, and the redundant trust state description was removed. EditAccountActivity now shows the keys of other devices associated with that account.
| * | Display axolotl chat message hintAndreas Straub2015-07-191-0/+1
| | |
| * | Add basic PEP managemend UI to EditAccountActivityAndreas Straub2015-07-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | EditAccountActivity now show own fingerprint, and gives an option to regenerate local keying material (and wipe all sessions associated with the old keys in the process). It also now displays a list of other own devices, and gives an option to remove all but the current device.
| * | CryptoNext Menu entries addedAndreas Straub2015-07-191-0/+1
| | |
| * | version bump to 1.5.0-beta.2Daniel Gultsch2015-07-161-1/+1
| | |
| * | made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-161-2/+1
| | |
| * | renamed colorsDaniel Gultsch2015-07-131-0/+1
| | |
| * | display toast in ui on failed http downloadDaniel Gultsch2015-07-101-0/+1
| | | | | | | | | | | | fixes #954
| * | refactored message context menuDaniel Gultsch2015-07-021-3/+2
| | |
| * | replace send button with quick action button as long as no text has been enteredDaniel Gultsch2015-05-021-404/+409
| | |
| * | Add option to remove manually approved certificatesBrianBlade2015-04-191-0/+11
| | | | | | | | | | | | | | | | | | | | | - "Remove certificates" option brings up a dialog that allows to delete certificates from MemorizingTrustManager's keystore - Reconnect active accounts when certificate-settings are changed - new preference category "Certificate options"
| * | Merge branch 'dont_trust_cas_preference' of ↵iNPUTmice2015-04-141-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference Conflicts: src/main/res/values-de/strings.xml src/main/res/values/strings.xml
| | * | Add option to use MTM without default TrustManagerBrianBlade2015-04-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add a new "Don't trust system CAs" preference under advanced options that will change the behaviour of the MemorizingTrustManager. All formerly unknown certificates will raise a warning if checked.
| * | | Enable end-conversation by swipe gestureBrianBlade2015-04-081-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4 to enable swipe-out for ListViews Re-enable selectableItemBackground Dont end selectedConversation on swipe Call mConversationFragment.reinit() instead. Add separate undo string for swipe MUC. Add blacklistedConversation for undo swipe Update title_undo_swipe_* strings Fix undo(), rename blacklistedConversation Fix discardUndo(); re-init selectedConversation maintain scroll position after undo clear notification when dismissing a conversation modified / simplified maintain scroll position code simplify handling of selectedConversation change undo_muc string, remove notifyDataSetChanged()
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-151-0/+1
|\ \ \ | | |/ | |/|
| * | Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-01-151-0/+1
| | |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-171-0/+1
|\| |
| * | Log error in case logcat command could not be executed; Show toast in case ↵steckbrief2015-12-171-0/+1
| | | | | | | | | | | | nothing is copied
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-161-0/+5
|\| |
| * | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵steckbrief2015-12-161-0/+5
| | | | | | | | | | | | distinguishes between image resizing and compressing/saving
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-3/+6
|\| |
| * | Implements FS#89 - Change about informationsteckbrief2015-12-041-3/+6
| | |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-0/+6
|\| |
| * | Partially implements FS#6: Conference ID changed to c+bugs@conferesteckbrief2015-11-201-0/+1
| | | | | | | | | | | | nce.thedevstack.de
| * | Implements FS#67: Introduce central logging class to use log prefix, new ↵steckbrief2015-11-201-0/+5
| | | | | | | | | | | | activity to show logcat output and button to copy contents
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-031-0/+9
|\| |
| * | Implements FS#26: Introduction of dialog to choose whether to resize a ↵steckbrief2015-11-031-0/+4
| | | | | | | | | | | | picture or not
| * | Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-301-0/+5
| | |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-231-2/+2
|\| |
| * | Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵steckbrief2015-10-231-2/+2
| | | | | | | | | | | | values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class
* | | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-051-0/+25
|\| | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
| * | Publishing additional information in message details dialog such as message ↵steckbrief2015-10-041-0/+21
| | | | | | | | | | | | type and message status
| * | Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵steckbrief2015-10-041-0/+4
| | | | | | | | | | | | | | | | | | | | | Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added
| * | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-111-129/+152
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java src/main/java/de/thedevstack/conversationsplus/entities/Account.java src/main/java/de/thedevstack/conversationsplus/entities/Contact.java src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java src/main/java/de/thedevstack/conversationsplus/entities/Message.java src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java src/main/java/eu/siacs/conversations/crypto/OtrEngine.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java src/main/java/eu/siacs/conversations/http/HttpConnection.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/res/layout/activity_about.xml
| * | App-Name changed to "Conversations+" in strings.xmlsteckbrief2015-06-191-1/+1
| | |
* | | Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-129/+152
|/ /
* | changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-141-3/+4
| | | | | | | | settings class
* | added settings for accepting and downloading fileslookshe2015-04-121-1/+7
| | | | | | | | fix in Settings, initialize with same values like in preferences.xml
* | differ between received and read messagelookshe2015-04-111-1/+3
| |
* | no trim of messages or passwordlookshe2015-04-111-0/+3
| | | | | | | | check password with only spaces separately
* | Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-0/+14
|\| | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml
| * Added multiple select to Choose Contact ActivityAndreas Straub2015-03-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing the Choose Contact Activity a boolean called "multiple" set to true, it now allows the user to select multiple contacts. Long pressing a contact enters multiple selection mode and the selection is confirmed using a button in the CAB. The Activity returns whether or not multiple contacts were selected using the same boolean. If multiple contacts were selected, an array of JID strings called "contacts" is returned. The Choose Contact Activity now also honors "filter_contacts", an array of strings containing JIDs that should not be displayed in the picker. The invite to conference dialog now uses this feature to enable inviting multiple contacts at once. Additionally, Invite Contact uses "filter_contacts" to only display contacts that are not yet participating in the conversation
| * show geo uris as 'location' in overviewiNPUTmice2015-03-101-0/+2
| |
| * display geo uris as location. show 'send loction' in share menu if request ↵iNPUTmice2015-03-071-0/+3
| | | | | | | | location intent can be resolved