aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge master-originsteckbrief2015-02-201-11/+27
|\
| * adapt caps on whether or not message confirmation is oniNPUTmice2015-01-261-3/+1
| * Changed online color to green instead of primaryAnders Sandblad2015-01-231-0/+4
| * always allow access to contact details. provide add button in contact detailsiNPUTmice2015-01-211-5/+7
| * fixed up button on v21 devicesiNPUTmice2015-01-201-2/+6
| * Add option to swap enter/emoticon keySam Whited2015-01-141-0/+6
* | - Avoiding accessing shared preferences to know if emoticons should be parsed...steckbrief2015-01-201-1/+3
|/
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-221-38/+46
* recreate activity after theme has changed. fixed #764iNPUTmice2014-12-091-3/+11
* add an listener for the muc roster update.Michael2014-11-231-0/+6
* remove unused imports.Michael2014-11-211-1/+0
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-201-14/+45
* some saftey checks before registering listeners in XmppActivityiNPUTmice2014-11-191-1/+12
* highlight muc members by touching their name in muc details. fixed #503iNPUTmice2014-11-171-0/+11
* Make account status an enumSam Whited2014-11-151-1/+1
* initial smp supportiNPUTmice2014-11-111-0/+2
* auto register/unregister listenersiNPUTmice2014-11-111-4/+46
* temporarliy got rid of some insane work arounds in favor of some maybe less i...iNPUTmice2014-11-111-1/+5
* more refactoring for presence selection. removed getTo, getFrom and getJid fr...iNPUTmice2014-11-101-1/+13
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-2/+2
* refactored code to always contain full jid for counterpartiNPUTmice2014-11-091-5/+14
* Update another chunk of stuff to use JID objectsSam Whited2014-11-091-21/+20
* register nfc callback in every activity that provides a proper sharable uriiNPUTmice2014-11-041-0/+14
* made qr code available from muc and contact details as welliNPUTmice2014-11-041-44/+117
* fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @em...iNPUTmice2014-11-031-0/+10
|\
| * basic beam code / untestediNPUTmice2014-11-031-0/+8
|/
* Merge branch 'gradle' into developmentSam Whited2014-10-301-4/+15
* Make conversations the root projectSam Whited2014-10-221-0/+637