aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #626 from SamWhited/issue612Daniel Gultsch2014-11-042-14/+44
|\ | | | | Add last seen info to the database
| * Add last seen info to the databaseSam Whited2014-11-042-14/+44
| | | | | | | | Fixes #612
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-048-31/+156
|\ \ | | | | | | | | | development
| * \ Merge pull request #616 from SamWhited/license-complianceDaniel Gultsch2014-11-048-31/+156
| |\ \ | | |/ | |/| License compliance via an "about" menu item
| | * Shorten license text and fix height of scrollviewSam Whited2014-11-042-20/+7
| | |
| | * Use normal text size and colorSam Whited2014-11-041-1/+4
| | |
| | * Make links clickable in about textSam Whited2014-11-042-4/+7
| | |
| | * Convert about dialog to activitySam Whited2014-11-048-47/+102
| | |
| | * Use real copyright symbol ©Sam Whited2014-11-041-3/+3
| | |
| | * Move AboutDialog to correct pathSam Whited2014-11-041-0/+0
| | |
| | * Add about dialog with license infoSam Whited2014-11-043-0/+77
| |/
* / link to account details when touching own avatariNPUTmice2014-11-041-118/+124
|/
* clear avatar cache after nick name changeiNPUTmice2014-11-041-4/+8
|
* Merge pull request #625 from SamWhited/linterfixDaniel Gultsch2014-11-041-1/+3
|\ | | | | Make linter ignore properly checked API mismatch
| * Make linter ignore properly checked API mismatchSam Whited2014-11-041-1/+3
| |
* | show avatar in editaccountiNPUTmice2014-11-043-5/+33
|/
* register nfc callback in every activity that provides a proper sharable uriiNPUTmice2014-11-045-16/+18
|
* Merge pull request #622 from emdete/p1Daniel Gultsch2014-11-041-33/+39
|\ | | | | P1
| * optimize code abitM. Dietrich2014-11-041-29/+23
| |
| * implement "correct" ndef parsingM. Dietrich2014-11-041-13/+25
|/
* made qr code available from muc and contact details as welliNPUTmice2014-11-047-105/+175
|
* added missing return statement. fixed api bugiNPUTmice2014-11-041-3/+2
|
* Merge pull request #620 from emdete/p0Daniel Gultsch2014-11-041-58/+59
|\ | | | | P0
| * be more OOM. Dietrich2014-11-041-51/+44
| |
| * support pre JELLY_BEAN ndefM. Dietrich2014-11-041-16/+24
|/
* fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to ↵iNPUTmice2014-11-034-187/+291
|\ | | | | | | @emdete
| * fixed merge errornfciNPUTmice2014-11-031-1/+0
| |
| * Merge branch 'nfc' of https://github.com/siacs/Conversations into nfciNPUTmice2014-11-031-0/+1
| |\ | | | | | | | | | | | | Conflicts: src/main/AndroidManifest.xml
| | * basic beam code / untestediNPUTmice2014-11-034-149/+207
| | |
| * | use different filter for nfc intentsiNPUTmice2014-11-031-1/+1
| | |
| * | basic beam code / untestediNPUTmice2014-11-034-149/+207
| | |
* | | unfinishd qr code implemenation. thanks to @emdeteiNPUTmice2014-11-036-18/+132
|/ /
* | create file explicitly before downloading imageiNPUTmice2014-11-031-0/+2
| |
* | Merge pull request #614 from SamWhited/spacefixesDaniel Gultsch2014-11-031-7/+7
|\ \ | | | | | | Fix some space/tab issues in README
| * | Removed the last \t from the README...Sam Whited2014-11-031-1/+1
| | |
| * | Another tab fix.Sam Whited2014-11-031-1/+1
| | |
| * | Fix some space/tab issues in READMESam Whited2014-11-031-5/+5
| | |
* | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-032-3/+2
|\ \ \ | |_|/ |/| | | | | development
| * | Merge pull request #615 from SamWhited/issue611Daniel Gultsch2014-11-031-2/+1
| |\ \ | | |/ | |/| Wrap "last seen" time
| | * Wrap "last seen" time.Sam Whited2014-11-031-2/+1
| |/ | | | | | | Fixes #611
| * Merge pull request #605 from emdete/render_gradle_pathDaniel Gultsch2014-11-031-1/+1
| |\ | | | | | | adjust path in render script
| | * adjust path in render scriptM. Dietrich2014-11-011-1/+1
| | |
* | | more error handling for http connectioniNPUTmice2014-11-031-9/+12
| | |
* | | disabled proguard. fixed gradle libsiNPUTmice2014-11-032-11/+6
|/ /
* | version bump to 0.8.1iNPUTmice2014-11-032-7/+8
| |
* | always use exif helperiNPUTmice2014-11-031-23/+6
| |
* | more error handling in xmppconnectioniNPUTmice2014-11-031-66/+78
|/
* fixed arrayoutofbounds + spellingiNPUTmice2014-11-012-7/+7
|
* Merge pull request #600 from SamWhited/gradleDaniel Gultsch2014-11-01434-99/+7009
|\ | | | | Build system and library changes (Gradle / Subtree merging)
| * Merge branch 'gradle' into developmentSam Whited2014-10-30434-99/+7009
|/| | | | | | | | | | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 01:22:56 +0000