aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Account.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.6.3' into trz/rebasetrz/merge_1.6.3lookshe2015-08-241-1/+11
|\
| * Reworked axolotl protocol layerAndreas Straub2015-07-191-0/+7
| * CryptoNext persistance layer mockupAndreas Straub2015-07-191-0/+4
| * show attach button in conferences when http upload is availableDaniel Gultsch2015-06-291-0/+4
| * renamed OtrEngine to OtrServiceDaniel Gultsch2015-05-261-8/+8
| * don't resume old session when changing resourceiNPUTmice2015-04-091-4/+10
* | fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conferencelookshe2015-08-161-0/+6
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-12/+22
|/
* initilize keys with jsonobject value on parse erroriNPUTmice2015-02-261-1/+1
* Add ability to change password on serverSam Whited2014-12-251-28/+17
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-221-5/+25
* get rid of special self presence object and incorporate that into rosteriNPUTmice2014-12-201-18/+2
* fixed another npe in hasBookmarkiNPUTmice2014-12-031-2/+3
* parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...iNPUTmice2014-11-161-21/+24
* Remove extra status wrapper methodSam Whited2014-11-151-4/+0
* Add incompatible server statusSam Whited2014-11-151-1/+4
* Add security error statusSam Whited2014-11-151-12/+15
* Make account status an enumSam Whited2014-11-151-49/+64
* Add auth method pinningSam Whited2014-11-151-0/+2
* s/getResourcepart().isEmpty()/isBareJid()/Sam Whited2014-11-091-1/+1
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-5/+1
* fixed full jid for accountiNPUTmice2014-11-091-80/+76
* It builds again!Sam Whited2014-11-091-7/+7
* Update more files to use JID objectsSam Whited2014-11-091-2/+2
* Move a chunk of classes over to using JID objectsSam Whited2014-11-091-45/+49
* Make conversations the root projectSam Whited2014-10-221-0/+399