aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+1
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-1/+1
|\|
* | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-8/+23
|\ \
| * | warn in conversations when account is disabledDaniel Gultsch2016-03-061-1/+14
| * | allow to copy original url even while downloading. fixes #1743Daniel Gultsch2016-03-041-6/+9
| * | don't break with srcoll events on empty message listsDaniel Gultsch2016-03-031-2/+7
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-15/+31
|\| |
| * | Retry decryption from message menufiaxh2016-02-231-0/+13
| * | 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
* | | Readded MessageDetailsDialog to message context menu after mergesteckbrief2016-02-241-0/+4
* | | Removed stupid message correctionsteckbrief2016-02-231-53/+9
* | | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-231-10/+0
* | | Fix visibility of updateStatusMessages method that LoadMoreMessages can worksteckbrief2016-02-231-1/+1
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-19/+73
|\| |
| * | show load more messages when auto loading is disabled and messages are still ...Daniel Gultsch2016-02-211-6/+10
| * | 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
* | | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-34/+47
|\| |
| * | 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
* | | | Imports organizedsteckbrief2016-02-121-11/+2
* | | | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-121-1/+0
* | | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-95/+2
* | | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-193/+396
|\| | |
| * | | refactored user handling in conferences. show try again button when conferenc...Daniel Gultsch2016-02-011-1/+4
| |/ /
| * | use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-1/+1
| * | 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
| |/ /
| * | indicate cbe in chat message hintDaniel Gultsch2015-10-311-1/+7
| * | Decrypt PGP messages in backgroundfiaxh2015-10-281-68/+70
| * | open unknown files with wildcard intentDaniel Gultsch2015-10-201-1/+1
| * | allow redownloading files from remote hosts. fixes #1504Daniel Gultsch2015-10-171-1/+2
| * | allow tab completion in conferencesDaniel Gultsch2015-09-271-0/+43
| * | added possibiltiy to set conferences as moderated (only visible in advanced m...Daniel Gultsch2015-09-131-2/+7
| * | added alt as possible modifier key. use mod+(0..9) to jump to a conversationDaniel Gultsch2015-09-091-0/+1
| * | added some key bindingDaniel Gultsch2015-09-071-0/+4
| * | catch npe in setupIme methodDaniel Gultsch2015-09-071-1/+3
| * | minimize softkeyboard only if it has been in fullscreen modeDaniel Gultsch2015-09-041-1/+3
| * | show an send button instead of the enter key in softkeyboards when enterIsSen...show_send_button_in_softkeyboardDaniel Gultsch2015-09-041-7/+9
| * | renamed plain text to unencrypted. fixes #1331Daniel Gultsch2015-08-241-1/+1
| * | added setting to allow for white backgrounds in incoming message bubblesDaniel Gultsch2015-08-241-0/+1
| * | renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-081-1/+1
| * | improved 'next encryption' selectionDaniel Gultsch2015-07-311-14/+18