aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #146 from kruks23/developmentDaniel Gultsch2014-05-247-24/+54
|\
| * More harcoded translations + Spanishkruks232014-05-247-24/+54
* | Merge pull request #140 from strb/muciconsDaniel Gultsch2014-05-241-108/+41
|\ \
| * | Refactored unknown contact picture generationAndreas Straub2014-05-211-108/+41
* | | Merge pull request #145 from kruks23/developmentDaniel Gultsch2014-05-235-19/+47
|\ \ \ | | |/ | |/|
| * | Title activities translations + contacts translations + update Spanish Transl...kruks232014-05-235-19/+47
|/ /
* | end otr sessions earlier / more often. can lead to unesessary handshakes but ...Daniel Gultsch2014-05-233-17/+32
* | fixed possible npeDaniel Gultsch2014-05-231-0/+6
* | code cleanupDaniel Gultsch2014-05-232-10/+0
* | updated readmeDaniel Gultsch2014-05-231-1/+1
* | Merge pull request #143 from nachovfranco/mycommitsDaniel Gultsch2014-05-232-0/+195
|\ \
| * | Galician translationnachovfranco2014-05-222-0/+195
* | | Merge pull request #144 from kruks23/developmentDaniel Gultsch2014-05-233-19/+46
|\ \ \
| * | | Contact details translations + update spanish translationskruks232014-05-223-19/+46
|/ / /
* | | offline crud of contactsDaniel Gultsch2014-05-225-17/+48
* | | implementet missing methods on the new roster mgmtDaniel Gultsch2014-05-222-3/+17
|/ /
* | fixed #136Daniel Gultsch2014-05-222-24/+36
* | write contacts on system shutdownDaniel Gultsch2014-05-215-132/+198
* | added missing stringsDaniel Gultsch2014-05-211-1/+1
* | Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2014-05-211-2/+17
|\|
| * Merge pull request #138 from strb/highlightDaniel Gultsch2014-05-211-2/+17
| |\
| | * Fix highlight detection in MUC channelsAndreas Straub2014-05-211-2/+17
| |/
* / further improvment trying to deal with large imagesDaniel Gultsch2014-05-211-1/+6
|/
* cleaned up shared textDaniel Gultsch2014-05-216-26/+41
* auto retry image compression with decreasing sample sizeDaniel Gultsch2014-05-211-17/+15
* close input streamDaniel Gultsch2014-05-201-0/+1
* trying to deal with larger imagesDaniel Gultsch2014-05-201-4/+17
* Merge pull request #131 from beriain/developmentDaniel Gultsch2014-05-201-80/+121
|\
| * Update and fix basque translationBeriain2014-05-201-80/+121
* | Merge pull request #133 from kruks23/developmentDaniel Gultsch2014-05-205-14/+18
|\ \
| * | Update Spanish Translations + harcoded just_nowkruks232014-05-205-14/+18
| * | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-208-42/+33
| |\ \ | |/ / |/| |
* | | Merge pull request #128 from kruks23/developmentDaniel Gultsch2014-05-201-3/+8
|\ \ \
* | | | highlight people in conferences by clicken on their pictureDaniel Gultsch2014-05-201-14/+27
* | | | fixed ping time out after session resumeDaniel Gultsch2014-05-201-0/+1
* | | | ported pending subscription support to new roster mgmtDaniel Gultsch2014-05-203-28/+5
* | | | added search iconDaniel Gultsch2014-05-204-0/+0
| | * | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-193-41/+30
| | |\ \ | |_|/ / |/| | |
* | | | made roster persistant aka enabled versioning againDaniel Gultsch2014-05-193-41/+30
| | * | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-1917-642/+385
| |/| | | |/ / |/| |
* | | some code cleanup to deal with the roster mgmt changes from earlierDaniel Gultsch2014-05-193-77/+54
* | | reworked roster/contact handling. might break some stuff. not sycing to disk yetDaniel Gultsch2014-05-1916-566/+332
| * | Update Spanish Translationskruks232014-05-181-3/+8
| * | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-1810-83/+92
| |\ \ | |/ / |/| |
* | | bind and session request more compatibleDaniel Gultsch2014-05-184-5/+21
* | | fixed #123 fixed122Daniel Gultsch2014-05-183-31/+11
* | | cleaned up edit account dialog a littleDaniel Gultsch2014-05-183-20/+21
* | | fixed #53 aka server not found bugDaniel Gultsch2014-05-183-27/+39
| * | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-173-9/+13
| |\ \ | |/ / |/| |
* | | sending session after unsucesfull session resume. fixed #116Daniel Gultsch2014-05-171-7/+8