aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs (follow)
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-042-0/+56
|\ \ | | | | | | | | | development
| * | Convert about dialog to activitySam Whited2014-11-042-6/+29
| | |
| * | Move AboutDialog to correct pathSam Whited2014-11-041-0/+33
| |/
* / 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-041-1/+18
|/
* register nfc callback in every activity that provides a proper sharable uriiNPUTmice2014-11-045-16/+18
|
* 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-045-105/+167
|
* added missing return statement. fixed api bugiNPUTmice2014-11-041-3/+2
|
* 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-033-165/+271
|\ | | | | | | @emdete
| * basic beam code / untestediNPUTmice2014-11-033-127/+187
| |
* | unfinishd qr code implemenation. thanks to @emdeteiNPUTmice2014-11-032-11/+110
|/
* create file explicitly before downloading imageiNPUTmice2014-11-031-0/+2
|
* more error handling for http connectioniNPUTmice2014-11-031-9/+12
|
* version bump to 0.8.1iNPUTmice2014-11-031-5/+6
|
* 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 branch 'gradle' into developmentSam Whited2014-10-3028-353/+756
| | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
* Make conversations the root projectSam Whited2014-10-22102-0/+19285