aboutsummaryrefslogtreecommitdiffstats
path: root/src (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-048-31/+156
|\ \ | | | | | | | | | development
| * | 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
|
* 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
|
* 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-035-18/+130
|/ /
* | create file explicitly before downloading imageiNPUTmice2014-11-031-0/+2
| |
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-031-2/+1
|\ \ | |/ |/| | | development
| * Wrap "last seen" time.Sam Whited2014-11-031-2/+1
| | | | | | | | Fixes #611
* | 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-30315-0/+6342
|\ | | | | | | | | | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
| * Make conversations the root projectSam Whited2014-10-22313-0/+25560
|
* only end otr session if there is more than one contact presence. reset otherwiseiNPUTmice2014-10-301-1/+5
|
* cleanup for clear conversation history. small otr fixesiNPUTmice2014-10-304-26/+22
|
* replace the exif interface with a small static class from 3d galleryiNPUTmice2014-10-292-17/+167
|
* proper error state for imagesiNPUTmice2014-10-295-20/+16
|
* fixed 'share image' context menuiNPUTmice2014-10-291-2/+1
|
* fixed intent managmentiNPUTmice2014-10-291-8/+8
|
* end otr session if plain text message from another instance is being receivediNPUTmice2014-10-281-1/+8
|
* improvements on findConversationiNPUTmice2014-10-281-2/+2
|
* always show verify fingerprint if there is an active otr sessioniNPUTmice2014-10-281-5/+4
|
* reworked dns retryiNPUTmice2014-10-272-66/+51
|
* removed unnecessary logging from avatar serviceiNPUTmice2014-10-271-5/+0
|