aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-141-5/+10
|\
| * Merge pull request #653 from kriztan/patch-2Daniel Gultsch2014-11-141-5/+10
| |\
| | * Update German languagekriztan2014-11-121-24/+0
| | * Update German languagekriztan2014-11-121-5/+34
* | | 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
* | Merge pull request #656 from SamWhited/authrefactorDaniel Gultsch2014-11-125-88/+145
|\ \
| * | Refactor authentication codeSam Whited2014-11-125-88/+145
| |/
* / Make sure we're storing the display JID as UnicodeSam Whited2014-11-121-2/+3
|/
* auto register/unregister listenersiNPUTmice2014-11-117-345/+289
* temporarliy got rid of some insane work arounds in favor of some maybe less i...iNPUTmice2014-11-113-14/+17
* made Jid class parse otr session idsiNPUTmice2014-11-101-0/+10
* more refactoring for presence selection. removed getTo, getFrom and getJid fr...iNPUTmice2014-11-108-274/+283
* formatingiNPUTmice2014-11-092-24/+9
* Merge pull request #645 from betheg/about_all_libsDaniel Gultsch2014-11-091-15/+24
|\
| * add libidn to pref_about_message.Michael2014-11-091-0/+1
| * add all used libs to the pref_about_message.Michael2014-11-091-15/+23
* | fixed private messagesiNPUTmice2014-11-091-2/+2
* | s/getResourcepart().isEmpty()/isBareJid()/Sam Whited2014-11-095-7/+7
* | use isBareJid instead of getResourcePart().isEmpty()iNPUTmice2014-11-092-2/+2
* | fixed muc sender history for some cases (where the previous nick was a valid ...iNPUTmice2014-11-092-8/+17
* | migrated some otr stuff to new jid classesiNPUTmice2014-11-092-79/+82
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-0927-106/+102
|\ \
| * \ Merge pull request #642 from SamWhited/accountgetjidDaniel Gultsch2014-11-0927-106/+102
| |\ \
| | * | Rework `Account.getJid()' to return full JIDsSam Whited2014-11-0927-106/+102
* | | | Merge branch 'master' into developmentiNPUTmice2014-11-091-14/+22
|\ \ \ \ | |/ / / |/| | |
| * | | make avatar service not break on empty namesiNPUTmice2014-11-091-14/+22
* | | | fixed null pointer in message mergeriNPUTmice2014-11-091-0/+1
| |/ / |/| |
* | | refactored code to always contain full jid for counterpartiNPUTmice2014-11-098-86/+84
* | | fixed full jid for accountiNPUTmice2014-11-091-80/+76
* | | return null if from ist not set in abstract stanzaiNPUTmice2014-11-091-12/+17
* | | Merge pull request #641 from kruks23/translation8Daniel Gultsch2014-11-091-1/+21
|\ \ \
| * | | Update Spanish Translationskruks232014-11-091-1/+21
| |/ /
* | | Check for illegal arguments to the toASCII funcSam Whited2014-11-092-3/+17
* | | Fix contact highlighting in MUCSam Whited2014-11-091-2/+2
* | | Fix issue with IDN SRV recordsSam Whited2014-11-091-2/+3
* | | Fix crash on account creationSam Whited2014-11-091-13/+2
* | | Don't crash on packets with no "from" specifiedSam Whited2014-11-091-1/+2
* | | Create avatar's for JID's w/o localpartsSam Whited2014-11-094-29/+13
* | | Fields that we sync on should be finalSam Whited2014-11-091-1/+1
* | | Fix bug introduced by rebaseSam Whited2014-11-091-5/+4
* | | Fix letter avatar selection in MUCSam Whited2014-11-092-13/+2
* | | More formatting fixes in MUCSam Whited2014-11-091-1/+5
* | | Format contact names in MUC properlySam Whited2014-11-092-24/+27
* | | Fix JID parsing errorSam Whited2014-11-091-1/+1
* | | It builds again!Sam Whited2014-11-094-19/+14
* | | Add a packet JID place I missed...Sam Whited2014-11-091-1/+1
* | | Update more files to use JID objectsSam Whited2014-11-0914-54/+102
* | | Update another chunk of stuff to use JID objectsSam Whited2014-11-099-83/+104
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 13:18:07 +0000