aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* made file transfers cancelableiNPUTmice2014-11-158-22/+76
* adepted conversationadapter to deal with filesiNPUTmice2014-11-152-3/+23
* progress for ibb transfersiNPUTmice2014-11-155-13/+27
* some mime and pgp fixes for file transferiNPUTmice2014-11-157-73/+71
* support for pgp filesiNPUTmice2014-11-155-23/+38
* progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-157-8/+40
* copy non local files to private storage firstiNPUTmice2014-11-153-23/+77
* bug fixes and various improvements for file transferiNPUTmice2014-11-155-19/+30
* basic arbitrary file transferiNPUTmice2014-11-1513-136/+332
* Merge pull request #665 from SamWhited/issue71Daniel Gultsch2014-11-158-381/+729
|\
| * Improve auth error handling and state machineSam Whited2014-11-155-40/+43
| * Add SCRAM-SHA1 supportSam Whited2014-11-149-381/+726
* | Merge pull request #666 from SamWhited/localefixesDaniel Gultsch2014-11-152-3/+3
|\ \
| * | Spelling fixes in Italian translationSam Whited2014-11-141-2/+2
| * | Spelling fix in German translationSam Whited2014-11-141-1/+1
| |/
* | Merge pull request #667 from SamWhited/licensesuntranslatableDaniel Gultsch2014-11-151-1/+1
|\ \ | |/ |/|
| * Make licenses info untranslatableSam Whited2014-11-141-1/+1
|/
* Merge pull request #664 from squidpickles/developmentDaniel Gultsch2014-11-141-0/+3
|\
| * Added check for empty from on group chat packetKevin Rauwolf2014-11-141-0/+3
|/
* 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
| |/
* | Merge pull request #659 from SamWhited/jidfixesDaniel Gultsch2014-11-121-2/+3
|\ \ | |/ |/|
| * 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
* | Merge pull request #644 from SamWhited/barejidchecksDaniel Gultsch2014-11-095-7/+7
|\ \
| * | 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-0928-110/+103
|\ \
| * \ 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 pull request #643 from SamWhited/idndependfixDaniel Gultsch2014-11-091-4/+1
| |\ \ \
| | * | | Remove unused dependencySam Whited2014-11-091-4/+1
| |/ / /
* | | | Merge branch 'master' into developmentiNPUTmice2014-11-091-14/+22
|\ \ \ \ | |/ / / |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 05:14:27 +0000