| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵ | steckbrief | 2015-10-04 | 1 | -1/+4 |
| | | | | | | | | Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added | ||||
| * | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1 | lookshe | 2015-08-11 | 1 | -7/+13 |
| | | |||||
| * | context menu for files and offered files. fixed #848 fixed #849 | Daniel Gultsch | 2015-01-12 | 1 | -2/+2 |
| | | |||||
| * | made file transfers cancelable | iNPUTmice | 2014-11-15 | 1 | -0/+3 |
| | | |||||
| * | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -0/+20 |
| Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |