Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed missing symbol for eu.siacs.conversations.Config and wrong parameter fo... | Tristan Zur | 2015-01-10 | 1 | -1/+2 |
* | Merge branch 'master' of ssh://git.fucktheforce.de/conversations | lookshe | 2015-01-03 | 1 | -10/+9 |
|\ | |||||
| * | Add support for XEP-0191 (Blocking command) | Sam Whited | 2014-12-22 | 1 | -9/+9 |
| * | cleanup: removed unused emoticon parsing | iNPUTmice | 2014-12-09 | 1 | -5/+1 |
* | | remaining part of my patch | lookshe | 2015-01-03 | 1 | -3/+2 |
|/ | |||||
* | fixed description in notifications and conversation overview | iNPUTmice | 2014-11-15 | 1 | -1/+11 |
* | adepted conversationadapter to deal with files | iNPUTmice | 2014-11-15 | 1 | -3/+21 |
* | Update more files to use JID objects | Sam Whited | 2014-11-09 | 1 | -1/+1 |
* | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -6/+10 |
* | Make conversations the root project | Sam Whited | 2014-10-22 | 1 | -0/+135 |