aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebaselookshe2016-03-2332-317/+450
|\
| * pulled from transifexlookshe2016-03-2332-317/+450
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-207-4/+15
|\|
| * Fixes FS#143 - Displaying of emoticons too largelookshe2016-03-207-4/+15
| * Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-206-105/+438
| |\
* | \ Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1lookshe2016-03-201-1/+2
|\ \ \ | |_|/ |/| |
| * | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+2
| |\|
| | * Refs FS#140: Rework message displaysteckbrief2016-03-131-1/+2
* | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-176-105/+438
|\ \ \ | |/ / |/| |
| * | reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+3
| * | pulled translations from transifexDaniel Gultsch2016-03-135-106/+443
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-116-62/+3
|\ \ \ | | |/ | |/|
| * | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-116-61/+3
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-101-8/+0
|\| |
| * | Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-101-8/+0
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-081-1/+2
|\| |
| * | Merge remote branch 'master'steckbrief2016-03-082-4/+0
| |\ \
| * | | Fixes FS#145: Dialog for decision in Android 5steckbrief2016-03-081-1/+2
* | | | Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1lookshe2016-03-082-4/+0
|\ \ \ \ | | |/ / | |/| |
| * | | reset link and highlight colors to system defaultsteckbrief2016-03-082-4/+0
| |/ /
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0838-131/+319
| |\ \ | |/ / |/| |
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-072-9/+0
| |\ \
| * \ \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-06167-2197/+7492
| |\ \ \
* | \ \ \ Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-0838-131/+319
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | pulled translations from transifexDaniel Gultsch2016-03-0628-82/+272
| * | | warn in conversations when account is disabledDaniel Gultsch2016-03-061-0/+1
| * | | show host in file size checkerDaniel Gultsch2016-03-041-0/+1
| * | | don't automatically crop avatarDaniel Gultsch2016-03-047-0/+9
| * | | expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-012-0/+8
| * | | let users confirm each member in a conference even if that contact is already...Daniel Gultsch2016-03-012-26/+35
| * | | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-292-26/+34
* | | | Finally fixes FS#142lookshe2016-03-072-9/+0
| |_|/ |/| |
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-025-3/+16
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-0224-72/+2
* | | externalized string 'Retry decryption'trz/merge_1.10.1steckbrief2016-02-283-1/+3
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-283-4/+9
|\| |
| * | disallow message correction by default. fixes #1720Daniel Gultsch2016-02-261-1/+1
| * | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-0/+2
| * | Retry decryption from message menufiaxh2016-02-232-1/+4
| * | turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-221-2/+3
* | | Fixes FS#89 after merge conflictsteckbrief2016-02-241-3/+6
* | | Removed stupid message correctionsteckbrief2016-02-2328-57/+0
* | | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-2316-24/+0
* | | merged string resourcessteckbrief2016-02-232-6/+0
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-2261-202/+1709
|\| |
| * | pulled translations from transifexDaniel Gultsch2016-02-202-0/+49
| * | pulled translations from transifexDaniel Gultsch2016-02-1929-253/+212
| * | 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-162-16/+23
| * | basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-1532-2/+28