aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Expand)AuthorAgeFilesLines
* clean up getProposedNickiNPUTmice2014-12-031-6/+5
* worked around rare npeiNPUTmice2014-12-011-5/+12
* MUC: do not add yourself to the muc user list.Michael2014-11-231-0/+2
* remove unused imports.Michael2014-11-212-3/+0
* STATUS_CODE_SELF_PRESENCE is not set in all case.Michael2014-11-211-10/+16
* verify contacts key only on initiating side of smpiNPUTmice2014-11-211-1/+1
* change status codes string 'number' to a better readable constant.Michael2014-11-201-3/+5
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-202-64/+114
* sent read marker to full jidiNPUTmice2014-11-191-2/+2
* simplified message merge conditioniNPUTmice2014-11-181-43/+13
* better usage of synchronized in some placesiNPUTmice2014-11-181-5/+1
* context menu for muc participants + refactor trueCounterpart to use Jid classiNPUTmice2014-11-173-13/+27
* Use `Locale.US' for string comparisons in searchSam Whited2014-11-172-6/+14
* trim search before searchingiNPUTmice2014-11-171-2/+2
* split search keywords by whitespaces and imply AND operatioriNPUTmice2014-11-171-1/+11
* made tags searchableiNPUTmice2014-11-162-157/+180
* happy hanukkahiNPUTmice2014-11-163-11/+91
* parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...iNPUTmice2014-11-163-36/+50
* 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
* Merge branch 'feature/file_transfer' into developmentiNPUTmice2014-11-154-7/+80
|\
| * fixed description in notifications and conversation overviewiNPUTmice2014-11-151-0/+39
| * made file transfers cancelableiNPUTmice2014-11-151-0/+2
| * some mime and pgp fixes for file transferiNPUTmice2014-11-151-6/+8
| * progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-151-0/+1
| * basic arbitrary file transferiNPUTmice2014-11-153-7/+36
* | Merge branch 'feature/otr_verification' into developmentiNPUTmice2014-11-151-2/+32
|\ \ | |/ |/|
| * added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-111-0/+4
| * initial smp supportiNPUTmice2014-11-111-2/+28
* | fixed possible npe when loading null counterpart into messageiNPUTmice2014-11-141-1/+6
* | made presences synchronizediNPUTmice2014-11-131-13/+27
* | more npe checks in muc packet parseriNPUTmice2014-11-131-31/+34
|/
* more refactoring for presence selection. removed getTo, getFrom and getJid fr...iNPUTmice2014-11-101-9/+5
* s/getResourcepart().isEmpty()/isBareJid()/Sam Whited2014-11-092-3/+3
* migrated some otr stuff to new jid classesiNPUTmice2014-11-091-72/+73
* Merge pull request #642 from SamWhited/accountgetjidDaniel Gultsch2014-11-091-5/+1
|\
| * Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-5/+1
* | fixed null pointer in message mergeriNPUTmice2014-11-091-0/+1
|/
* refactored code to always contain full jid for counterpartiNPUTmice2014-11-092-22/+5
* fixed full jid for accountiNPUTmice2014-11-091-80/+76
* Create avatar's for JID's w/o localpartsSam Whited2014-11-091-6/+8
* Fix letter avatar selection in MUCSam Whited2014-11-091-0/+1
* It builds again!Sam Whited2014-11-091-7/+7
* Update more files to use JID objectsSam Whited2014-11-091-2/+2
* Update another chunk of stuff to use JID objectsSam Whited2014-11-091-7/+2
* Update more files to use JID objectsSam Whited2014-11-091-3/+3
* Move a chunk of classes over to using JID objectsSam Whited2014-11-098-195/+235
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 00:50:30 +0000