| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | fixed #410 by removing that config option | iNPUTmice | 2014-09-02 | 9 | -48/+14 | |
| * | | | | refactored share with activity | iNPUTmice | 2014-09-02 | 8 | -272/+266 | |
| * | | | | fixed #406 | iNPUTmice | 2014-09-02 | 1 | -12/+8 | |
| * | | | | rotate avatars | iNPUTmice | 2014-09-02 | 1 | -9/+16 | |
| * | | | | Merge pull request #408 from emdete/unicode_emoticons | Daniel Gultsch | 2014-09-02 | 1 | -1/+1 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
| | * | | | add all whitespaces in regex | M. Dietrich | 2014-09-02 | 1 | -1/+1 | |
| * | | | | Merge pull request #380 from emdete/unicode_emoticons | Daniel Gultsch | 2014-09-01 | 3 | -2/+25 | |
| |\| | | | |/ / |/| | | ||||||
| | * | | transform ascii to emoticons (on display only) | M. Dietrich | 2014-09-01 | 3 | -2/+25 | |
| * | | | fixed #403 | iNPUTmice | 2014-09-01 | 3 | -11/+18 | |
| * | | | Merge pull request #402 from emdete/remove_poormans_tostring | Daniel Gultsch | 2014-09-01 | 12 | -26/+26 | |
| |\ \ \ | ||||||
| | * | | | optimize string operations a bit | M. Dietrich | 2014-09-01 | 12 | -26/+26 | |
| | |/ / | ||||||
| * / / | updated readme | iNPUTmice | 2014-08-31 | 1 | -1/+4 | |
| |/ / | ||||||
| * | | deleted unnecessary log | iNPUTmice | 2014-08-31 | 1 | -2/+0 | |
| * | | Merge pull request #401 from jelmer/dutch-updates | Daniel Gultsch | 2014-08-31 | 1 | -0/+33 | |
| |\ \ | ||||||
| | * | | Update Dutch translations. | Jelmer Vernooij | 2014-08-31 | 1 | -0/+33 | |
| * | | | show merged time and status in message adapter | iNPUTmice | 2014-08-31 | 2 | -3/+21 | |
| * | | | improvements for merge conditions | iNPUTmice | 2014-08-31 | 2 | -3/+9 | |
| * | | | add missing blank before nick | iNPUTmice | 2014-08-31 | 1 | -0/+3 | |
| * | | | Merge pull request #400 from xsrc/development | Daniel Gultsch | 2014-08-31 | 1 | -6/+3 | |
| |\ \ \ | ||||||
| | * | | | Smarter nickname highlight insert in confernces | Bahtiar `kalkin-` Gadimov | 2014-08-31 | 1 | -6/+3 | |
| |/ / / | ||||||
| * | | | some code cleanup | iNPUTmice | 2014-08-31 | 75 | -1263/+1482 | |
| * | | | Merge pull request #391 from betheg/fix_typo | Daniel Gultsch | 2014-08-31 | 1 | -4/+4 | |
| |\ \ \ | ||||||
| | * \ \ | Merge remote-tracking branch 'upstream/development' into fix_typo | Michael | 2014-08-30 | 9 | -167/+364 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/development' into fix_typo | Michael | 2014-08-29 | 9 | -26/+37 | |
| | |\ \ \ \ | ||||||
| | * | | | | | fix forgotten spelling. | Michael | 2014-08-28 | 1 | -4/+4 | |
| | | |_|_|/ | |/| | | | ||||||
| * | | | | | Merge pull request #398 from betheg/fix_res | Daniel Gultsch | 2014-08-31 | 9 | -17/+13 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | fix: warning: string 'publish_avatar' has no default translation. | Michael | 2014-08-30 | 9 | -17/+13 | |
| | | |_|/ / | |/| | | | ||||||
| * | | | | | require encrypted to be the same for messages to get merged | iNPUTmice | 2014-08-31 | 1 | -1/+3 | |
| * | | | | | experimental message merging | iNPUTmice | 2014-08-31 | 3 | -44/+112 | |
| |/ / / / | ||||||
| * | | | | version bump to 0.7-alpha | iNPUTmice | 2014-08-30 | 1 | -2/+2 | |
| * | | | | Merge branch 'sm' into development | iNPUTmice | 2014-08-30 | 3 | -146/+250 | |
| |\ \ \ \ | ||||||
| | * | | | | reset unsend messages to waiting | iNPUTmice | 2014-08-30 | 2 | -2/+17 | |
| | * | | | | properly set stanza count on session resume | iNPUTmice | 2014-08-30 | 1 | -3/+21 | |
| | * | | | | basic message acking | iNPUTmice | 2014-08-30 | 3 | -131/+200 | |
| | | |_|/ | |/| | | ||||||
| * | | | | proper namespaces for xep-0352 | iNPUTmice | 2014-08-30 | 3 | -3/+3 | |
| * | | | | send inactive or active on every connect and resume | iNPUTmice | 2014-08-30 | 1 | -3/+10 | |
| * | | | | added basic csi | iNPUTmice | 2014-08-30 | 4 | -0/+86 | |
| |/ / / | ||||||
| * | | | version bump to 0.6 with changelogs0.6 | iNPUTmice | 2014-08-30 | 3 | -31/+27 | |
| * | | | brought npe catcher back for kxml parser | iNPUTmice | 2014-08-30 | 1 | -0/+4 | |
| | |/ |/| | ||||||
| * | | fixed link to old resource | iNPUTmice | 2014-08-29 | 1 | -2/+2 | |
| * | | fixed npe | iNPUTmice | 2014-08-29 | 1 | -0/+4 | |
| * | | more swedish translations | iNPUTmice | 2014-08-29 | 1 | -0/+3 | |
| * | | fixed #389 | iNPUTmice | 2014-08-29 | 6 | -6/+10 | |
| * | | Merge pull request #394 from suraia/translation-de | Daniel Gultsch | 2014-08-29 | 1 | -19/+19 | |
| |\ \ | |/ |/| | ||||||
| | * | Fix some typos in the German translation. | Michael Kuhn | 2014-08-28 | 1 | -19/+19 | |
| |/ | ||||||
| * | fixed spelling thanks @betheg | iNPUTmice | 2014-08-28 | 8 | -67/+63 | |
| * | formating in strings file | iNPUTmice | 2014-08-28 | 1 | -3/+3 | |
| * | Merge branch 'development' of https://github.com/beriain/Conversations into d... | iNPUTmice | 2014-08-28 | 1 | -12/+20 | |
| |\ | ||||||
| | * | Update strings.xml | Aitor Beriain | 2014-08-27 | 1 | -20/+20 | |
| * | | translated missing string in settings | iNPUTmice | 2014-08-27 | 5 | -44/+39 | |
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |