aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | trim message bodys on displayDaniel Gultsch2015-02-071-1/+1
| |/
* | Merge master-originsteckbrief2015-02-204-19/+164
|\|
| * don't disable any ciphersiNPUTmice2015-02-021-3/+4
| * fixed text preview for imagesiNPUTmice2015-02-011-1/+1
| * fix mergable() for /me command.Michael2015-01-251-2/+3
| * proper desc for offering and sending images in conversations overviewiNPUTmice2015-01-181-0/+8
| * use same helper methods for images and filesiNPUTmice2015-01-181-21/+8
| * Merge pull request #901 from kriztan/patch-2Daniel Gultsch2015-01-181-0/+4
| |\
| | * Added new file type names for file transfersChristian S2015-01-181-0/+4
| * | Fix string substitutions with unknown filetypesSam Whited2015-01-171-2/+2
| |/
| * Correct the download file string on notificationsSam Whited2015-01-171-10/+12
| * handle muc nicks with white spaces. fixed #884iNPUTmice2015-01-141-2/+2
| * Harden the TLS connection cipher suitesSam Whited2015-01-141-5/+16
| * catch bug in guessContentTypeDaniel Gultsch2015-01-121-1/+6
| * reworked message preview / message meta information (ie file offered, receive...Daniel Gultsch2015-01-121-0/+110
| * code cleanup for jingle proxy discoveryDaniel Gultsch2015-01-091-0/+1
| * refactored UiHelperDaniel Gultsch2015-01-071-2/+10
| * prevent QR code parser from crashing fixed #839Daniel Gultsch2015-01-051-6/+13
* | Merge branch 'master' of ssh://git.fucktheforce.de/conversationslookshe2015-01-037-176/+31
|\|
| * improved OTR verification part oneDaniel Gultsch2015-01-021-1/+1
| * Add ability to change password on serverSam Whited2014-12-251-0/+1
| * Remove old JID validatorSam Whited2014-12-231-14/+0
| * Simplify roster handling codeSam Whited2014-12-221-0/+1
| * Add support for XEP-0191 (Blocking command)Sam Whited2014-12-222-1/+5
| * more patches for dns helperiNPUTmice2014-12-141-13/+19
| * possible dns fixesiNPUTmice2014-12-141-2/+11
| * avoiding concurrent modificationiNPUTmice2014-12-131-4/+1
| * cleanup: removed unused emoticon parsingiNPUTmice2014-12-091-42/+0
| * cleanup: removed stream compressioniNPUTmice2014-12-092-149/+0
* | remaining part of my patchlookshe2015-01-031-1/+101
|/
* close cursors after querying phone dbiNPUTmice2014-12-031-0/+2
* cleaned up avatar / tile creationiNPUTmice2014-12-031-0/+3
* remove unused imports.Michael2014-11-212-21/+0
* put error notification into notification serviceiNPUTmice2014-11-181-42/+0
* fixed regression of xmpp uris not workingiNPUTmice2014-11-161-3/+3
* happy hanukkahiNPUTmice2014-11-161-0/+7
* Don't escape passwords in SASLSam Whited2014-11-151-1/+1
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-161-0/+79
* parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...iNPUTmice2014-11-161-0/+9
* Cache SCRAM-SHA-1 keys for current sessionSam Whited2014-11-151-0/+4
* Merge branch 'feature/otr_verification' into developmentiNPUTmice2014-11-151-34/+0
|\
| * initial smp supportiNPUTmice2014-11-111-34/+0
* | Add SCRAM-SHA1 supportSam Whited2014-11-141-2/+29
* | Refactor authentication codeSam Whited2014-11-121-59/+1
|/
* more refactoring for presence selection. removed getTo, getFrom and getJid fr...iNPUTmice2014-11-101-0/+2
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-092-2/+2
* Update more files to use JID objectsSam Whited2014-11-092-13/+16
* Move a chunk of classes over to using JID objectsSam Whited2014-11-091-6/+8
* Merge branch 'gradle' into developmentSam Whited2014-10-302-32/+179
* Make conversations the root projectSam Whited2014-10-2212-0/+1289