aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | renamed x509 verified omemo to v\OMEMODaniel Gultsch2015-12-041-3/+3
* | hide message content in notifications in paranoia modeDaniel Gultsch2015-12-041-0/+4
* | introduce config.java variable to optionally show number of connected…Daniel Gultsch2015-12-041-0/+1
* | add error state for unavailable tor networkDaniel Gultsch2015-12-041-0/+1
* | initial tor supportDaniel Gultsch2015-12-041-0/+8
* | added strings for plugin loaderChristian S2015-11-251-0/+4
* | Update arrays.xmlChristian S2015-11-251-2/+2
* | modified some stringsChristian S2015-11-151-8/+8
* | changed message background to light yellowChristian S2015-11-141-0/+1
* | rename Conversations to Pix-Art MessengerChristian S2015-11-141-12/+13
* | copy Avatar Crop patchChristian S2015-11-071-0/+1
|\ \
| * | users are now able to crop their avatar picturesPhilip Flohr2015-11-061-0/+1
| |/
* | Merge pull request #47 from siacs/masterChristian S2015-11-011-0/+3
|\|
| * indicate cbe in chat message hintDaniel Gultsch2015-10-311-2/+3
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-0/+2
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-311-1/+2
|\|
| * Show PGP "please wait" message only when actually decryptingfiaxh2015-10-281-1/+2
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-201-1/+1
|\|
| * open manage account + certificate chooser when cbe mode is enabledDaniel Gultsch2015-10-201-0/+1
* | copy commitsChristian S2015-10-171-0/+2
|\|
| * improved error reporting in trust keys activityDaniel Gultsch2015-10-171-0/+2