aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.6.3' into trz/rebasetrz/merge_1.6.3lookshe2015-08-241-31/+73
|\
| * 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
| * Refactor out inner classes, cache trust storeAndreas Straub2015-07-291-3/+3
| * use 'interactive mode' when starting downloads from the context menuDaniel Gultsch2015-07-221-1/+1
| * changed message bubble appearanceRaphael Pohl2015-07-201-10/+27
| * Optimize importsAndreas Straub2015-07-201-1/+1
| * Fix trust status for outgoing messagesAndreas Straub2015-07-191-4/+4
| * Show trust status of messages' originating sessionAndreas Straub2015-07-191-0/+13
| * renamed HttpConnection to HttpDownloadConnectionDaniel Gultsch2015-07-101-1/+1
| * renamed downloadable to transferableDaniel Gultsch2015-07-101-11/+11
| * display toast in ui on failed http downloadDaniel Gultsch2015-07-101-0/+2
| * show timestamp on images in mucsDaniel Gultsch2015-07-101-1/+1
| * refactored message context menuDaniel Gultsch2015-07-021-6/+6
| * made httpconnection (download) ready all kind of filesfeature/http_uploadDaniel Gultsch2015-06-301-4/+4
| * avoid using paragraph style breaks by accidentDaniel Gultsch2015-05-111-3/+4
| * increased space between merged messages a bitDaniel Gultsch2015-05-111-1/+1
| * add a little bit of space between merged messages.Daniel Gultsch2015-05-111-1/+7
| * no font padding on red heartsDaniel Gultsch2015-05-111-2/+4
| * rewrote parts of message adapter to avoid using NULL viewsDaniel Gultsch2015-05-111-35/+6
| * paint single unicode hearts as red and slightly largerDaniel Gultsch2015-05-101-4/+22
* | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-161-4/+1
* | Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-161-2/+0
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-52/+53
* | whatsapp-like smiley implementationlookshe2015-04-121-3/+4
* | Changes for emoticon parser reactivatedsteckbrief2015-03-311-5/+5
* | Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-4/+32
|\|
| * display geo uris as location. show 'send loction' in share menu if request lo...iNPUTmice2015-03-071-1/+31
| * added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-3/+1
* | Merge master-originsteckbrief2015-02-201-180/+154
|\|
| * fix mergable() for /me command.Michael2015-01-251-1/+2
| * explain read markeriNPUTmice2015-01-181-20/+6
| * use same helper methods for images and filesiNPUTmice2015-01-181-33/+8
| * reworked message preview / message meta information (ie file offered, receive...Daniel Gultsch2015-01-121-38/+14
| * Add XEP-0245 (/me command) supportSam Whited2015-01-111-131/+157
| * added debug info + possible platform bug work arounds to message adapterDaniel Gultsch2015-01-051-0/+10
| * added higher auto accept file sizesDaniel Gultsch2015-01-041-2/+2
* | - Avoiding accessing shared preferences to know if emoticons should be parsed...steckbrief2015-01-201-3/+3
* | Setting added for parsing emoticons or notTristan Zur2015-01-111-1/+4
* | Fixed missing symbol for eu.siacs.conversations.Config and wrong parameter fo...Tristan Zur2015-01-101-1/+2
* | Merge branch 'master' of ssh://git.fucktheforce.de/conversationslookshe2015-01-031-31/+30
|\|
| * avoid npe on weird platform bugsiNPUTmice2014-12-151-30/+30
| * cleanup: removed unused emoticon parsingiNPUTmice2014-12-091-5/+1
* | remaining part of my patchlookshe2015-01-031-3/+2
|/