| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #397 from GZep/development | Daniel Gultsch | 2014-09-04 | 2 | -2/+12 |
| |\ | |||||
| | * | Contact presenceName property | Gayaz Yusipov | 2014-08-31 | 2 | -1/+8 |
| | * | XEP-0172 | Gayaz Yusipov | 2014-08-30 | 1 | -2/+5 |
| * | | Merge pull request #417 from emdete/unicode_emoticons | Daniel Gultsch | 2014-09-04 | 1 | -16/+32 |
| |\ \ | |||||
| | * | | improve emo mapping | M. Dietrich | 2014-09-03 | 1 | -6/+9 |
| | * | | use class, use codepoint | M. Dietrich | 2014-09-03 | 1 | -25/+26 |
| | * | | make pattern static | M. Dietrich | 2014-09-03 | 1 | -16/+20 |
| | * | | improve regex, implement pattern cache | M. Dietrich | 2014-09-03 | 1 | -15/+23 |
| * | | | added support for password protected muc - fixed #203 and fixed #395 | iNPUTmice | 2014-09-03 | 4 | -17/+72 |
| * | | | changed order of snackbar hints | iNPUTmice | 2014-09-03 | 1 | -12/+11 |
| * | | | set openpgp-api-lib to a version that actually works | iNPUTmice | 2014-09-03 | 1 | -5/+8 |
| * | | | more openpgp bug fixes | iNPUTmice | 2014-09-03 | 2 | -8/+12 |
| * | | | avoiding resource conflicts | iNPUTmice | 2014-09-03 | 1 | -2/+7 |
| * | | | fixed pgp signature creation | iNPUTmice | 2014-09-03 | 1 | -3/+19 |
| * | | | added ability to disable notifications for specific conversations - fixed #322 | iNPUTmice | 2014-09-03 | 7 | -0/+76 |
| * | | | made emoticon parsing enableable - default false | iNPUTmice | 2014-09-03 | 3 | -2/+12 |
| * | | | Merge branch 'betheg-unused_resources' into development | iNPUTmice | 2014-09-02 | 11 | -496/+0 |
| |\ \ \ | |||||
| | * | | | Merge branch 'unused_resources' of https://github.com/betheg/Conversations in... | iNPUTmice | 2014-09-02 | 11 | -496/+0 |
| |/| | | | |||||
| | * | | | removed unused string resources. | Michael | 2014-09-01 | 11 | -496/+0 |
| * | | | | 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 |
| |\ \ \ \ | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |