aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-0/+1
* | | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-0/+4
|\| |
| * | allow user to set MAM preferencesDaniel Gultsch2016-02-091-0/+3
| * | prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-0/+1
* | | Unused preference 'picture_compression'. This feature is configured in our va...steckbrief2016-02-131-2/+0
* | | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-121-2/+0
* | | Fixed placeholder string for message input boxsteckbrief2016-02-121-1/+1
* | | Fixed XML errors after mergesteckbrief2016-02-111-0/+2
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-284/+388
|\| |
| * | opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-011-0/+2
| * | refactored user handling in conferences. show try again button when conferenc...Daniel Gultsch2016-02-011-0/+1
| * | expert setting to trigger extended connection optionsDaniel Gultsch2016-01-251-0/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 15:18:25 +0000