aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Added columns to fileparams table: url, original file name, key and ivtrz/beta-5steckbrief2017-01-041-0/+3
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-0/+5
|\
| * Implements FS#235: Deletion of remote files uploaded via httpuploadsteckbrief2016-09-291-0/+3
| * Fixes FS#229: prompt for confirmation before deleting a filesteckbrief2016-08-231-0/+1
| * Basic filetransfer http delete implementation; Exceptions for IqPacketError a...steckbrief2016-08-221-0/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-0/+1
|\|
| * Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-181-4/+10
| |\
| * | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-171-0/+1
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-181-2/+0
|\ \ \ | | |/ | |/|
| * | Related to FS#199: fixed merge hickups (message correction setting removed, k...steckbrief2016-04-181-2/+0
| * | removed unused stringlookshe2016-04-171-1/+0
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-2/+11
| |\ \ | |/ / |/| / | |/
* | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-4/+12
|\ \
| * | add setting for quick sharingDaniel Gultsch2016-04-141-0/+4
| * | added share uri button to conference detailsDaniel Gultsch2016-04-121-0/+2
| * | introduced setting to turn of notification ledDaniel Gultsch2016-04-091-3/+5
| * | check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-0/+1
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-071-0/+1
|\ \ \ | | |/ | |/|
| * | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-071-0/+1
| * | conversations->conversations+lookshe2016-04-031-14/+14
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-251-0/+1
| |\ \ | |/ / |/| |
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-0/+1
|\ \ \ | | |/ | |/|
| * | allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-0/+1
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-231-2/+2
|\ \ \ | | |/ | |/|
| * | pulled from transifexlookshe2016-03-231-2/+2
| * | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-0/+3
| |\ \ | |/ / |/| |
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-0/+6
| |\ \
| * \ \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-282/+393
| |\ \ \
* | \ \ \ Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+3
* | | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-0/+6
|\| | | | |_|/ |/| |
| * | 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-041-0/+1
| * | expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-011-0/+2
| * | let users confirm each member in a conference even if that contact is already...Daniel Gultsch2016-03-011-0/+1
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-0/+2
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-3/+0
* | | externalized string 'Retry decryption'trz/merge_1.10.1steckbrief2016-02-281-0/+1
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-3/+5
|\| |
| * | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-0/+2
| * | Retry decryption from message menufiaxh2016-02-231-1/+0
| * | 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-231-2/+0
* | | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-231-1/+0
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-15/+18
|\| |
| * | 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-161-15/+17
| * | basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-0/+2