Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | fixed #617 | iNPUTmice | 2014-11-05 | 1 | -26/+22 | |
| | | ||||||
* | | reformated license a bit | iNPUTmice | 2014-11-04 | 2 | -22/+16 | |
| | | ||||||
* | | Merge pull request #626 from SamWhited/issue612 | Daniel Gultsch | 2014-11-04 | 2 | -14/+44 | |
|\ \ | | | | | | | Add last seen info to the database | |||||
| * | | Add last seen info to the database | Sam Whited | 2014-11-04 | 2 | -14/+44 | |
| |/ | | | | | | | Fixes #612 | |||||
* | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-04 | 8 | -31/+156 | |
|\ \ | | | | | | | | | | development | |||||
| * \ | Merge pull request #616 from SamWhited/license-compliance | Daniel Gultsch | 2014-11-04 | 8 | -31/+156 | |
| |\ \ | | |/ | |/| | License compliance via an "about" menu item | |||||
| | * | Shorten license text and fix height of scrollview | Sam Whited | 2014-11-04 | 2 | -20/+7 | |
| | | | ||||||
| | * | Use normal text size and color | Sam Whited | 2014-11-04 | 1 | -1/+4 | |
| | | | ||||||
| | * | Make links clickable in about text | Sam Whited | 2014-11-04 | 2 | -4/+7 | |
| | | | ||||||
| | * | Convert about dialog to activity | Sam Whited | 2014-11-04 | 8 | -47/+102 | |
| | | | ||||||
| | * | Use real copyright symbol © | Sam Whited | 2014-11-04 | 1 | -3/+3 | |
| | | | ||||||
| | * | Move AboutDialog to correct path | Sam Whited | 2014-11-04 | 1 | -0/+0 | |
| | | | ||||||
| | * | Add about dialog with license info | Sam Whited | 2014-11-04 | 3 | -0/+77 | |
| |/ | ||||||
* / | link to account details when touching own avatar | iNPUTmice | 2014-11-04 | 1 | -118/+124 | |
|/ | ||||||
* | clear avatar cache after nick name change | iNPUTmice | 2014-11-04 | 1 | -4/+8 | |
| | ||||||
* | Merge pull request #625 from SamWhited/linterfix | Daniel Gultsch | 2014-11-04 | 1 | -1/+3 | |
|\ | | | | | Make linter ignore properly checked API mismatch | |||||
| * | Make linter ignore properly checked API mismatch | Sam Whited | 2014-11-04 | 1 | -1/+3 | |
| | | ||||||
* | | show avatar in editaccount | iNPUTmice | 2014-11-04 | 3 | -5/+33 | |
|/ | ||||||
* | register nfc callback in every activity that provides a proper sharable uri | iNPUTmice | 2014-11-04 | 5 | -16/+18 | |
| | ||||||
* | 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 errornfc | 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 | |
| |