aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #706 from betheg/unused_importsDaniel Gultsch2014-11-211-1/+0
|\
| * remove unused imports.Michael2014-11-211-1/+0
* | update action bar with conversations updates as welliNPUTmice2014-11-211-27/+35
* | move task to back and not finish when hitting back buttoniNPUTmice2014-11-211-7/+5
|/
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-201-1/+13
* properly remove conversations context menuiNPUTmice2014-11-181-37/+19
* disabled broken conversations context menuiNPUTmice2014-11-181-3/+3
* context menu for conversations. fixed #630iNPUTmice2014-11-181-9/+45
* highlight muc members by touching their name in muc details. fixed #503iNPUTmice2014-11-171-1/+7
* parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...iNPUTmice2014-11-161-1/+1
* some mime and pgp fixes for file transferiNPUTmice2014-11-151-11/+13
* copy non local files to private storage firstiNPUTmice2014-11-151-4/+19
* basic arbitrary file transferiNPUTmice2014-11-151-15/+31
* auto register/unregister listenersiNPUTmice2014-11-111-18/+4
* temporarliy got rid of some insane work arounds in favor of some maybe less i...iNPUTmice2014-11-111-5/+4
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-1/+1
* 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