| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fixed description in notifications and conversation overview | iNPUTmice | 2014-11-15 | 8 | -50/+93 |
| | | |||||
| * | fixed resending for files as well | iNPUTmice | 2014-11-15 | 2 | -3/+4 |
| | | |||||
| * | made file transfers cancelable | iNPUTmice | 2014-11-15 | 8 | -22/+76 |
| | | |||||
| * | adepted conversationadapter to deal with files | iNPUTmice | 2014-11-14 | 2 | -3/+23 |
| | | |||||
| * | progress for ibb transfers | iNPUTmice | 2014-11-14 | 5 | -13/+27 |
| | | |||||
| * | some mime and pgp fixes for file transfer | iNPUTmice | 2014-11-14 | 7 | -73/+71 |
| | | |||||
| * | support for pgp files | iNPUTmice | 2014-11-14 | 5 | -23/+38 |
| | | |||||
| * | progress for http images as well. fixed open button for sent files | iNPUTmice | 2014-11-14 | 7 | -8/+40 |
| | | |||||
| * | copy non local files to private storage first | iNPUTmice | 2014-11-14 | 3 | -23/+77 |
| | | |||||
| * | bug fixes and various improvements for file transfer | iNPUTmice | 2014-11-14 | 5 | -19/+30 |
| | | |||||
| * | basic arbitrary file transfer | iNPUTmice | 2014-11-14 | 13 | -136/+332 |
| | | |||||
| * | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-14 | 1 | -5/+10 |
| |\ | | | | | | | development | ||||
| | * | Merge pull request #653 from kriztan/patch-2 | Daniel Gultsch | 2014-11-14 | 1 | -5/+10 |
| | |\ | | | | | | | Update German language | ||||
| | | * | Update German language | kriztan | 2014-11-12 | 1 | -24/+0 |
| | | | | | | | | | | deleted 'pref_about_message' | ||||
| | | * | Update German language | kriztan | 2014-11-12 | 1 | -5/+34 |
| | | | | |||||
| * | | | fixed possible npe when loading null counterpart into message | iNPUTmice | 2014-11-14 | 1 | -1/+6 |
| |/ / | |||||
| * | | made presences synchronized | iNPUTmice | 2014-11-13 | 1 | -13/+27 |
| | | | |||||
| * | | more npe checks in muc packet parser | iNPUTmice | 2014-11-13 | 1 | -31/+34 |
| | | | |||||
| * | | Merge pull request #656 from SamWhited/authrefactor | Daniel Gultsch | 2014-11-12 | 5 | -88/+145 |
| |\ \ | | | | | | | Refactor authentication code | ||||
| | * | | Refactor authentication code | Sam Whited | 2014-11-12 | 5 | -88/+145 |
| | |/ | |||||
| * / | Make sure we're storing the display JID as Unicode | Sam Whited | 2014-11-12 | 1 | -2/+3 |
| |/ | |||||
| * | auto register/unregister listeners | iNPUTmice | 2014-11-11 | 7 | -345/+289 |
| | | |||||
| * | temporarliy got rid of some insane work arounds in favor of some maybe less ↵ | iNPUTmice | 2014-11-11 | 3 | -14/+17 |
| | | | | | insane work arounds | ||||
| * | made Jid class parse otr session ids | iNPUTmice | 2014-11-10 | 1 | -0/+10 |
| | | |||||
| * | more refactoring for presence selection. removed getTo, getFrom and getJid ↵ | iNPUTmice | 2014-11-10 | 8 | -274/+283 |
| | | | | | from Element | ||||
| * | formating | iNPUTmice | 2014-11-09 | 2 | -24/+9 |
| | | |||||
| * | Merge pull request #645 from betheg/about_all_libs | Daniel Gultsch | 2014-11-09 | 1 | -15/+24 |
| |\ | | | | | add all used libs to the pref_about_message | ||||
| | * | add libidn to pref_about_message. | Michael | 2014-11-09 | 1 | -0/+1 |
| | | | |||||
| | * | add all used libs to the pref_about_message. | Michael | 2014-11-09 | 1 | -15/+23 |
| | | | | | | | | | also improve the notice a bit. | ||||
| * | | fixed private messages | iNPUTmice | 2014-11-09 | 1 | -2/+2 |
| | | | |||||
| * | | s/getResourcepart().isEmpty()/isBareJid()/ | Sam Whited | 2014-11-09 | 5 | -7/+7 |
| | | | |||||
| * | | use isBareJid instead of getResourcePart().isEmpty() | iNPUTmice | 2014-11-09 | 2 | -2/+2 |
| | | | |||||
| * | | fixed muc sender history for some cases (where the previous nick was a valid ↵ | iNPUTmice | 2014-11-09 | 2 | -8/+17 |
| | | | | | | | | | jid) | ||||
| * | | migrated some otr stuff to new jid classes | iNPUTmice | 2014-11-09 | 2 | -79/+82 |
| | | | |||||
| * | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-09 | 27 | -106/+102 |
| |\ \ | | | | | | | | | | development | ||||
| | * \ | Merge pull request #642 from SamWhited/accountgetjid | Daniel Gultsch | 2014-11-09 | 27 | -106/+102 |
| | |\ \ | | | | | | | | | Rework `Account.getJid()' to return full JIDs | ||||
| | | * | | Rework `Account.getJid()' to return full JIDs | Sam Whited | 2014-11-09 | 27 | -106/+102 |
| | | | | | | | | | | | | | | | | | Remove `Account.getFullJid()' | ||||
| * | | | | Merge branch 'master' into development | iNPUTmice | 2014-11-09 | 1 | -14/+22 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | make avatar service not break on empty names | iNPUTmice | 2014-11-09 | 1 | -14/+22 |
| | | | | | |||||
| * | | | | fixed null pointer in message merger | iNPUTmice | 2014-11-09 | 1 | -0/+1 |
| | |/ / |/| | | |||||
| * | | | refactored code to always contain full jid for counterpart | iNPUTmice | 2014-11-09 | 8 | -86/+84 |
| | | | | |||||
| * | | | fixed full jid for account | iNPUTmice | 2014-11-09 | 1 | -80/+76 |
| | | | | |||||
| * | | | return null if from ist not set in abstract stanza | iNPUTmice | 2014-11-09 | 1 | -12/+17 |
| | | | | |||||
| * | | | Merge pull request #641 from kruks23/translation8 | Daniel Gultsch | 2014-11-09 | 1 | -1/+21 |
| |\ \ \ | | | | | | | | | Update Spanish Translations | ||||
| | * | | | Update Spanish Translations | kruks23 | 2014-11-09 | 1 | -1/+21 |
| | |/ / | |||||
| * | | | Check for illegal arguments to the toASCII func | Sam Whited | 2014-11-09 | 2 | -3/+17 |
| | | | | |||||
| * | | | Fix contact highlighting in MUC | Sam Whited | 2014-11-09 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fix issue with IDN SRV records | Sam Whited | 2014-11-09 | 1 | -2/+3 |
| | | | | |||||
| * | | | Fix crash on account creation | Sam Whited | 2014-11-09 | 1 | -13/+2 |
| | | | | |||||
| * | | | Don't crash on packets with no "from" specified | Sam Whited | 2014-11-09 | 1 | -1/+2 |
| | | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |