aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/adapter (follow)
Commit message (Expand)AuthorAgeFilesLines
* disallow account deactivationChristian S2016-04-151-11/+0
* Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-031-1/+1
|\
| * save otr fingerprint in messageDaniel Gultsch2016-03-311-1/+1
* | show always buttons instead of links for filesChristian S2016-03-051-1/+2
* | Merge branch 'siacs/master' into developmentChristian S2016-03-051-2/+25
|\|
| * 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 branch 'siacs/master' into developmentChristian S2016-02-271-2/+2
|\| |
| * | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-2/+2
| |/
* | Merge branch 'siacs/master' into developmentChristian S2016-02-201-1/+14
|\|
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-1/+14
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-041-6/+36
|\|
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-6/+36
* | Merge branch 'siacs/master'Christian S2016-01-311-1/+2
|\|
| * hide jid row in list item list when jid is nullDaniel Gultsch2016-01-261-1/+2
* | possible fix for showing link instead of button for filesChristian S2016-01-191-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-101-0/+15
|\|
| * 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
* | copy commitsChristian S2015-12-281-1/+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
* | copy commitsChristian S2015-12-161-3/+0
|\|
| * 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
* | request storage permission when needed on Android 6.0Daniel Gultsch2015-12-121-13/+1
* | Merge pull request #47 from siacs/masterChristian S2015-11-011-1/+1
|\|
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-1/+1
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-311-12/+103
|\|
| * 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
| |/
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-201-9/+14
|\|
| * open unknown files with wildcard intentDaniel Gultsch2015-10-201-9/+14
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-162-5/+4
|\|
| * code clean upDaniel Gultsch2015-10-122-5/+4
* | Merge branch 'siacs/master' into developmentChristian S2015-10-071-1/+6
|\|
| * try to catch plattform bugsDaniel Gultsch2015-10-021-1/+6
* | copy commitsChristian S2015-10-011-4/+9
|\|
| * catch rare activity not found exception when opening downloaded filesDaniel Gultsch2015-09-271-4/+9
* | added blue tick as read indicatorChristian S2015-09-261-0/+5
* | Version 1.6.9Christian S2015-09-121-1/+1
|\|
| * added some key bindingDaniel Gultsch2015-09-071-1/+1
* | copy commitsChristian S2015-08-291-0/+1
|\|
| * fixed highlight text color for white chat bubblesDaniel Gultsch2015-08-261-0/+1
* | Version 1.6.5Christian S2015-08-261-35/+51
|\|
| * remove unused imports.Michael2015-08-251-1/+0
| * added setting to allow for white backgrounds in incoming message bubblesDaniel Gultsch2015-08-241-34/+51