| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fixed npe | iNPUTmice | 2014-09-07 | 1 | -0/+3 |
| | | |||||
| * | readme formating | iNPUTmice | 2014-09-06 | 1 | -4/+4 |
| | | |||||
| * | added recent contributors | iNPUTmice | 2014-09-06 | 1 | -3/+7 |
| | | |||||
| * | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-09-06 | 1 | -0/+8 |
| |\ | |||||
| | * | Merge pull request #422 from betheg/muc_password | Daniel Gultsch | 2014-09-06 | 1 | -0/+8 |
| | |\ | | | | | | | MUC: set password from invite message. | ||||
| | | * | MUC: set password from invite message. | Michael | 2014-09-05 | 1 | -0/+8 |
| | |/ | |||||
| * / | made otr a little bit more solid when there is no presence subscription | iNPUTmice | 2014-09-06 | 9 | -29/+56 |
| |/ | |||||
| * | warn user if no presence subscription exists | iNPUTmice | 2014-09-05 | 2 | -0/+37 |
| | | |||||
| * | improved logging for avatar fetches | iNPUTmice | 2014-09-05 | 1 | -21/+38 |
| | | |||||
| * | fixed #342 - otr with facebook and other services without resources | iNPUTmice | 2014-09-04 | 1 | -2/+6 |
| | | |||||
| * | reconnect accounts when resource has been changed in settings | iNPUTmice | 2014-09-04 | 1 | -3/+39 |
| | | |||||
| * | made muc password dialog hide the password (password field) | iNPUTmice | 2014-09-04 | 2 | -10/+29 |
| | | |||||
| * | nick parsing (xep 0172) also enabled for messages and for pep | iNPUTmice | 2014-09-04 | 1 | -5/+27 |
| | | |||||
| * | Merge pull request #397 from GZep/development | Daniel Gultsch | 2014-09-04 | 2 | -2/+12 |
| |\ | | | | | XEP-0172 | ||||
| | * | 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 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 | 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 ↵ | 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 |
| | | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |