aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values (follow)
Commit message (Expand)AuthorAgeFilesLines
* added missing strings/translationsChristian S2016-02-061-0/+1
* Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-041-0/+4
|\
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-0/+1
| * 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
* | Merge branch 'siacs/master'Christian S2016-01-311-0/+4
|\|
| * expert setting to trigger extended connection optionsDaniel Gultsch2016-01-251-0/+3
| * added FormWrapper and form field validationDaniel Gultsch2016-01-231-0/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-0/+1
|\|
| * changed spacing in create dialogs and notify user when no accounts are activatedDaniel Gultsch2016-01-221-0/+1
* | show warning on back pressed during update checkChristian S2016-01-221-1/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-01-161-0/+1
|\|
| * show toast when image cropper get oomDaniel Gultsch2016-01-151-0/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-131-8/+11
|\|
| * 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
* | add missing stringsChristian S2016-01-101-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-102-4/+21
|\|
| * 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
* | copy commitsChristian S2016-01-041-0/+2
|\|
| * Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-041-0/+2
* | copy commitsChristian S2015-12-281-0/+8
|\|
| * code cleanupDaniel Gultsch2015-12-231-0/+1
| * show certificate informationDaniel Gultsch2015-12-231-0/+7
* | modified stringsChristian S2015-12-161-20/+1
* | copy commitsChristian S2015-12-161-0/+20
|\|
| * 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
* | modified stringsChristian S2015-12-121-1/+1
* | modified contact permission dialogDaniel Gultsch2015-12-121-2/+1
* | ask for contact permissions when first opening StartConversationActivityDaniel Gultsch2015-12-121-0/+3
* | request storage permission when needed on Android 6.0Daniel Gultsch2015-12-121-0/+1
* | implement direct sharing in android 6.0. fixes #1321Daniel Gultsch2015-12-111-0/+3
* | updated stringsChristian S2015-12-041-1/+1