Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-27 | 1 | -2/+12 |
|\ | |||||
| * | add 'create conference' dialog | Daniel Gultsch | 2016-05-26 | 1 | -2/+12 |
| | | |||||
* | | delete old menu entries | Christian Schneppe | 2016-05-21 | 1 | -10/+0 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-20 | 1 | -0/+5 |
|\| | |||||
| * | show password dialog when account was magic created | Daniel Gultsch | 2016-05-19 | 1 | -0/+5 |
| | | |||||
* | | refactored handling of endConversation | Christian Schneppe | 2016-05-14 | 1 | -1/+6 |
| | | |||||
* | | added new icons | Christian Schneppe | 2016-05-14 | 1 | -3/+3 |
| | | |||||
* | | add share contact to ContactDetails | Christian Schneppe | 2016-05-14 | 1 | -3/+13 |
| | | |||||
* | | add reconnect to EditAccountActivity | Christian Schneppe | 2016-05-14 | 1 | -1/+4 |
| | | |||||
* | | clean unused resources | Christian Schneppe | 2016-05-13 | 1 | -7/+0 |
| | | |||||
* | | go directly to the user account via menu | Christian S | 2016-05-05 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-30 | 3 | -0/+26 |
|\| | |||||
| * | add change prescence to manage account context menu | Daniel Gultsch | 2016-04-23 | 1 | -0/+3 |
| | | |||||
| * | expert setting to manually change presence | Daniel Gultsch | 2016-04-22 | 2 | -0/+23 |
| | | |||||
* | | display mam settings as icon | Christian S | 2016-04-22 | 1 | -0/+2 |
| | | |||||
* | | use material design icons for android < lollipop | Christian S | 2016-04-16 | 1 | -2/+2 |
| | | |||||
* | | disallow account deactivation | Christian S | 2016-04-15 | 2 | -12/+3 |
| | | | | | | | | added reconnect to account context menu | ||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-14 | 1 | -14/+31 |
|\| | |||||
| * | added share uri button to conference details | Daniel Gultsch | 2016-04-12 | 1 | -14/+21 |
| | | |||||
* | | added "blocklist" and "change password" icons | Christian S | 2016-04-03 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-26 | 1 | -1/+4 |
|\| | |||||
| * | allow to delete attachments. fixes #1539 | Daniel Gultsch | 2016-03-23 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-05 | 1 | -0/+8 |
|\| | |||||
| * | don't automatically crop avatar | Daniel Gultsch | 2016-03-04 | 1 | -0/+8 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-27 | 1 | -0/+4 |
|\| | |||||
| * | Retry decryption from message menu | fiaxh | 2016-02-23 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-20 | 1 | -0/+4 |
|\| | |||||
| * | basic support for XEP-0308: Last Message Correction. fixes #864 | Daniel Gultsch | 2016-02-15 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-14 | 1 | -15/+20 |
|\| | |||||
| * | allow user to set MAM preferences | Daniel Gultsch | 2016-02-09 | 1 | -15/+20 |
| | | |||||
* | | make actionbar title/subtitle clickable | Christian S | 2016-01-23 | 1 | -3/+4 |
| | | | | | | | | | | * show conference or contact details * hide button to show conference or contact details | ||||
* | | copy commits | Christian S | 2016-01-04 | 1 | -2/+8 |
|\| | |||||
| * | Allow entering a JID from 'choose contact'. thanks @singpolyma | Daniel Gultsch | 2016-01-04 | 1 | -2/+8 |
| | | | | | | | | | | fixes #1611 fixes #1602 | ||||
| * | initial tor support | Daniel Gultsch | 2015-12-01 | 1 | -0/+5 |
| | | |||||
* | | hide settings, accounts and updater in all menus except in main window | Christian S | 2015-12-29 | 3 | -31/+0 |
| | | |||||
* | | initial tor support | Daniel Gultsch | 2015-12-04 | 1 | -0/+5 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-16 | 2 | -0/+13 |
|\| | |||||
| * | add config variable to enable x509 verification | Daniel Gultsch | 2015-10-12 | 1 | -2/+2 |
| | | |||||
| * | add menu item in account details to renew certificate | Daniel Gultsch | 2015-10-11 | 1 | -0/+7 |
| | | |||||
| * | make add account from key visible | Daniel Gultsch | 2015-10-11 | 1 | -1/+1 |
| | | |||||
| * | initial UI work to allow setting up accounts from certifcates | Daniel Gultsch | 2015-10-09 | 1 | -0/+6 |
| | | |||||
* | | version 1.6.9 beta | Christian S | 2015-09-06 | 2 | -0/+12 |
| | | | | | | | | * in app updater | ||||
* | | Version 1.6.5 | Christian S | 2015-08-26 | 1 | -1/+1 |
|\| | |||||
| * | renamed plain text to unencrypted. fixes #1331 | Daniel Gultsch | 2015-08-24 | 1 | -1/+1 |
| | | |||||
* | | version 1.6.0 beta 3 | Christian S | 2015-08-12 | 1 | -3/+3 |
|\| | |||||
| * | renamed multi-end / axolotl to OMEMO | Daniel Gultsch | 2015-08-08 | 1 | -3/+3 |
| | | |||||
* | | removed duplicates | Christian S | 2015-07-23 | 1 | -4/+0 |
| | | |||||
* | | show encryption as button | Christian S | 2015-07-23 | 1 | -1/+1 |
| | | |||||
* | | copy commits | Christian S | 2015-07-23 | 1 | -0/+4 |
|\| | |||||
| * | allow for private messages being started from muc details in anonymous mucs | Daniel Gultsch | 2015-07-21 | 1 | -0/+4 |
| | |