| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #417 from emdete/unicode_emoticons | Daniel Gultsch | 2014-09-04 | 1 | -16/+32 |
| |\ | | | | | improve regex, implement pattern cache | ||||
| | * | 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 | 3 | -17/+70 |
| | | | |||||
| * | | changed order of snackbar hints | iNPUTmice | 2014-09-03 | 1 | -12/+11 |
| | | | |||||
| * | | more openpgp bug fixes | iNPUTmice | 2014-09-03 | 1 | -3/+7 |
| | | | |||||
| * | | 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 | 4 | -0/+53 |
| | | | |||||
| * | | made emoticon parsing enableable - default false | iNPUTmice | 2014-09-03 | 3 | -2/+12 |
| | | | |||||
| * | | fixed #410 by removing that config option | iNPUTmice | 2014-09-02 | 8 | -40/+14 |
| | | | |||||
| * | | refactored share with activity | iNPUTmice | 2014-09-02 | 6 | -226/+246 |
| | | | |||||
| * | | 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 | ||||
| | * | 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 |
| |\| | | | | | add translation from ascii to unicode emoticons | ||||
| | * | transform ascii to emoticons (on display only) | M. Dietrich | 2014-09-01 | 3 | -2/+25 |
| | | | |||||
| * | | fixed #403 | iNPUTmice | 2014-09-01 | 3 | -11/+18 |
| | | | |||||
| * | | optimize string operations a bit | M. Dietrich | 2014-09-01 | 12 | -26/+26 |
| |/ | |||||
| * | deleted unnecessary log | iNPUTmice | 2014-08-31 | 1 | -2/+0 |
| | | |||||
| * | 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 |
| | | |||||
| * | 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 |
| |\ | | | | | fix forgotten spelling. | ||||
| | * | Merge remote-tracking branch 'upstream/development' into fix_typo | Michael | 2014-08-30 | 7 | -164/+354 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'upstream/development' into fix_typo | Michael | 2014-08-29 | 3 | -3/+11 |
| | |\ \ | |||||
| | * | | | fix forgotten spelling. | Michael | 2014-08-28 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | 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 | 2 | -44/+107 |
| | |_|/ |/| | | |||||
| * | | | Merge branch 'sm' into development | iNPUTmice | 2014-08-30 | 3 | -146/+250 |
| |\ \ \ | | | | | | | | | | | | | | | | | Conflicts: src/eu/siacs/conversations/services/XmppConnectionService.java | ||||
| | * | | | 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 changelogs | iNPUTmice | 2014-08-30 | 1 | -28/+17 |
| | | | | |||||
| * | | | 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 |
| | | | |||||
| * | | fixed #389 | iNPUTmice | 2014-08-29 | 1 | -1/+5 |
| |/ | |||||
| * | fixed spelling thanks @betheg | iNPUTmice | 2014-08-28 | 6 | -24/+24 |
| | | |||||
| * | translated missing string in settings | iNPUTmice | 2014-08-27 | 1 | -2/+6 |
| | | |||||
| * | fixing duplicate private muc messages | iNPUTmice | 2014-08-25 | 1 | -3/+10 |
| | | |||||
| * | fixed message hint | iNPUTmice | 2014-08-25 | 1 | -51/+61 |
| | | |||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |