aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-182-9/+9
* | 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-181-4/+24
* | jingle sessions now get terminated proberly on successDaniel Gultsch2014-04-162-17/+34
* | made ui with sending images a little smootherDaniel Gultsch2014-04-153-29/+56
* | 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
* | Fix two typos: assoziated -> associated.Jelmer Vernooij2014-04-141-1/+1
* | 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-138-78/+215
* | 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-114-42/+63
* | incomming jingle packets are routed to their connection. added presence choos...Daniel Gultsch2014-04-108-160/+316
* | 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
* | fixed #52. thanks @strbDaniel Gultsch2014-04-071-1/+11
* | jingle connection and manager. able to trigger dialog in gajimDaniel Gultsch2014-04-078-79/+283
* | gui for imagesDaniel Gultsch2014-04-066-41/+88
* | added button to open imagesDaniel Gultsch2014-04-064-12/+117
* | added attach file actionDaniel Gultsch2014-04-061-0/+4
|/
* renamed [Archive conversation|Leave conference] to End this conversationDaniel Gultsch2014-04-061-1/+0
* fixed npeDaniel Gultsch2014-04-061-0/+9
* use proper, advertised sm namespaceDaniel Gultsch2014-04-055-25/+24
* cleaned up log output a little bitDaniel Gultsch2014-04-052-7/+1
* Switch to FULL_SYNC to make prosody happyRene Treffer2014-04-051-10/+5
* code cleanupDaniel Gultsch2014-04-051-11/+5
* marked incoming carbons as unreadDaniel Gultsch2014-04-041-5/+7
* notify on incomming received carbon messagesDaniel Gultsch2014-04-042-4/+12
* fixing more notification f-upsDaniel Gultsch2014-04-041-5/+16
* nothing importantDaniel Gultsch2014-04-031-1/+1
* Merge branch 'compression' of https://github.com/rtreffer/Conversations into ...Daniel Gultsch2014-04-039-16/+223
|\
| * Migrate all accounts to use compressionRene Treffer2014-04-031-4/+7