aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge branch 'unused_resources' of https://github.com/betheg/Conversations ↵iNPUTmice2014-09-0211-496/+0
|/| | | | | | | | | | | | | | | into betheg-unused_resources
| * | | removed unused string resources.Michael2014-09-0111-496/+0
| | | |
* | | | fixed #410 by removing that config optioniNPUTmice2014-09-029-48/+14
| | | |
* | | | refactored share with activityiNPUTmice2014-09-028-272/+266
| | | |
* | | | fixed #406iNPUTmice2014-09-021-12/+8
| | | |
* | | | rotate avatarsiNPUTmice2014-09-021-9/+16
| | | |
* | | | Merge pull request #408 from emdete/unicode_emoticonsDaniel Gultsch2014-09-021-1/+1
|\ \ \ \ | | |/ / | |/| | add all whitespaces in regex
| * | | add all whitespaces in regexM. Dietrich2014-09-021-1/+1
| | | |
* | | | Merge pull request #380 from emdete/unicode_emoticonsDaniel Gultsch2014-09-013-2/+25
|\| | | | |/ / |/| | add translation from ascii to unicode emoticons
| * | transform ascii to emoticons (on display only)M. Dietrich2014-09-013-2/+25
| | |
* | | fixed #403iNPUTmice2014-09-013-11/+18
| | |
* | | Merge pull request #402 from emdete/remove_poormans_tostringDaniel Gultsch2014-09-0112-26/+26
|\ \ \ | | | | | | | | optimize string operations a bit
| * | | optimize string operations a bitM. Dietrich2014-09-0112-26/+26
| |/ /
* / / updated readmeiNPUTmice2014-08-311-1/+4
|/ /
* | deleted unnecessary logiNPUTmice2014-08-311-2/+0
| |
* | Merge pull request #401 from jelmer/dutch-updatesDaniel Gultsch2014-08-311-0/+33
|\ \ | | | | | | Update Dutch translations.
| * | Update Dutch translations.Jelmer Vernooij2014-08-311-0/+33
| | |
* | | show merged time and status in message adapteriNPUTmice2014-08-312-3/+21
| | |
* | | improvements for merge conditionsiNPUTmice2014-08-312-3/+9
| | |
* | | 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 changelogsiNPUTmice2014-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