aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'siacs/master' into developmentChristian S2016-01-1025-98/+164
|\
| * let the user decide on whether or not to compress picturesDaniel Gultsch2016-01-093-11/+33
| * 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-088-8/+31
| * show icon in conversations overview when notifications are disabledDaniel Gultsch2016-01-0816-76/+97
* | copy commitsChristian S2016-01-043-2/+10
|\|
| * Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-043-2/+10
| * properly rotate avatarsDaniel Gultsch2016-01-041-2/+2
* | hide settings, accounts and updater in all menus except in main windowChristian S2015-12-293-31/+0
* | deduplicate stringsChristian S2015-12-281-8/+2
* | copy commitsChristian S2015-12-283-2/+104
|\|
| * code cleanupDaniel Gultsch2015-12-231-0/+1
| * show certificate informationDaniel Gultsch2015-12-232-0/+95
| * pulled translations from transifexDaniel Gultsch2015-12-202-6/+44
| * pulled translations from transifexDaniel Gultsch2015-12-175-35/+429
* | corrected stringsChristian S2015-12-161-21/+0
* | modified stringsChristian S2015-12-162-51/+2
* | copy commitsChristian S2015-12-162-15/+89
|\|
| * pulled translations from transifexDaniel Gultsch2015-12-133-7/+106
| * pulled translations from transifexDaniel Gultsch2015-12-112-2/+38
| * pulled translations from transifexDaniel Gultsch2015-12-078-11/+234
| * 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
| * pulled new translations from transifexDaniel Gultsch2015-12-0226-285/+879
| * 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
| |/
| * introduced build-time paranoia mode that disables unencrypted chats and force...Daniel Gultsch2015-12-011-1/+3
| * 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-014-1/+73
* | modified stringsChristian S2015-12-122-1/+7
* | 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
* | renamed axolotl to omemoChristian S2015-12-041-1/+1
* | updated stringsChristian S2015-12-042-2/+19
* | 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
* | introduced build-time paranoia mode that disables unencrypted chats a…Daniel Gultsch2015-12-041-1/+3
* | 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-044-63/+148
* | little layout improvementsChristian S2015-11-292-4/+8
* | reordered settings menuChristian S2015-11-291-18/+21