aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Format contact names in MUC properlySam Whited2014-11-091-12/+14
* Update more files to use JID objectsSam Whited2014-11-091-2/+1
* update conversation fragment on every backend connectiNPUTmice2014-11-081-2/+3
* bug fixes for the previous ui refactoringiNPUTmice2014-11-071-25/+19
* UI code refactoringiNPUTmice2014-11-071-61/+32
* fixed #633iNPUTmice2014-11-061-24/+26
* register nfc callback in every activity that provides a proper sharable uriiNPUTmice2014-11-041-13/+1
* made qr code available from muc and contact details as welliNPUTmice2014-11-041-15/+22
* fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @em...iNPUTmice2014-11-031-106/+125
|\
| * basic beam code / untestediNPUTmice2014-11-031-106/+125
|/
* Merge branch 'gradle' into developmentSam Whited2014-10-301-35/+24
* Make conversations the root projectSam Whited2014-10-221-0/+947