Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Insert /me on long click send button | Artem Shipovskiy | 2016-04-09 | 1 | -0/+11 |
| | |||||
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-09 | 1 | -1/+3 |
|\ | |||||
| * | don't show contact details when in conversations with self | Daniel Gultsch | 2016-04-09 | 1 | -1/+3 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-04-03 | 1 | -2/+2 |
|\| | |||||
| * | save otr fingerprint in message | Daniel Gultsch | 2016-03-31 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-26 | 1 | -7/+25 |
|\| | |||||
| * | allow to delete attachments. fixes #1539 | Daniel Gultsch | 2016-03-23 | 1 | -7/+25 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-13 | 1 | -1/+14 |
|\| | |||||
| * | warn in conversations when account is disabled | Daniel Gultsch | 2016-03-06 | 1 | -1/+14 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-05 | 1 | -6/+9 |
|\| | |||||
| * | allow to copy original url even while downloading. fixes #1743 | Daniel Gultsch | 2016-03-04 | 1 | -6/+9 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-04 | 1 | -2/+7 |
|\| | |||||
| * | don't break with srcoll events on empty message lists | Daniel Gultsch | 2016-03-03 | 1 | -2/+7 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-27 | 1 | -0/+13 |
|\| | |||||
| * | Retry decryption from message menu | fiaxh | 2016-02-23 | 1 | -0/+13 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-23 | 1 | -19/+35 |
|\| | |||||
| * | properly trigger show load more messages in mucs | Daniel Gultsch | 2016-02-22 | 1 | -2/+10 |
| | | |||||
| * | turned muc errors into enum. added error codes for service shutdown | Daniel Gultsch | 2016-02-22 | 1 | -11/+16 |
| | | |||||
| * | show load more messages when auto loading is disabled and messages are still ↵ | Daniel Gultsch | 2016-02-21 | 1 | -6/+10 |
| | | | | | | | | left on server | ||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-20 | 1 | -18/+66 |
|\| | |||||
| * | don't reset whisper on reInit. fixes #1637 | Daniel Gultsch | 2016-02-19 | 1 | -3/+0 |
| | | |||||
| * | only offer message correction for the very last message | Daniel Gultsch | 2016-02-17 | 1 | -3/+6 |
| | | |||||
| * | basic support for XEP-0308: Last Message Correction. fixes #864 | Daniel Gultsch | 2016-02-15 | 1 | -14/+58 |
| | | |||||
| * | only show load more messages button when mam is available | Daniel Gultsch | 2016-02-14 | 1 | -1/+5 |
| | | | | | | | | also update ui after that button has been pressed. fixes #1695 | ||||
* | | try to automatically rejoin muc after beeing kicked | Christian S | 2016-02-14 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-02-04 | 1 | -39/+52 |
|\| | |||||
| * | fixed performance regression in on scroll listener | Daniel Gultsch | 2016-02-04 | 1 | -1/+6 |
| | | |||||
| * | prevent previoulsly cleared messages from reloading. fixes #1110 | Daniel Gultsch | 2016-02-04 | 1 | -3/+7 |
| | | |||||
| * | Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations ↵ | Daniel Gultsch | 2016-02-02 | 1 | -34/+35 |
| |\ | | | | | | | | | | into singpolyma-disco-caps | ||||
| | * | Use a Presence class for presence information | Stephen Paul Weber | 2016-01-24 | 1 | -34/+35 |
| | | | | | | | | | | | | Only has status for now, but doing it so I can add disco to it | ||||
| * | | refactored user handling in conferences. show try again button when ↵ | Daniel Gultsch | 2016-02-01 | 1 | -1/+4 |
| |/ | | | | | | | conference has errors | ||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-23 | 1 | -1/+1 |
|\| | |||||
| * | use extract account from intent method and final EXTRA_ACCOUNT variable | Daniel Gultsch | 2016-01-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-10 | 1 | -10/+0 |
|\| | |||||
| * | don't show snackbar when notifications are disabled or paused | Daniel Gultsch | 2016-01-08 | 1 | -10/+0 |
| | | |||||
| * | Merge pull request #1595 from fiaxh/pgp_database_signature | Daniel Gultsch | 2015-12-04 | 1 | -69/+73 |
| |\ | | | | | | | Regenerate PGP signatures once | ||||
| | * | Unset all PGP signatures once | fiaxh | 2015-12-02 | 1 | -69/+73 |
| | | | | | | | | | | | | ... so they will be redone to match the changed status. | ||||
| * | | avoid some NPEs | Daniel Gultsch | 2015-12-04 | 1 | -1/+1 |
| |/ | |||||
* | | avoid some NPEs | Daniel Gultsch | 2015-12-04 | 1 | -1/+1 |
| | | |||||
* | | Unset all PGP signatures once | fiaxh | 2015-12-04 | 1 | -69/+73 |
| | | | | | | | | ... so they will be redone to match the changed status. | ||||
* | | Merge pull request #47 from siacs/master | Christian S | 2015-11-01 | 1 | -1/+7 |
|\| | | | | | copy commits | ||||
| * | indicate cbe in chat message hint | Daniel Gultsch | 2015-10-31 | 1 | -1/+7 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-31 | 1 | -68/+70 |
|\| | |||||
| * | Decrypt PGP messages in background | fiaxh | 2015-10-28 | 1 | -68/+70 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-20 | 1 | -1/+1 |
|\| | |||||
| * | open unknown files with wildcard intent | Daniel Gultsch | 2015-10-20 | 1 | -1/+1 |
| | | |||||
* | | copy commits | Christian S | 2015-10-17 | 1 | -1/+2 |
|\| | |||||
| * | allow redownloading files from remote hosts. fixes #1504 | Daniel Gultsch | 2015-10-17 | 1 | -1/+2 |
| | | |||||
* | | copy commits | Christian S | 2015-10-01 | 1 | -0/+43 |
|\| | |||||
| * | allow tab completion in conferences | Daniel Gultsch | 2015-09-27 | 1 | -0/+43 |
| | |