aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #398 from betheg/fix_resDaniel Gultsch2014-08-319-17/+13
|\
| * fix: warning: string 'publish_avatar' has no default translation.Michael2014-08-309-17/+13
* | require encrypted to be the same for messages to get mergediNPUTmice2014-08-311-1/+3
* | experimental message mergingiNPUTmice2014-08-313-44/+112
|/
* version bump to 0.7-alphaiNPUTmice2014-08-301-2/+2
* Merge branch 'sm' into developmentiNPUTmice2014-08-303-146/+250
|\
| * reset unsend messages to waitingiNPUTmice2014-08-302-2/+17
| * properly set stanza count on session resumeiNPUTmice2014-08-301-3/+21
| * basic message ackingiNPUTmice2014-08-303-131/+200
* | proper namespaces for xep-0352iNPUTmice2014-08-303-3/+3
* | send inactive or active on every connect and resumeiNPUTmice2014-08-301-3/+10
* | added basic csiiNPUTmice2014-08-304-0/+86
|/
* version bump to 0.6 with changelogs0.6iNPUTmice2014-08-303-31/+27
* brought npe catcher back for kxml parseriNPUTmice2014-08-301-0/+4
* fixed link to old resourceiNPUTmice2014-08-291-2/+2
* fixed npeiNPUTmice2014-08-291-0/+4
* more swedish translationsiNPUTmice2014-08-291-0/+3
* fixed #389iNPUTmice2014-08-296-6/+10
* Merge pull request #394 from suraia/translation-deDaniel Gultsch2014-08-291-19/+19
|\
| * Fix some typos in the German translation.Michael Kuhn2014-08-281-19/+19
|/
* fixed spelling thanks @bethegiNPUTmice2014-08-288-67/+63
* formating in strings fileiNPUTmice2014-08-281-3/+3
* Merge branch 'development' of https://github.com/beriain/Conversations into d...iNPUTmice2014-08-281-12/+20
|\
| * Update strings.xmlAitor Beriain2014-08-271-20/+20
* | translated missing string in settingsiNPUTmice2014-08-275-44/+39
* | added swedish translations by Anders Sandblad @andersrunesoniNPUTmice2014-08-271-1/+24
* | added missing string to german translationiNPUTmice2014-08-261-0/+1
* | Merge pull request #385 from rostovtsev/developmentDaniel Gultsch2014-08-261-23/+59
|\ \
| * | Updated to 0.6.1Ilia2014-08-261-23/+59
|/ /
* | Merge pull request #384 from wapolinar/typosDaniel Gultsch2014-08-261-11/+11
|\ \
| * | Typos in readme.Wolfgang Apolinarski2014-08-261-11/+11
|/ /
* | removed deprecated strings from translationsiNPUTmice2014-08-266-49/+1
* | Merge pull request #376 from wapolinar/developmentDaniel Gultsch2014-08-251-1/+1
|\ \
| * | Update strings.xmlwapolinar2014-08-251-1/+1
* | | Merge pull request #377 from kruks23/translation2Daniel Gultsch2014-08-251-11/+6
|\ \ \
| * | | Update Spanish Translationskruks232014-08-251-11/+6
|/ / /
* / / fixing duplicate private muc messagesiNPUTmice2014-08-251-3/+10
|/ /
* | fixed message hintiNPUTmice2014-08-251-51/+61
* | fixed faulty db creation on first installiNPUTmice2014-08-241-9/+12
* | Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2014-08-241-11/+12
|\ \
| * \ Merge pull request #375 from kriztan/patch-2Daniel Gultsch2014-08-241-11/+12
| |\ \
| | * | Update strings.xmlkriztan2014-08-241-11/+12
| |/ /
* | | use otr encrypiton instead of plain when contact has exactly one online prese...Daniel Gultsch2014-08-241-0/+10
* | | jump right into edit account if now accounts are configuredDaniel Gultsch2014-08-233-10/+19
* | | changed workflow on inital avatar publicationDaniel Gultsch2014-08-233-11/+40
|/ /
* | experimental muc message deduplicationDaniel Gultsch2014-08-233-2/+25
* | removed server compat value in favor of a (small xep list)Daniel Gultsch2014-08-234-177/+187
* | Merge pull request #373 from kruks23/translation1Daniel Gultsch2014-08-231-3/+10
|\ \
| * | Update Spanish Translationskruks232014-08-211-3/+10
* | | fixed another npeiNPUTmice2014-08-221-7/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 06:46:58 +0000