aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-111-153/+75
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-104-15/+19
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-1/+1
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-024-13/+13
|\|
* | Merge trz/rename into trz/rebasesteckbrief2015-10-221-5/+3
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-051-13/+2
|\|
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-051-0/+18
|\|
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-1913-1622/+0
* | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-161-129/+0
* | Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-161-3/+3
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-117-95/+660
* | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-0/+14
|/
* no trim of messages or passwordlookshe2015-04-111-2/+1
* Merge tag '1.2.0' into trz/mastersteckbrief2015-03-306-16/+120
|\
| * show geo uris as 'location' in overviewiNPUTmice2015-03-101-1/+7
| * Merge pull request #1022 from Boris-de/cipher_blacklistDaniel Gultsch2015-03-081-0/+16
| |\
| | * disable all really weak cipher suitesBoris Wachtmeister2015-03-071-0/+16
| * | display geo uris as location. show 'send loction' in share menu if request lo...iNPUTmice2015-03-071-0/+71
| |/
| * made xmpp uris case insensitiveiNPUTmice2015-02-181-3/+3
| * support for XEP-0092: Software VersioniNPUTmice2015-02-161-0/+14
| * Merge pull request #959 from SamWhited/ciphers_fixDaniel Gultsch2015-02-091-5/+7
| |\
| | * Use platform ciphers as well, just prefer oursSam Whited2015-02-021-5/+7
| * | always add a non resolved SRV record to the listiNPUTmice2015-02-091-6/+1
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 03:11:39 +0000