| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | fixed bug with otr session being initilized over and over again | iNPUTmice | 2014-07-23 | 2 | -11/+11 | |
| | | | ||||||
| * | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-07-23 | 1 | -13/+13 | |
| |\ \ | ||||||
| | * \ | Merge pull request #307 from Erkan-Yilmaz/development | Daniel Gultsch | 2014-07-23 | 1 | -13/+13 | |
| | |\ \ | | | | | | | | | typos | |||||
| | | * | | typos | Erkan Yilmaz | 2014-07-23 | 1 | -13/+13 | |
| | |/ / | ||||||
| * / / | more disco. fixed chat markers with jappix | iNPUTmice | 2014-07-23 | 6 | -18/+99 | |
| |/ / | ||||||
| * | | updated mtm | iNPUTmice | 2014-07-22 | 1 | -0/+0 | |
| | | | ||||||
| * | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-07-22 | 1 | -0/+3 | |
| |\ \ | ||||||
| | * \ | Merge pull request #303 from kruks23/development | Daniel Gultsch | 2014-07-22 | 1 | -0/+3 | |
| | |\ \ | | | | | | | | | Update Spanish Translations | |||||
| | | * | | Update Spanish Translations | kruks23 | 2014-07-22 | 1 | -0/+3 | |
| | | | | | ||||||
| * | | | | some cleanup | iNPUTmice | 2014-07-22 | 2 | -43/+0 | |
| |/ / / | ||||||
| * / / | switched to mtm | iNPUTmice | 2014-07-22 | 7 | -142/+32 | |
| |/ / | ||||||
| * | | brought settings and manage account menu items back | iNPUTmice | 2014-07-22 | 2 | -8/+4 | |
| | | | ||||||
| * | | fixed #301 | iNPUTmice | 2014-07-22 | 1 | -1/+2 | |
| | | | ||||||
| * | | refactored message adapter into seperate class | Daniel Gultsch | 2014-07-22 | 3 | -445/+498 | |
| | | | ||||||
| * | | Merge branch 'development' of github.com:siacs/Conversations into development | Daniel Gultsch | 2014-07-22 | 1 | -14/+39 | |
| |\ \ | ||||||
| | * \ | Merge pull request #299 from beriain/development | Daniel Gultsch | 2014-07-22 | 1 | -14/+39 | |
| | |\ \ | | | | | | | | | Update strings.xml | |||||
| | | * | | Update strings.xml | Aitor Beriain | 2014-07-22 | 1 | -14/+39 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into development | Daniel Gultsch | 2014-07-22 | 2 | -3/+8 | |
| |\ \ \ \ | |/ / / |/| | | | ||||||
| | * | | | version bump to 0.5-beta and changelog | iNPUTmice | 2014-07-21 | 2 | -3/+8 | |
| | | | | | ||||||
| * | | | | save login nick for mucs during join | iNPUTmice | 2014-07-21 | 1 | -0/+5 | |
| |/ / / | ||||||
| * | | | back to normal invites. fixed #298 | iNPUTmice | 2014-07-21 | 1 | -1/+14 | |
| | | | | ||||||
| * | | | added hint to explain the contact has read up to this point | iNPUTmice | 2014-07-21 | 2 | -0/+8 | |
| | | | | ||||||
| * | | | fixed #292 | iNPUTmice | 2014-07-21 | 1 | -0/+10 | |
| | | | | ||||||
| * | | | fixed #267 | iNPUTmice | 2014-07-21 | 3 | -1/+15 | |
| | | | | ||||||
| * | | | switched to direct invites. fixes #284 | iNPUTmice | 2014-07-21 | 4 | -16/+27 | |
| | | | | ||||||
| * | | | fixed bug where presence requests where sent on display of contact details | iNPUTmice | 2014-07-21 | 1 | -2/+5 | |
| | | | | ||||||
| * | | | fixed #290 | iNPUTmice | 2014-07-21 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | disable subscription checkboxes when account is offline | iNPUTmice | 2014-07-20 | 1 | -0/+24 | |
| | | | | ||||||
| * | | | hide verify snackbar when otr session is ended. fixed npe | iNPUTmice | 2014-07-20 | 2 | -0/+4 | |
| | | | | ||||||
| * | | | fixed typos reported by @jelmer fixed #288 | iNPUTmice | 2014-07-20 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge pull request #289 from jelmer/dutch | Daniel Gultsch | 2014-07-20 | 3 | -0/+294 | |
| |\ \ \ | | | | | | | | | Add Dutch translations. | |||||
| | * | | | Add Dutch translations. | Jelmer Vernooij | 2014-07-20 | 3 | -0/+294 | |
| | | | | | ||||||
| * | | | | simplified presence subscription in contact details | iNPUTmice | 2014-07-20 | 2 | -106/+83 | |
| | | | | | ||||||
| * | | | | fixed #254 | iNPUTmice | 2014-07-20 | 2 | -6/+18 | |
| | | | | | ||||||
| * | | | | ignore groupchats messages that are pending leave | iNPUTmice | 2014-07-20 | 3 | -25/+30 | |
| | | | | | ||||||
| * | | | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-07-18 | 2 | -5/+5 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge pull request #285 from kruks23/development | Daniel Gultsch | 2014-07-18 | 2 | -5/+5 | |
| | |\ \ \ \ | | | | | | | | | | | | | Update Spanish Translations | |||||
| | | * | | | | Update Spanish Translations | kruks23 | 2014-07-18 | 2 | -5/+5 | |
| | |/ / / / | ||||||
| * | | | | | pending leaves and joins for muc | iNPUTmice | 2014-07-18 | 5 | -56/+71 | |
| | | | | | | ||||||
| * | | | | | only show muc errors if actually connected | iNPUTmice | 2014-07-18 | 1 | -25/+34 | |
| |/ / / / | ||||||
| * | | | | added russian translator to readme | iNPUTmice | 2014-07-18 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | notify ui on roster changes | iNPUTmice | 2014-07-18 | 5 | -0/+55 | |
| | | | | | ||||||
| * | | | | show snackbar if conference was not found | iNPUTmice | 2014-07-18 | 4 | -5/+19 | |
| | | | | | ||||||
| * | | | | brought muc invites back. + couple of bug fixes + refactoring | iNPUTmice | 2014-07-17 | 21 | -145/+318 | |
| | | | | | ||||||
| * | | | | improvements on the dublicate muc messages issue | iNPUTmice | 2014-07-16 | 1 | -4/+11 | |
| | | | | | ||||||
| * | | | | Merge pull request #280 from kruks23/development | Daniel Gultsch | 2014-07-16 | 1 | -1/+6 | |
| |\ \ \ \ | | | | | | | | | | | Update Spanish Translations | |||||
| | * | | | | Update Spanish Translations | kruks23 | 2014-07-16 | 1 | -1/+6 | |
| |/ / / / | ||||||
| * | | | | spelling | iNPUTmice | 2014-07-16 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | made grace period work for muc as well | iNPUTmice | 2014-07-16 | 1 | -0/+2 | |
| | | | | | ||||||
| * | | | | fixed rare npe | iNPUTmice | 2014-07-16 | 1 | -0/+3 | |
| | | | | | ||||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |