aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/adapter (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-1/+2
|\
* \ 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 branch 'trz/rename' into trz/rebaselookshe2016-04-011-1/+6
|\ \ \ | | |/ | |/|
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-301-1/+3
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-20/+9
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-293-8/+12
|\| |
* | | 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-4/+5
|\| |
* | | 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
* | | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-2/+2
|\| | |
| * | | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-2/+2
| |/ /
* | | 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
* | | Changed access to presences according to new Presence representation in Csteckbrief2016-02-231-5/+5
* | | 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
* | | Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-02-131-2/+13
* | | Imports organizedsteckbrief2016-02-124-50/+17
* | | 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-115-109/+297
|\| |
| * | hide jid row in list item list when jid is nullDaniel Gultsch2016-01-261-1/+2
| * | show per conference notification settings in details activityDaniel Gultsch2016-01-081-1/+4
| * | show icon in conversations overview when notifications are disabledDaniel Gultsch2016-01-081-0/+12
| * | 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
| * | code clean upDaniel Gultsch2015-10-122-5/+4
| * | 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