aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'siacs/master' into developmentChristian S2016-03-171-0/+3
|\|
| * reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+3
* | Merge branch 'siacs/master' into developmentChristian S2016-03-131-0/+1
|\|
| * warn in conversations when account is disabledDaniel Gultsch2016-03-061-0/+1
* | updated stringsChristian S2016-03-051-0/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-03-051-0/+2
|\|
| * show host in file size checkerDaniel Gultsch2016-03-041-0/+1
| * don't automatically crop avatarDaniel Gultsch2016-03-041-0/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-1/+3
|\|
| * 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
* | Merge branch 'siacs/master' into developmentChristian S2016-02-271-1/+2
|\|
| * 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
* | Merge branch 'siacs/master' into developmentChristian S2016-02-231-2/+3
|\|
| * turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-221-2/+3
* | Merge branch 'siacs/master' into developmentChristian S2016-02-201-13/+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
* | Merge branch 'siacs/master' into developmentChristian S2016-02-141-0/+4
|\|
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-0/+1
| * allow user to set MAM preferencesDaniel Gultsch2016-02-091-0/+3
* | added missing strings/translationsChristian S2016-02-061-0/+1
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-041-0/+4
|\|
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-0/+1
| * 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
* | Merge branch 'siacs/master'Christian S2016-01-311-0/+4
|\|
| * expert setting to trigger extended connection optionsDaniel Gultsch2016-01-251-0/+3
| * added FormWrapper and form field validationDaniel Gultsch2016-01-231-0/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-0/+1
|\|
| * changed spacing in create dialogs and notify user when no accounts are activatedDaniel Gultsch2016-01-221-0/+1
* | show warning on back pressed during update checkChristian S2016-01-221-1/+4
* | 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-131-8/+11
|\|
| * show key fetch error in activity when there are no keys to be usedDaniel Gultsch2016-01-131-0/+1
| * s/TOR/Tor/gSam Whited2016-01-121-2/+2
| * Revert "Add additional warnings to OMEMO purge key function"Daniel Gultsch2016-01-121-2/+0
| * Add additional warnings to OMEMO purge key functionAndreas Straub2016-01-121-0/+2
| * don't use the word phone in stringsDaniel Gultsch2016-01-111-6/+5
| * ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-0/+4
* | add missing stringsChristian S2016-01-101-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-101-4/+9
|\|
| * let the user decide on whether or not to compress picturesDaniel Gultsch2016-01-091-1/+5
| * 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-081-2/+4
* | copy commitsChristian S2016-01-041-0/+2
|\|
| * Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-041-0/+2