aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Account.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebasesteckbrief2017-01-111-8/+0
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-2/+7
|\|
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-411/+0
* | Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-1/+5
|\ \
| * | add methods to check max file size for http uploadDaniel Gultsch2016-03-311-1/+5
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-4/+12
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-4/+0
* | | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-0/+3
|\| |
| * | refactored disco cache. avoid making duplicate call. check hashDaniel Gultsch2016-02-031-0/+3
* | | Imports organizedsteckbrief2016-02-121-1/+1
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-24/+140
|\| |
| * | made constructor private in Account entityDaniel Gultsch2016-01-161-5/+1
| * | only report error after third unsuccesful attempt to connectDaniel Gultsch2016-01-041-1/+1
| * | Unset all PGP signatures oncefiaxh2015-12-021-4/+13
| * | add error state for unavailable tor networkDaniel Gultsch2015-12-011-3/+3
| * | do socks5 connect manuallyDaniel Gultsch2015-12-011-16/+4
| * | initial tor supportDaniel Gultsch2015-12-011-4/+46
| * | detect server identity and added muc-workaround for slackDaniel Gultsch2015-11-261-0/+8
| * | Use OpenPGP-API 9.0fiaxh2015-11-091-2/+36
| * | Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-301-0/+7
| |\ \
| | * | Decrypt PGP messages in backgroundfiaxh2015-10-281-0/+7
| * | | push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-291-3/+16
| |/ /
| * | introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-161-0/+3
| * | initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-091-6/+10
| * | added special error state for dns timeoutDaniel Gultsch2015-09-011-1/+4
| * | 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