aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fixes FS#89 after merge conflictsteckbrief2016-02-241-3/+6
* Removed stupid message correctionsteckbrief2016-02-231-2/+0
* Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-231-1/+0
* Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-15/+18
|\
| * made clear that archiving preferences are server sideDaniel Gultsch2016-02-161-4/+4
| * added setting to opt-out of message correction. renamed preferences and optio...Daniel Gultsch2016-02-161-15/+17
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-0/+2
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-0/+1
* | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-0/+4
|\|
| * allow user to set MAM preferencesDaniel Gultsch2016-02-091-0/+3
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-0/+1
* | Unused preference 'picture_compression'. This feature is configured in our va...steckbrief2016-02-131-2/+0
* | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-121-2/+0
* | Fixed placeholder string for message input boxsteckbrief2016-02-121-1/+1
* | Fixed XML errors after mergesteckbrief2016-02-111-0/+2
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-284/+388
|\|
| * opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-011-0/+2
| * refactored user handling in conferences. show try again button when conferenc...Daniel Gultsch2016-02-011-0/+1
| * 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
| * Add additional warnings to OMEMO purge key functionAndreas Straub2016-01-121-0/+2
| * 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-091-1/+5
| * 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
| * 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
| |\
| | * 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
| * | hide message content in notifications in paranoia modeDaniel Gultsch2015-12-021-0/+4
| |/
| * introduce config.java variable to optionally show number of connected account...Daniel Gultsch2015-12-011-0/+1
| * 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