aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' into feature/take_pictureDaniel Gultsch2014-05-131-10/+12
|\
| * code cleanupDaniel Gultsch2014-05-131-10/+12
| |
* | takeing pictures over intentDaniel Gultsch2014-05-133-42/+95
| |
* | Merge branch 'development' into feature/take_pictureDaniel Gultsch2014-05-132-8/+10
|\|
| * static method for providing content uriDaniel Gultsch2014-05-132-8/+10
| |
* | submenu for attach fileDaniel Gultsch2014-05-133-1/+42
|/
* ensure that iq response is being send out for jingle packets. remove jingle ↵Daniel Gultsch2014-05-132-22/+44
| | | | connection from manager after termination
* german translationDaniel Gultsch2014-05-131-1/+1
|
* further translationsDaniel Gultsch2014-05-135-17/+67
|
* fixed npe in tag writerDaniel Gultsch2014-05-131-2/+6
|
* fixed french languageDaniel Gultsch2014-05-131-13/+13
|
* Merge pull request #88 from BenoitBouvarel/developmentDaniel Gultsch2014-05-123-0/+127
|\ | | | | Translation into French
| * Traduction FrancaiseBenoit Bouvarel2014-05-073-0/+127
| |
* | Merge pull request #101 from kruks23/developmentDaniel Gultsch2014-05-121-0/+28
|\ \ | | | | | | Preferences Spanish Translations
| * | Preferences Spanish Translationskruks232014-05-121-0/+28
| | |
* | | Fix a typo in catalan translationalvar2014-05-121-1/+1
| | |
* | | Translation into catalan languagealvar2014-05-122-0/+141
| | |
* | | fixed parsing error on missing %sDaniel Gultsch2014-05-121-2/+2
|/ /
* | marked version 0.2 - skipping beta0.2Daniel Gultsch2014-05-121-2/+2
| |
* | added changelog entryDaniel Gultsch2014-05-121-0/+1
| |
* | Better error handling if attach file doesnt work (on permission denied)0.2-betaDaniel Gultsch2014-05-1210-102/+112
| | | | | | and unified encrypted and unencrypted file attachment
* | transfered preferences descritpions into strings.xmliNPUTmice2014-05-112-22/+45
| |
* | Merge pull request #93 from kruks23/developmentDaniel Gultsch2014-05-101-33/+42
|\ \ | | | | | | Spanish Translation
| * | Delete styles.xmlkruks232014-05-101-19/+0
| | |
| * | Merge remote-tracking branch 'origin/development' into developmentkruks232014-05-101-0/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: res/values-es/arrays.xml res/values-es/strings.xml
| | * | #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 transfer0.2-alphaDaniel 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.md
| | * | | 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 sentence
| * | | 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
| |\ \ \ | |/ / / |/| | | 2
* | | | 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
| |\ \ \ | |/ / / |/| | | pull
* | | | 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 only
| * | | 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 19:49:40 +0000