aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixed npeDaniel Gultsch2014-05-151-5/+3
|
* hiding the prepare image toast after error or successDaniel Gultsch2014-05-142-3/+15
|
* fixed possible npeDaniel Gultsch2014-05-141-4/+3
|
* fixed #105Daniel Gultsch2014-05-143-29/+43
|
* made message parser non staticDaniel Gultsch2014-05-142-64/+86
|
* code clean upDaniel Gultsch2014-05-141-104/+51
|
* Merge branch 'development' into feature/take_pictureDaniel Gultsch2014-05-144-3/+8
|\
| * one more entry to strings fileDaniel Gultsch2014-05-132-1/+2
| |
| * version bump0.2.1Daniel Gultsch2014-05-132-2/+6
| |
* | added presence selectionDaniel Gultsch2014-05-131-5/+19
| |
* | Merge branch 'development' into feature/take_pictureDaniel Gultsch2014-05-131-71/+116
|\|
| * Merge branch 'beriain-development' into developmentDaniel Gultsch2014-05-131-71/+116
| |\
| | * Merge branch 'development' of https://github.com/beriain/Conversations into ↵Daniel Gultsch2014-05-131-71/+116
| |/| | | | | | | | | | beriain-development
| | * FixBeriain2014-05-131-79/+79
| | |
| | * Merge https://github.com/siacs/Conversations into developmentBeriain2014-05-1314-44/+416
| | |\
| | * | Update basque translation and include preferencesBeriain2014-05-131-0/+8
| | | |
| | * | Update basque translationBeriain2014-05-121-0/+34
| | | |
| | * | Merge https://github.com/siacs/Conversations into developmentBeriain2014-05-1221-265/+439
| | |\ \
| | * | | Update basque translationBeriain2014-05-081-0/+3
| | | | |
* | | | | 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
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 04:55:14 +0000