| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 ↵ | iNPUTmice | 2014-09-02 | 11 | -496/+0 |
| |/| | | | | | | | into betheg-unused_resources | ||||
| | * | 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 | ||||
| | * | | 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 |
| | | | |||||
| * | | Merge pull request #402 from emdete/remove_poormans_tostring | Daniel Gultsch | 2014-09-01 | 12 | -26/+26 |
| |\ \ | | | | | | | optimize string operations a bit | ||||
| | * | | 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. | ||||
| | * | 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 | ||||
| | * | | 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 | 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. | ||||
| | * | | | | | fix: warning: string 'publish_avatar' has no default translation. | Michael | 2014-08-30 | 9 | -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 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 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 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 |
| | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |