Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
| | | ||||||
* | | added blue tick as read indicator | Christian S | 2015-09-26 | 1 | -3/+3 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2015-09-15 | 1 | -2/+7 | |
|\| | ||||||
| * | added possibiltiy to set conferences as moderated (only visible in advanced ↵ | Daniel Gultsch | 2015-09-13 | 1 | -2/+7 | |
| | | | | | | | | mode) | |||||
* | | Version 1.6.9 | Christian S | 2015-09-12 | 1 | -1/+8 | |
|\| | ||||||
| * | added alt as possible modifier key. use mod+(0..9) to jump to a conversation | Daniel Gultsch | 2015-09-09 | 1 | -0/+1 | |
| | | ||||||
| * | added some key binding | Daniel Gultsch | 2015-09-07 | 1 | -0/+4 | |
| | | | | | | | | | | * ctrl + tab will open the conversations overview (when available) * ctrl + up / down will navigate between conversations | |||||
| * | catch npe in setupIme method | Daniel Gultsch | 2015-09-07 | 1 | -1/+3 | |
| | | ||||||
* | | Merge pull request #34 from siacs/master | Christian S. | 2015-09-05 | 1 | -8/+12 | |
|\| | ||||||
| * | minimize softkeyboard only if it has been in fullscreen mode | Daniel Gultsch | 2015-09-04 | 1 | -1/+3 | |
| | | ||||||
| * | show an send button instead of the enter key in softkeyboards when ↵ | Daniel Gultsch | 2015-09-04 | 1 | -7/+9 | |
| | | | | | | | | enterIsSend and showEnterKey are both set | |||||
* | | Version 1.6.5 | Christian S | 2015-08-26 | 1 | -1/+2 | |
|\| | ||||||
| * | renamed plain text to unencrypted. fixes #1331 | Daniel Gultsch | 2015-08-24 | 1 | -1/+1 | |
| | | ||||||
| * | added setting to allow for white backgrounds in incoming message bubbles | Daniel Gultsch | 2015-08-24 | 1 | -0/+1 | |
| | | ||||||
* | | version 1.6.0 beta 3 | Christian S | 2015-08-12 | 1 | -1/+1 | |
|\| | ||||||
| * | renamed multi-end / axolotl to OMEMO | Daniel Gultsch | 2015-08-08 | 1 | -1/+1 | |
| | | ||||||
* | | copy commits | Christian S | 2015-08-02 | 1 | -16/+21 | |
|\| | ||||||
| * | improved 'next encryption' selection | Daniel Gultsch | 2015-07-31 | 1 | -14/+18 | |
| | | ||||||
| * | Highlight selected message's fingerprint in list | Andreas Straub | 2015-07-29 | 1 | -1/+2 | |
| | | ||||||
| * | call refreshUi directly | Daniel Gultsch | 2015-07-24 | 1 | -1/+1 | |
| | | ||||||
* | | add subtitle to ActionBar in chatviews | Christian S | 2015-07-23 | 1 | -2/+2 | |
|\ \ | | | | | | | | | | | | | * display typing info in ActionBar as subtitle for single user chats * display participants in ActionBar as subtitle in conferences | |||||
| * | | move typing info to ActionBar subtitle | Christian S | 2015-07-20 | 1 | -2/+3 | |
| | | | ||||||
* | | | copy commits | Christian S | 2015-07-23 | 1 | -6/+13 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | show warning when trying to highlight users that have left the conference | Daniel Gultsch | 2015-07-22 | 1 | -5/+12 | |
| | | | ||||||
| * | | use 'interactive mode' when starting downloads from the context menu | Daniel Gultsch | 2015-07-22 | 1 | -1/+1 | |
| | | | ||||||
* | | | copy commits | Christian S | 2015-07-20 | 1 | -2/+32 | |
|\| | | |/ |/| | ||||||
| * | Optimize imports | Andreas Straub | 2015-07-20 | 1 | -4/+2 | |
| | |