Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | made scan and show qr code more accessible in VerifyOtrActivity | iNPUTmice | 2014-11-16 | 1 | -7/+101 |
| | |||||
* | parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵ | iNPUTmice | 2014-11-16 | 1 | -2/+3 |
| | | | | shareable uri where ever possible | ||||
* | Make account status an enum | Sam Whited | 2014-11-15 | 1 | -1/+1 |
| | |||||
* | check if account is online before doing smp | iNPUTmice | 2014-11-12 | 1 | -11/+24 |
| | |||||
* | Merge branch 'feature/otr_verification' of ↵ | iNPUTmice | 2014-11-11 | 1 | -1/+0 |
|\ | | | | | | | | | | | | | https://github.com/siacs/Conversations into feature/otr_verification Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java | ||||
| * | small bug fix | iNPUTmice | 2014-11-10 | 1 | -8/+3 |
| | | |||||
| * | added snackbar to indicate smp. more error handling in verify activity | iNPUTmice | 2014-11-10 | 1 | -47/+81 |
| | | |||||
| * | initial smp support | iNPUTmice | 2014-11-10 | 1 | -0/+264 |
| | |||||
* | use auto register for verify otr listeners | iNPUTmice | 2014-11-11 | 1 | -9/+0 |
| | |||||
* | small bug fix | iNPUTmice | 2014-11-11 | 1 | -8/+3 |
| | |||||
* | added snackbar to indicate smp. more error handling in verify activity | iNPUTmice | 2014-11-11 | 1 | -47/+81 |
| | |||||
* | initial smp support | iNPUTmice | 2014-11-11 | 1 | -0/+264 |