aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-271-2/+12
|\
| * add 'create conference' dialogDaniel Gultsch2016-05-261-2/+12
* | delete old menu entriesChristian Schneppe2016-05-211-10/+0
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-201-0/+5
|\|
| * show password dialog when account was magic createdDaniel Gultsch2016-05-191-0/+5
* | refactored handling of endConversationChristian Schneppe2016-05-141-1/+6
* | added new iconsChristian Schneppe2016-05-141-3/+3
* | add share contact to ContactDetailsChristian Schneppe2016-05-141-3/+13
* | add reconnect to EditAccountActivityChristian Schneppe2016-05-141-1/+4
* | clean unused resourcesChristian Schneppe2016-05-131-7/+0
* | go directly to the user account via menuChristian S2016-05-051-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-303-0/+26
|\|
| * add change prescence to manage account context menuDaniel Gultsch2016-04-231-0/+3
| * expert setting to manually change presenceDaniel Gultsch2016-04-222-0/+23
* | display mam settings as iconChristian S2016-04-221-0/+2
* | use material design icons for android < lollipopChristian S2016-04-161-2/+2
* | disallow account deactivationChristian S2016-04-152-12/+3
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-141-14/+31
|\|
| * added share uri button to conference detailsDaniel Gultsch2016-04-121-14/+21
* | added "blocklist" and "change password" iconsChristian S2016-04-031-2/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-03-261-1/+4
|\|
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-1/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-03-051-0/+8
|\|
| * don't automatically crop avatarDaniel Gultsch2016-03-041-0/+8
* | Merge branch 'siacs/master' into developmentChristian S2016-02-271-0/+4
|\|
| * Retry decryption from message menufiaxh2016-02-231-0/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-02-201-0/+4
|\|
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-0/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-02-141-15/+20
|\|
| * allow user to set MAM preferencesDaniel Gultsch2016-02-091-15/+20
* | make actionbar title/subtitle clickableChristian S2016-01-231-3/+4
* | copy commitsChristian S2016-01-041-2/+8
|\|
| * Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-041-2/+8
| * initial tor supportDaniel Gultsch2015-12-011-0/+5
* | hide settings, accounts and updater in all menus except in main windowChristian S2015-12-293-31/+0
* | initial tor supportDaniel Gultsch2015-12-041-0/+5
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-162-0/+13
|\|
| * add config variable to enable x509 verificationDaniel Gultsch2015-10-121-2/+2
| * add menu item in account details to renew certificateDaniel Gultsch2015-10-111-0/+7
| * make add account from key visibleDaniel Gultsch2015-10-111-1/+1
| * initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-091-0/+6
* | version 1.6.9 betaChristian S2015-09-062-0/+12
* | Version 1.6.5Christian S2015-08-261-1/+1
|\|
| * renamed plain text to unencrypted. fixes #1331Daniel Gultsch2015-08-241-1/+1
* | version 1.6.0 beta 3Christian S2015-08-121-3/+3
|\|
| * renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-081-3/+3
* | removed duplicatesChristian S2015-07-231-4/+0
* | show encryption as buttonChristian S2015-07-231-1/+1
* | copy commitsChristian S2015-07-231-0/+4
|\|
| * allow for private messages being started from muc details in anonymous mucsDaniel Gultsch2015-07-211-0/+4