aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/siacs/Conversations into developmentBeriain2014-05-0611-90/+55
|\
| * content name and creator are properly setDaniel Gultsch2014-05-032-9/+13
| * properly reply to iq requests. reply to discoDaniel Gultsch2014-05-032-1/+19
| * allow roster pushes only from bare jid or nullDaniel Gultsch2014-05-031-4/+6
| * more cleanup in res filesDaniel Gultsch2014-05-032-34/+9
| * removed unnecessary filesDaniel Gultsch2014-05-034-40/+0
| * added restart button to openkeychain dialogDaniel Gultsch2014-05-033-3/+9
* | Update basque and spanish translationsBeriain2014-05-066-90/+2
* | Add Basque and Spanish translationsMikel2014-05-028-0/+304
|/
* nicer dialog screen if openkeychain is not installedDaniel Gultsch2014-05-023-3/+28
* reworked openpgp integration part #1Daniel Gultsch2014-05-0111-268/+444
* bug fix for jingleDaniel Gultsch2014-04-261-1/+1
* unified presence selection for otr and file transferDaniel Gultsch2014-04-264-74/+100
* fixed #75Daniel Gultsch2014-04-252-2/+3
* setting backround color if image comes directly from cacheDaniel Gultsch2014-04-251-0/+1
* couple of more optimazations on image loadingDaniel Gultsch2014-04-257-64/+43
* smoother scrolling (first step)Daniel Gultsch2014-04-259-62/+243
* deny files with unknown file typesDaniel Gultsch2014-04-234-21/+76
* added download button for images not accepted automaticallyDaniel Gultsch2014-04-225-16/+78
* added support for ibbDaniel Gultsch2014-04-227-23/+313
* code cleanupDaniel Gultsch2014-04-212-28/+16
* 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
|/ /