aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add missing blank before nickiNPUTmice2014-08-311-0/+3
|
* Merge pull request #400 from xsrc/developmentDaniel Gultsch2014-08-311-6/+3
|\ | | | | Smarter nickname highlight insert in confernces
| * Smarter nickname highlight insert in conferncesBahtiar `kalkin-` Gadimov2014-08-311-6/+3
|/
* some code cleanupiNPUTmice2014-08-3175-1263/+1482
|
* Merge pull request #391 from betheg/fix_typoDaniel Gultsch2014-08-311-4/+4
|\ | | | | fix forgotten spelling.
| * Merge remote-tracking branch 'upstream/development' into fix_typoMichael2014-08-309-167/+364
| |\
| * \ Merge remote-tracking branch 'upstream/development' into fix_typoMichael2014-08-299-26/+37
| |\ \
| * | | fix forgotten spelling.Michael2014-08-281-4/+4
| | | |
* | | | Merge pull request #398 from betheg/fix_resDaniel Gultsch2014-08-319-17/+13
|\ \ \ \ | | | | | | | | | | fix: warning: string 'publish_avatar' has no default translation.
| * | | | fix: warning: string 'publish_avatar' has no default translation.Michael2014-08-309-17/+13
| | |_|/ | |/| | | | | | | | | | also altered the types of resources from array to string-array in some res-files.
* | | | 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
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/eu/siacs/conversations/services/XmppConnectionService.java
| * | | 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.
| * 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 ↵iNPUTmice2014-08-281-12/+20
|\ | | | | | | | | | | | | development Conflicts: res/values-eu/strings.xml
| * 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
|\ \ | | | | | | russian translation for 0.6
| * | Updated to 0.6.1Ilia2014-08-261-23/+59
|/ / | | | | | | 1. Different bug fixed. 2. Added new __<string name="general">Общие</string>__, guys you must add this to your _Conversation_ code, because now, if you go to settings, you can't change the label General - it's hard-coded for all languages.
* | Merge pull request #384 from wapolinar/typosDaniel Gultsch2014-08-261-11/+11
|\ \ | | | | | | Typos in readme.
| * | 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.xml
| * | Update strings.xmlwapolinar2014-08-251-1/+1
| | | | | | | | | Typo in a key for the German translation.
* | | Merge pull request #377 from kruks23/translation2Daniel Gultsch2014-08-251-11/+6
|\ \ \ | | | | | | | | Update Spanish Translations
| * | | 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 german translations
| | * | Update strings.xmlkriztan2014-08-241-11/+12
| |/ /