aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)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-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 ↵Daniel Gultsch2014-04-144-20/+45
| | | | | | | | more checks though
* | Merge pull request #59 from jelmer/typo-preemptivelyDaniel Gultsch2014-04-141-1/+1
|\ \ | | | | | | Fix typo: Preemptivly -> Preemptively.
| * | 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.
| * | 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
| | | | | | | | Use Roboto Light, thinner lines between tiles, slightly smaller letters
* | Added ellipsis tile for large conversationsAndreas Straub2014-04-131-5/+17
| | | | | | | | | | For more than 4 members in a conversation, the fourth tile now contains an ellipsis to indicate this
* | Major Contact Picture code cleanupAndreas Straub2014-04-137-55/+71
| | | | | | | | | | Notifications now have pseudotransparent icons, icons are generated in the correct size.
* | transmitting files between two conversations works. no error handling and no ↵Daniel Gultsch2014-04-136-36/+136
| | | | | | | | ui on the receiving end
* | some code cleanup. added setting to auto accept files. socks5 connections ↵Daniel Gultsch2014-04-1310-78/+234
| | | | | | | | are now threaded
* | 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 ↵Daniel Gultsch2014-04-126-44/+205
|\ \ | | | | | | | | | strb-development
| * | Added tiled MUC iconsandy2014-04-121-16/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, MUCs have icons with up to 4 tiles representing MUC members, similar to the gmail app. Some caveats: As of now, no ordering is imposed on the members, we simply pick the first (up to) 4 returned by the MucOptions object. This could be done better, e.g. by picking more important members first (based on affil/role), or even going so far as to order them by how recently they sent a message in the MUC. Also, the code generating the tiles is really messy right now (tons of copy and paste). It seems to work though. I will clean this up soon.
| * | More Contact Picture refactorsandy2014-04-125-17/+40
| | | | | | | | | | | | | | | Use polymorphism to avoid dynamic dispatch based on nulled parameters. Next up: Prettier MUC icons
| * | Refactor UIHelper to use getContactPictureandy2014-04-122-14/+4
| | | | | | | | | | | | Normalize the interface, reduce code duplication
* | | 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 ↵Daniel Gultsch2014-04-109-160/+318
| | | | | | | | chooser in gui
* | changed behaviour of expecption handler to check if accounts are working ↵Daniel Gultsch2014-04-101-12/+15
| | | | | | | | before removing the stacktrace
* | 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-072-1/+16
| |
* | jingle connection and manager. able to trigger dialog in gajimDaniel Gultsch2014-04-0710-81/+287
| |
* | gui for imagesDaniel Gultsch2014-04-068-41/+104
| |
* | added button to open imagesDaniel Gultsch2014-04-064-12/+117
| |
* | added attach file actionDaniel Gultsch2014-04-067-0/+12
|/
* renamed [Archive conversation|Leave conference] to End this conversationDaniel Gultsch2014-04-063-3/+2
|
* fixed npeDaniel Gultsch2014-04-061-0/+9
|
* spelling and more features to changelog0.1.3Daniel Gultsch2014-04-061-5/+6
|
* added changelogDaniel Gultsch2014-04-061-0/+18
|
* use proper, advertised sm namespaceDaniel Gultsch2014-04-055-25/+24
|
* cleaned up log output a little bitDaniel Gultsch2014-04-052-7/+1
|
* Merge pull request #49 from rtreffer/compression-fixDaniel Gultsch2014-04-051-10/+5
|\ | | | | Switch to FULL_SYNC to make prosody happy
| * Switch to FULL_SYNC to make prosody happyRene Treffer2014-04-051-10/+5
|/