aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-091-0/+1
|\
| * pulled translations from transifexDaniel Gultsch2016-04-082-3/+23
| * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-0/+1
| * pulled translations from transifexDaniel Gultsch2016-04-0412-26/+71
* | fix ui bug in edit account viewChristian S2016-04-051-3/+3
* | set sending crash reports to true as defaultChristian S2016-04-031-1/+1
* | updated about infoChristian S2016-04-031-1/+3
* | added "blocklist" and "change password" iconsChristian S2016-04-031-2/+4
* | changed HomeAsUpIndicatorChristian S2016-04-036-0/+1
* | added spinner to app updater activityChristian S2016-03-261-0/+8
* | Merge branch 'siacs/master' into developmentChristian S2016-03-263-1/+6
|\|
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-232-1/+5
* | added missing/new stringsChristian S2016-03-232-0/+7
* | added VoiceRecorder to pluginsChristian S2016-03-231-0/+6
* | add border to roundedimageviewChristian S2016-03-202-3/+4
* | add border to roundedimageviewChristian S2016-03-193-4/+6
* | Merge branch 'siacs/master' into developmentChristian S2016-03-172-4/+7
|\|
| * reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+3
| * pulled translations from transifexDaniel Gultsch2016-03-135-106/+443
* | Merge branch 'siacs/master' into developmentChristian S2016-03-132-10/+13
|\|
| * pulled translations from transifexDaniel Gultsch2016-03-0628-82/+272
| * warn in conversations when account is disabledDaniel Gultsch2016-03-061-0/+1
* | updated stringsChristian S2016-03-052-0/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-03-057-0/+10
|\|
| * show host in file size checkerDaniel Gultsch2016-03-041-0/+1
| * don't automatically crop avatarDaniel Gultsch2016-03-047-0/+9
* | updated stringsChristian S2016-03-041-2/+6
* | Merge branch 'siacs/master' into developmentChristian S2016-03-044-27/+51
|\|
| * 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
* | Merge branch 'siacs/master' into developmentChristian S2016-02-272-1/+6
|\ \
| * | Revert "disallow message correction by default. fixes #1720"Christian S2016-02-271-1/+1
| |/
| * 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
* | updated German translationChristian S2016-02-231-1/+2
* | 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
| * pulled translations from transifexDaniel Gultsch2016-02-202-0/+49
* | removed duplicate stringsChristian S2016-02-202-7/+0
* | Merge branch 'siacs/master' into developmentChristian S2016-02-2035-26/+77
|\|
| * 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
| * pulled translations from transifexDaniel Gultsch2016-02-1511-9/+656
* | Merge branch 'siacs/master' into developmentChristian S2016-02-144-15/+51
|\|
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-122-2/+22
| * pulled translations from transifexDaniel Gultsch2016-02-115-16/+768