aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/ConversationActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into feature/take_pictureDaniel Gultsch2014-05-131-10/+12
|\
| * code cleanupDaniel Gultsch2014-05-131-10/+12
* | takeing pictures over intentDaniel Gultsch2014-05-131-0/+22
* | submenu for attach fileDaniel Gultsch2014-05-131-1/+29
|/
* Better error handling if attach file doesnt work (on permission denied)Daniel Gultsch2014-05-121-19/+35
* added dialog for otr file transferDaniel Gultsch2014-05-091-1/+25
* nicer descriptions in notificaton for images and encrypted messagesDaniel Gultsch2014-05-091-1/+10
* sending text message after returing from pending intentDaniel Gultsch2014-05-081-0/+38
* better flow after returning from openkeychain for various actionsDaniel Gultsch2014-05-081-27/+39
* offer to announce pgp key if pgp encryption is selected from menuDaniel Gultsch2014-05-081-11/+13
* more informative dialog if contact doesn't announce public keyDaniel Gultsch2014-05-081-17/+33
* code cleanupDaniel Gultsch2014-05-081-4/+2
* wee bit of code cleanupDaniel Gultsch2014-05-071-35/+68
* basic pgp encrypted file transferDaniel Gultsch2014-05-061-3/+43
* unified presence selection for otr and file transferDaniel Gultsch2014-04-261-26/+73
* setting backround color if image comes directly from cacheDaniel Gultsch2014-04-251-0/+1
* couple of more optimazations on image loadingDaniel Gultsch2014-04-251-15/+20
* smoother scrolling (first step)Daniel Gultsch2014-04-251-5/+133
* fixed #50Daniel Gultsch2014-04-201-13/+20
* put more string into strings.xmlDaniel Gultsch2014-04-181-2/+2
* added clear history dialog (no funcionality)Daniel Gultsch2014-04-181-4/+24
* Major Contact Picture code cleanupAndreas Straub2014-04-131-1/+1
* More Contact Picture refactorsandy2014-04-121-2/+1
* incomming jingle packets are routed to their connection. added presence choos...Daniel Gultsch2014-04-101-117/+188
* gui for imagesDaniel Gultsch2014-04-061-4/+1
* added button to open imagesDaniel Gultsch2014-04-061-0/+20
* added attach file actionDaniel Gultsch2014-04-061-0/+4
* renamed [Archive conversation|Leave conference] to End this conversationDaniel Gultsch2014-04-061-1/+0
* finally fixed #notificationgateDaniel Gultsch2014-03-291-1/+0
* fixed null pointer issueDaniel Gultsch2014-03-281-1/+1
* tryping to fix #24 - notificationgate - since i still cant reproduce this pat...Daniel Gultsch2014-03-281-2/+4
* crash reporterDaniel Gultsch2014-03-271-0/+2
* otr messages are now ignored if conversations isnt 100% sure the message is oursDaniel Gultsch2014-03-191-22/+9
* better muc invitations. clearified the creation of ad hoc mucs with an alert ...Daniel Gultsch2014-03-151-3/+14
* use conference subject to identiy roomDaniel Gultsch2014-03-141-3/+8
* sharing textDaniel Gultsch2014-03-131-2/+3
* removed unnecessary uihelper methodDaniel Gultsch2014-03-131-1/+1
* contact picture generation centralized + basic registry stuffDaniel Gultsch2014-03-131-10/+2
* make conference notificaton optionalDaniel Gultsch2014-03-121-1/+1
* cleanupDaniel Gultsch2014-03-111-1/+0
* fixed null pointerDaniel Gultsch2014-03-101-1/+0
* another possible fix for notificationgateDaniel Gultsch2014-03-101-6/+10
* possible bug fix for notificationgateDaniel Gultsch2014-03-081-0/+3
* fixed #4 - this happend when you would archive (leave) the last conversationDaniel Gultsch2014-03-081-1/+7
* last part. update notification if user reads themDaniel Gultsch2014-03-081-2/+1
* fixed #3Daniel Gultsch2014-03-081-6/+7
* ui fixes for tabletsDaniel Gultsch2014-03-071-3/+10
* two bugs on tablet fixedDaniel Gultsch2014-03-051-1/+1
* reworked contact detailsDaniel Gultsch2014-03-051-14/+8
* Muc Options even more awesomeDaniel Gultsch2014-03-041-3/+4