| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | made qr code available from muc and contact details as well | iNPUTmice | 2014-11-04 | 7 | -105/+175 | |
| | | ||||||
| * | added missing return statement. fixed api bug | iNPUTmice | 2014-11-04 | 1 | -3/+2 | |
| | | ||||||
| * | be more OO | M. Dietrich | 2014-11-04 | 1 | -51/+44 | |
| | | ||||||
| * | support pre JELLY_BEAN ndef | M. Dietrich | 2014-11-04 | 1 | -16/+24 | |
| | | ||||||
| * | fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to ↵ | iNPUTmice | 2014-11-03 | 4 | -187/+291 | |
| |\ | | | | | | | @emdete | |||||
| | * | fixed merge error | iNPUTmice | 2014-11-03 | 1 | -1/+0 | |
| | | | ||||||
| | * | Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc | iNPUTmice | 2014-11-03 | 1 | -0/+1 | |
| | |\ | | | | | | | | | | | | | Conflicts: src/main/AndroidManifest.xml | |||||
| | | * | basic beam code / untested | iNPUTmice | 2014-11-03 | 4 | -149/+207 | |
| | | | | ||||||
| | * | | use different filter for nfc intents | iNPUTmice | 2014-11-03 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | basic beam code / untested | iNPUTmice | 2014-11-03 | 4 | -149/+207 | |
| | | | | ||||||
| * | | | unfinishd qr code implemenation. thanks to @emdete | iNPUTmice | 2014-11-03 | 5 | -18/+130 | |
| |/ / | ||||||
| * | | create file explicitly before downloading image | iNPUTmice | 2014-11-03 | 1 | -0/+2 | |
| | | | ||||||
| * | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-03 | 1 | -2/+1 | |
| |\ \ | |/ |/| | | | development | |||||
| | * | Wrap "last seen" time. | Sam Whited | 2014-11-03 | 1 | -2/+1 | |
| | | | | | | | | | Fixes #611 | |||||
| * | | more error handling for http connection | iNPUTmice | 2014-11-03 | 1 | -9/+12 | |
| |/ | ||||||
| * | version bump to 0.8.1 | iNPUTmice | 2014-11-03 | 1 | -5/+6 | |
| | | ||||||
| * | always use exif helper | iNPUTmice | 2014-11-03 | 1 | -23/+6 | |
| | | ||||||
| * | more error handling in xmppconnection | iNPUTmice | 2014-11-03 | 1 | -66/+78 | |
| | | ||||||
| * | fixed arrayoutofbounds + spelling | iNPUTmice | 2014-11-01 | 2 | -7/+7 | |
| | | ||||||
| * | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 41 | -376/+846 | |
| | | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | |||||
| * | Make conversations the root project | Sam Whited | 2014-10-22 | 313 | -0/+25560 | |
 |
index : PiratX | |
| The new way for communications |
| aboutsummaryrefslogtreecommitdiffstats |