| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #622 from emdete/p1 | Daniel Gultsch | 2014-11-04 | 1 | -33/+39 |
| |\ | | | | | P1 | ||||
| | * | optimize code abit | M. Dietrich | 2014-11-04 | 1 | -29/+23 |
| | | | |||||
| | * | implement "correct" ndef parsing | M. Dietrich | 2014-11-04 | 1 | -13/+25 |
| |/ | |||||
| * | 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 |
| | | |||||
| * | Merge pull request #620 from emdete/p0 | Daniel Gultsch | 2014-11-04 | 1 | -58/+59 |
| |\ | | | | | P0 | ||||
| | * | 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 | 6 | -18/+132 |
| |/ / | |||||
| * | | create file explicitly before downloading image | iNPUTmice | 2014-11-03 | 1 | -0/+2 |
| | | | |||||
| * | | Merge pull request #614 from SamWhited/spacefixes | Daniel Gultsch | 2014-11-03 | 1 | -7/+7 |
| |\ \ | | | | | | | Fix some space/tab issues in README | ||||
| | * | | Removed the last \t from the README... | Sam Whited | 2014-11-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Another tab fix. | Sam Whited | 2014-11-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix some space/tab issues in README | Sam Whited | 2014-11-03 | 1 | -5/+5 |
| | | | | |||||
| * | | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-03 | 2 | -3/+2 |
| |\ \ \ | |_|/ |/| | | | | | development | ||||
| | * | | Merge pull request #615 from SamWhited/issue611 | Daniel Gultsch | 2014-11-03 | 1 | -2/+1 |
| | |\ \ | | |/ | |/| | Wrap "last seen" time | ||||
| | | * | Wrap "last seen" time. | Sam Whited | 2014-11-03 | 1 | -2/+1 |
| | |/ | | | | | | | Fixes #611 | ||||
| | * | Merge pull request #605 from emdete/render_gradle_path | Daniel Gultsch | 2014-11-03 | 1 | -1/+1 |
| | |\ | | | | | | | adjust path in render script | ||||
| | | * | adjust path in render script | M. Dietrich | 2014-11-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | more error handling for http connection | iNPUTmice | 2014-11-03 | 1 | -9/+12 |
| | | | | |||||
| * | | | disabled proguard. fixed gradle libs | iNPUTmice | 2014-11-03 | 2 | -11/+6 |
| |/ / | |||||
| * | | version bump to 0.8.1 | iNPUTmice | 2014-11-03 | 2 | -7/+8 |
| | | | |||||
| * | | 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 pull request #600 from SamWhited/gradle | Daniel Gultsch | 2014-11-01 | 434 | -99/+7009 |
| |\ | | | | | Build system and library changes (Gradle / Subtree merging) | ||||
| | * | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 434 | -99/+7009 |
| |/| | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | ||||
| | * | Tweak README some more | Sam Whited | 2014-10-28 | 1 | -2/+3 |
| | | | |||||
| | * | Fix typo in subtree merge directions | Sam Whited | 2014-10-28 | 1 | -1/+1 |
| | | | |||||
| | * | Add subtree merge directions to README | Sam Whited | 2014-10-28 | 1 | -3/+19 |
| | | | |||||
| | * | Subtree merged in openpgp api lib | Sam Whited | 2014-10-28 | 45 | -6/+1829 |
| | |\ | |||||
| | | * | Work on Yubikey decryption | Dominik Schürmann | 2014-09-08 | 1 | -0/+1 |
| | | | | |||||
| | | * | Fix for user ids in API | Dominik Schürmann | 2014-09-07 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib | Dominik Schürmann | 2014-09-07 | 18 | -2/+81 |
| | | |\ | |||||
| | | | * | Pull from transifex | Dominik Schürmann | 2014-09-04 | 17 | -0/+61 |
| | | | | | |||||
| | | | * | Update README | Dominik Schürmann | 2014-09-02 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | Update README | Dominik Schürmann | 2014-09-02 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | Update README | Dominik Schürmann | 2014-09-02 | 1 | -2/+20 |
| | | | | | |||||
| | | * | | Fix nullpointer with new OpenPgpSignatureResult version | Dominik Schürmann | 2014-09-07 | 1 | -0/+1 |
| | | |/ | |||||
| | | * | Changelog | Dominik Schürmann | 2014-08-31 | 1 | -1/+2 |
| | | | | |||||
| | | * | Add userIds to OpenPgpSignatureResult | Dominik Schürmann | 2014-08-31 | 1 | -14/+29 |
| | | | | |||||
| | | * | Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib | Dominik Schürmann | 2014-08-31 | 1 | -2/+5 |
| | | |\ | |||||
| | | | * | Merge pull request #1 from Flowdalic/flow | Dominik Schürmann | 2014-08-30 | 1 | -2/+5 |
| | | | |\ | | | | | | | | | | | Add my Real-name to the Copyright statement | ||||
| | | | | * | Add my Real-name to the Copyright statement | Florian Schmaus | 2014-08-30 | 1 | -2/+5 |
| | | | |/ | | | | | | | | | | | | | of ParcelFileDescriptorUtil. | ||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |