aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-151-2/+3
|\|
| * pulled translations for 1.9.0 release from transifexDaniel Gultsch2016-01-1420-26/+169
| |
* | rename axolotlChristian S2016-01-151-1/+1
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-01-1329-45/+91
|\|
| * show key fetch error in activity when there are no keys to be usedDaniel Gultsch2016-01-131-0/+1
| |
| * Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-01-121-2/+2
| |\
| | * s/TOR/Tor/gSam Whited2016-01-121-2/+2
| | |
| * | pulled translations from transifexDaniel Gultsch2016-01-1225-75/+117
| |/
| * use match_parent as height in conversations overviewDaniel Gultsch2016-01-121-2/+2
| |
| * Revert "Add additional warnings to OMEMO purge key function"Daniel Gultsch2016-01-121-2/+0
| | | | | | | | This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03.
| * Add additional warnings to OMEMO purge key functionAndreas Straub2016-01-121-0/+2
| | | | | | | | | | | | People continue to press the "don't press this" button. Maybe adding some warnings indicating that this button will not fix their problems will help...
| * new art rendersDaniel Gultsch2016-01-1125-0/+0
| |
| * don't use the word phone in stringsDaniel Gultsch2016-01-111-6/+5
| |
| * pulled translations from transifexDaniel Gultsch2016-01-1125-63/+14
| |
| * ask to be excluded from battery optimizationDaniel Gultsch2016-01-112-169/+216
| |
* | add missing stringsChristian S2016-01-102-1/+17
| |
* | Merge branch 'development' of https://github.com/kriztan/Pix-Art-Messenger ↵Christian S2016-01-101-0/+2
|\ \ | | | | | | | | | into development
| * | added missing german stringsChristian S2016-01-051-0/+2
| | |
* | | 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
| | | | | | | | | | fixes #1611 fixes #1602
| * 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
| |\ | | | | | | Show status message when contact requests presence
| | * 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
| | | | | | | | | | | | library
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 09:23:20 +0000