aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* allow images to be opened with gallary appDaniel Gultsch2014-04-217-5/+161
* added missing transport idDaniel Gultsch2014-04-211-0/+1
* added proxy activate and a lot of code clean up. totatly untestedDaniel Gultsch2014-04-205-145/+161
* made our spanish friends happy. fixed #68Daniel Gultsch2014-04-201-21/+22
* fixed #50Daniel Gultsch2014-04-203-14/+32
* more jingle bug fixesDaniel Gultsch2014-04-193-12/+10
* fixed replace contact in conversationDaniel Gultsch2014-04-191-15/+15
* made debugging verbose again on specific partsDaniel Gultsch2014-04-192-4/+10
* fixed default autoaccept file size and wrongly marked messageDaniel Gultsch2014-04-192-3/+3
* cleaned up debug log a little bitDaniel Gultsch2014-04-197-91/+118
* fixed concurrent modification of contacts which led to missing presencesDaniel Gultsch2014-04-182-10/+15
* tried to avoid some more race conditions in jingleDaniel Gultsch2014-04-183-38/+80
* updated minidnsDaniel Gultsch2014-04-181-5/+5
* Merge branch 'master' into developmentDaniel Gultsch2014-04-181-21/+25
|\
| * work around for bug in xmlpullparserDaniel Gultsch2014-04-181-21/+25
* | lot of cleanup in jingle partDaniel Gultsch2014-04-186-120/+326
* | put more string into strings.xmlDaniel Gultsch2014-04-184-11/+17
* | fixed destination bugDaniel Gultsch2014-04-183-5/+15
* | fixed #63Daniel Gultsch2014-04-182-2/+21
* | fixed possible race conditions with presencesDaniel Gultsch2014-04-185-11/+23
* | added clear history dialog (no funcionality)Daniel Gultsch2014-04-184-5/+52
* | jingle sessions now get terminated proberly on successDaniel Gultsch2014-04-162-17/+34
* | made ui with sending images a little smootherDaniel Gultsch2014-04-156-30/+61
* | added very basic, very untested gui on the receiving sideDaniel Gultsch2014-04-142-27/+59
* | tried to fix some race conditions. not adding duplicate candidates. needs mor...Daniel Gultsch2014-04-144-20/+45
* | Merge pull request #59 from jelmer/typo-preemptivelyDaniel Gultsch2014-04-141-1/+1
|\ \
| * | Fix typo: Preemptivly -> Preemptively.Jelmer Vernooij2014-04-141-1/+1
| |/
* | Merge pull request #58 from jelmer/fix-typo-assoziatedDaniel Gultsch2014-04-142-2/+2
|\ \
| * | Fix two typos: assoziated -> associated.Jelmer Vernooij2014-04-142-2/+2
|/ /
* | added contributors and note to xep65Daniel Gultsch2014-04-131-0/+6
* | Some icon tweaksAndreas Straub2014-04-131-14/+16
* | Added ellipsis tile for large conversationsAndreas Straub2014-04-131-5/+17
* | Major Contact Picture code cleanupAndreas Straub2014-04-137-55/+71
* | transmitting files between two conversations works. no error handling and no ...Daniel Gultsch2014-04-136-36/+136
* | some code cleanup. added setting to auto accept files. socks5 connections are...Daniel Gultsch2014-04-1310-78/+234
* | more efficant way of calculating the sha1 sum. closing connectionsDaniel Gultsch2014-04-1310-109/+204
* | fixed minor typosDaniel Gultsch2014-04-122-3/+2
* | Merge branch 'development' of https://github.com/strb/Conversations into strb...Daniel Gultsch2014-04-126-44/+205
|\ \
| * | Added tiled MUC iconsandy2014-04-121-16/+164
| * | More Contact Picture refactorsandy2014-04-125-17/+40
| * | Refactor UIHelper to use getContactPictureandy2014-04-122-14/+4
* | | add sha1 sum to fileDaniel Gultsch2014-04-124-3/+50
* | | open latest conversation from notificationDaniel Gultsch2014-04-111-0/+3
|/ /
* | first file transfer between gajim and conversations. still a lot to do thoughDaniel Gultsch2014-04-114-13/+94
* | socks5 initialisation works. doesn't get activate thoughDaniel Gultsch2014-04-119-38/+180
* | failed messages get now marked inlineDaniel Gultsch2014-04-116-96/+65
* | incomming jingle packets are routed to their connection. added presence choos...Daniel Gultsch2014-04-109-160/+318
* | changed behaviour of expecption handler to check if accounts are working befo...Daniel Gultsch2014-04-101-12/+15
* | disocover stream hosts (xep-0065) cleaned up discoDaniel Gultsch2014-04-0811-108/+211
* | fixed npeDaniel Gultsch2014-04-081-3/+5