aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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