aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-271-2/+5
|\
| * hide fingerprints in UI if encryption is disabledDaniel Gultsch2016-05-251-2/+5
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-221-24/+31
|\|
| * show first unread message on top after reinitDaniel Gultsch2016-05-221-24/+31
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-201-12/+10
|\|
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-161-12/+10
| * scroll to bottom after sending multi-line messageDaniel Gultsch2016-05-121-2/+8
* | scroll to bottom after sending multi-line messageDaniel Gultsch2016-05-131-2/+8
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-051-1/+1
|\|
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-301-3/+9
|\|
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-3/+9
* | Insert /me on long click send buttonArtem Shipovskiy2016-04-091-0/+11
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-091-1/+3
|\|
| * don't show contact details when in conversations with selfDaniel Gultsch2016-04-091-1/+3
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-031-2/+2
|\|
| * save otr fingerprint in messageDaniel Gultsch2016-03-311-2/+2
* | 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
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 19:08:40 +0000