aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'siacs/master' into developmentChristian S2016-03-261-7/+25
|\
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-7/+25
* | Merge branch 'siacs/master' into developmentChristian S2016-03-131-1/+14
|\|
| * warn in conversations when account is disabledDaniel Gultsch2016-03-061-1/+14
* | Merge branch 'siacs/master' into developmentChristian S2016-03-051-6/+9
|\|
| * allow to copy original url even while downloading. fixes #1743Daniel Gultsch2016-03-041-6/+9
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-2/+7
|\|
| * don't break with srcoll events on empty message listsDaniel Gultsch2016-03-031-2/+7
* | Merge branch 'siacs/master' into developmentChristian S2016-02-271-0/+13
|\|
| * Retry decryption from message menufiaxh2016-02-231-0/+13
* | Merge branch 'siacs/master' into developmentChristian S2016-02-231-19/+35
|\|
| * properly trigger show load more messages in mucsDaniel Gultsch2016-02-221-2/+10
| * turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-221-11/+16
| * show load more messages when auto loading is disabled and messages are still ...Daniel Gultsch2016-02-211-6/+10
* | Merge branch 'siacs/master' into developmentChristian S2016-02-201-18/+66
|\|
| * don't reset whisper on reInit. fixes #1637Daniel Gultsch2016-02-191-3/+0
| * only offer message correction for the very last messageDaniel Gultsch2016-02-171-3/+6
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-14/+58
| * only show load more messages button when mam is availableDaniel Gultsch2016-02-141-1/+5
* | try to automatically rejoin muc after beeing kickedChristian S2016-02-141-1/+2
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-041-39/+52
|\|
| * fixed performance regression in on scroll listenerDaniel Gultsch2016-02-041-1/+6
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-3/+7
| * Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...Daniel Gultsch2016-02-021-34/+35
| |\
| | * Use a Presence class for presence informationStephen Paul Weber2016-01-241-34/+35
| * | refactored user handling in conferences. show try again button when conferenc...Daniel Gultsch2016-02-011-1/+4
| |/
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-1/+1
|\|
| * use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-101-10/+0
|\|
| * don't show snackbar when notifications are disabled or pausedDaniel Gultsch2016-01-081-10/+0
| * Merge pull request #1595 from fiaxh/pgp_database_signatureDaniel Gultsch2015-12-041-69/+73
| |\
| | * Unset all PGP signatures oncefiaxh2015-12-021-69/+73
| * | avoid some NPEsDaniel Gultsch2015-12-041-1/+1
| |/
* | avoid some NPEsDaniel Gultsch2015-12-041-1/+1
* | Unset all PGP signatures oncefiaxh2015-12-041-69/+73
* | Merge pull request #47 from siacs/masterChristian S2015-11-011-1/+7
|\|
| * indicate cbe in chat message hintDaniel Gultsch2015-10-311-1/+7
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-311-68/+70
|\|
| * Decrypt PGP messages in backgroundfiaxh2015-10-281-68/+70
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-201-1/+1
|\|
| * open unknown files with wildcard intentDaniel Gultsch2015-10-201-1/+1
* | copy commitsChristian S2015-10-171-1/+2
|\|
| * allow redownloading files from remote hosts. fixes #1504Daniel Gultsch2015-10-171-1/+2
* | copy commitsChristian S2015-10-011-0/+43
|\|
| * allow tab completion in conferencesDaniel Gultsch2015-09-271-0/+43
* | added blue tick as read indicatorChristian S2015-09-261-3/+3
* | Merge branch 'siacs/master' into developmentChristian S2015-09-151-2/+7
|\|
| * added possibiltiy to set conferences as moderated (only visible in advanced m...Daniel Gultsch2015-09-131-2/+7
* | Version 1.6.9Christian S2015-09-121-1/+8
|\|
| * added alt as possible modifier key. use mod+(0..9) to jump to a conversationDaniel Gultsch2015-09-091-0/+1