aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Added columns to fileparams table: url, original file name, key and ivsteckbrief2017-01-041-222/+267
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-15/+53
|\
* \ Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-1/+1
|\ \
| * | save otr fingerprint in messageDaniel Gultsch2016-03-311-1/+1
* | | fixed installation error "W/PackageManager: Can't install because provider na...lookshe2016-04-031-1/+1
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-4/+5
|\ \ \ | | |/ | |/|
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-271-2/+23
|\| |
* | | Added method to get body from message if hasMeCommand and harmonized extracti...lookshe2016-03-121-3/+3
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-6/+6
|\| |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-081-17/+20
|\| |
* | | Fixes FS#153 - Check if url, phone and email are linkified correctlylookshe2016-03-081-6/+31
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-1/+24
|\ \ \ | | |/ | |/|
| * | Merge branch 'Mess' of https://github.com/tarun018/Conversations into tarun01...Daniel Gultsch2016-03-041-0/+10
| |\ \
| | * | Fix Issue #1634 : Shows XMPP URI as links.Tarun2016-02-291-0/+10
| * | | show host in file size checkerDaniel Gultsch2016-03-041-1/+14
| |/ /
* | | Fixes FS#48 and FS#136lookshe2016-02-281-13/+0
* | | Removed stupid message correctionsteckbrief2016-02-231-12/+0
* | | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-231-35/+7
* | | Removed non-existing member variablesteckbrief2016-02-231-1/+1
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-1/+14
|\| |
| * | basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-1/+14
* | | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-4/+34
|\| |
| * | prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-6/+36
* | | Imports organizedsteckbrief2016-02-121-7/+1
* | | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-121-14/+1
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-5/+3
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-79/+249
|\| |
| * | register context menu long click listener on message text. fixes #1614Daniel Gultsch2015-12-271-1/+1
| * | made text selectable again unless text contains more than 1 linkDaniel Gultsch2015-12-261-0/+11
| * | make message text non-selectable. fixes #1606Daniel Gultsch2015-12-141-3/+0
| * | request storage permission when needed on Android 6.0Daniel Gultsch2015-12-071-13/+1
| * | explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-1/+1
| * | Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-301-1/+5
| |\ \
| | * | Show PGP "please wait" message only when actually decryptingfiaxh2015-10-281-1/+5
| * | | load avatars in message adapter in background taskDaniel Gultsch2015-10-291-11/+92
| * | | show encryption type in warned/red messagesDaniel Gultsch2015-10-281-0/+6
| |/ /
| * | open unknown files with wildcard intentDaniel Gultsch2015-10-201-9/+14
| * | try to catch plattform bugsDaniel Gultsch2015-10-021-1/+6
| * | catch rare activity not found exception when opening downloaded filesDaniel Gultsch2015-09-271-4/+9
| * | fixed highlight text color for white chat bubblesDaniel Gultsch2015-08-261-0/+1
| * | remove unused imports.Michael2015-08-251-1/+0
| * | added setting to allow for white backgrounds in incoming message bubblesDaniel Gultsch2015-08-241-34/+51
| * | use same code that is used to open files for imagesDaniel Gultsch2015-08-111-4/+1
| * | changed color of 'whispered' prefixDaniel Gultsch2015-08-111-2/+1
| * | Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub2015-08-011-3/+3
| * | Fix session logic: enforce same type of encryptionAndreas Straub2015-07-301-25/+3
| * | fixed some colors in message adapterDaniel Gultsch2015-07-301-25/+31
| * | Reset lock color for non-axolotl messagesAndreas Straub2015-07-291-0/+2
| * | Tag carbon messages in parser, adapt session logicAndreas Straub2015-07-291-2/+2
| * | Color plaintext messages in encrypted sessions redAndreas Straub2015-07-291-0/+30