aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #93 from kruks23/developmentDaniel Gultsch2014-05-101-33/+42
|\
| * Delete styles.xmlkruks232014-05-101-19/+0
| * Merge remote-tracking branch 'origin/development' into developmentkruks232014-05-101-0/+19
| |\
| | * #79 First translation into spanish.kruks232014-05-063-0/+127
| * | Translation into spanish.kruks232014-05-102-52/+42
| * | #79 First translation into spanish.kruks232014-05-101-0/+19
* | | fixed possible npe and possible exceptioniNPUTmice2014-05-101-2/+9
|/ /
* | added dialog for otr file transferDaniel Gultsch2014-05-093-3/+30
* | Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2014-05-091-1/+1
|\ \
| * \ Merge pull request #91 from the-solipsist/patch-1Daniel Gultsch2014-05-091-1/+1
| |\ \
| | * | Corrected spelling of "formerly" in README.methe-solipsist2014-05-091-1/+1
* | | | version 0.2 alpha and changelogDaniel Gultsch2014-05-092-2/+8
|/ / /
* | | link to openkeychain from contact detailsDaniel Gultsch2014-05-092-9/+33
* | | nicer descriptions in notificaton for images and encrypted messagesDaniel Gultsch2014-05-095-7/+37
|/ /
* | Merge pull request #89 from dschuermann/fix-otr-messageDaniel Gultsch2014-05-083-2/+13
|\ \
| * | Improve OTR fingerprint dialog and fix german sentenceDominik Schürmann2014-05-083-2/+13
| * | Merge pull request #2 from siacs/developmentDominik Schürmann2014-05-085-111/+137
| |\ \ | |/ / |/| |
* | | sending text message after returing from pending intentDaniel Gultsch2014-05-083-80/+90
* | | better flow after returning from openkeychain for various actionsDaniel Gultsch2014-05-083-31/+47
| * | Merge pull request #1 from siacs/developmentDominik Schürmann2014-05-088-231/+282
| |\ \ | |/ / |/| |
* | | offer to announce pgp key if pgp encryption is selected from menuDaniel Gultsch2014-05-083-42/+50
* | | more informative dialog if contact doesn't announce public keyDaniel Gultsch2014-05-083-36/+57
* | | code cleanupDaniel Gultsch2014-05-086-164/+171
* | | fixed download button on pgp imagesDaniel Gultsch2014-05-081-4/+19
* | | Merge pull request #87 from dschuermann/developmentDaniel Gultsch2014-05-074-4/+10
|\| |
| * | Use git submodule with openpgp-api-lib onlyDominik Schürmann2014-05-074-4/+10
|/ /
* | updated readmeDaniel Gultsch2014-05-071-1/+13
* | fixed #70 #65Daniel Gultsch2014-05-071-1/+1
* | improved next encryption selectionDaniel Gultsch2014-05-072-3/+4
* | remembering text. awesomeDaniel Gultsch2014-05-072-214/+227
* | correct status after error iqDaniel Gultsch2014-05-071-1/+3
* | wee bit of code cleanupDaniel Gultsch2014-05-075-77/+104
* | basic german translationDaniel Gultsch2014-05-062-0/+108
* | Merge pull request #80 from beriain/developmentDaniel Gultsch2014-05-064-0/+216
|\ \
| * | Merge https://github.com/siacs/Conversations into developmentBeriain2014-05-0611-90/+55
| |\|
| * | Update basque and spanish translationsBeriain2014-05-066-90/+2
| * | Add Basque and Spanish translationsMikel2014-05-028-0/+304
* | | basic pgp encrypted file transferDaniel Gultsch2014-05-067-92/+253
| |/ |/|
* | 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
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 01:35:07 +0000