Commits · 22538145196c5d7b5f30c2d8ad55b7893c80c1ff · Android-smartphones / Conversation

Nov 05, 2014
- fixed notifications for images · 22538145
  iNPUTmice authored Nov 05, 2014
  
  22538145
Nov 04, 2014
- fixed #617 · 6a43bda4
  iNPUTmice authored Nov 05, 2014
  
  6a43bda4
- reformated license a bit · f8d5d6b2
  iNPUTmice authored Nov 04, 2014
  
  f8d5d6b2
- Merge pull request #626 from SamWhited/issue612 · 0c948048
  Daniel Gultsch authored Nov 04, 2014
```
Add last seen info to the database
```
  0c948048
- Merge branch 'development' of https://github.com/siacs/Conversations into development · 7d4e03cc
  iNPUTmice authored Nov 04, 2014
  
  7d4e03cc
- Merge pull request #616 from SamWhited/license-compliance · 39183418
  Daniel Gultsch authored Nov 04, 2014
```
License compliance via an "about" menu item
```
  39183418
- Add last seen info to the database · 96563aca
  Sam Whited authored Nov 04, 2014
```
Fixes #612
```
  96563aca
- Shorten license text and fix height of scrollview · df786cbf
  Sam Whited authored Nov 04, 2014
  
  df786cbf
- Use normal text size and color · 7b67f1a1
  Sam Whited authored Nov 04, 2014
  
  7b67f1a1
- Make links clickable in about text · 55c81eaf
  Sam Whited authored Nov 04, 2014
  
  55c81eaf
- link to account details when touching own avatar · 88c07936
  iNPUTmice authored Nov 04, 2014
  
  88c07936
- Convert about dialog to activity · f10dd428
  Sam Whited authored Nov 04, 2014
  
  f10dd428
- Use real copyright symbol © · 97b4b012
  Sam Whited authored Nov 03, 2014
  
  97b4b012
- Move AboutDialog to correct path · 8bf40308
  Sam Whited authored Nov 03, 2014
  
  8bf40308
- Add about dialog with license info · df54ee75
  Sam Whited authored Oct 21, 2014
  
  df54ee75
- clear avatar cache after nick name change · ff10b094
  iNPUTmice authored Nov 04, 2014
  
  ff10b094
- Merge pull request #625 from SamWhited/linterfix · ff22f931
  Daniel Gultsch authored Nov 04, 2014
```
Make linter ignore properly checked API mismatch
```
  ff22f931
- Make linter ignore properly checked API mismatch · b234b690
  Sam Whited authored Nov 04, 2014
  
  b234b690
- show avatar in editaccount · cd5a56e8
  iNPUTmice authored Nov 04, 2014
  
  cd5a56e8
- register nfc callback in every activity that provides a proper sharable uri · b824e552
  iNPUTmice authored Nov 04, 2014
  
  b824e552
- Merge pull request #622 from emdete/p1 · 11ecf43d
  Daniel Gultsch authored Nov 04, 2014
```
P1
```
  11ecf43d
- optimize code abit · 2ce95b19
  M. Dietrich authored Nov 04, 2014
  
  2ce95b19
- implement "correct" ndef parsing · b6c20d92
  M. Dietrich authored Nov 04, 2014
  
  b6c20d92
- made qr code available from muc and contact details as well · b3582c97
  iNPUTmice authored Nov 04, 2014
  
  b3582c97
- added missing return statement. fixed api bug · 12e2f0bd
  iNPUTmice authored Nov 04, 2014
  
  12e2f0bd
- Merge pull request #620 from emdete/p0 · 17070d97
  Daniel Gultsch authored Nov 04, 2014
```
P0
```
  17070d97
- be more OO · fb24bf98
  M. Dietrich authored Nov 04, 2014
  
  fb24bf98
- support pre JELLY_BEAN ndef · 32396b3b
  M. Dietrich authored Nov 04, 2014
  
  32396b3b
Nov 03, 2014
- fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete · 7a9327d9
  iNPUTmice authored Nov 03, 2014
  
  7a9327d9
- unfinishd qr code implemenation. thanks to @emdete · d458919c
  iNPUTmice authored Nov 03, 2014
  
  d458919c
- fixed merge error · 08cb23a8
  iNPUTmice authored Nov 03, 2014
  
  08cb23a8
- Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc · 7d7be8ef
  iNPUTmice authored Nov 03, 2014
```
Conflicts:
	src/main/AndroidManifest.xml
```
  7d7be8ef
- use different filter for nfc intents · a054a3fb
  iNPUTmice authored Nov 03, 2014
  
  a054a3fb
- basic beam code / untested · 28a186cd
  iNPUTmice authored Nov 03, 2014
  
  28a186cd
- create file explicitly before downloading image · 4614ff34
  iNPUTmice authored Nov 03, 2014
  
  4614ff34
- Merge pull request #614 from SamWhited/spacefixes · 962008fe
  Daniel Gultsch authored Nov 03, 2014
```
Fix some space/tab issues in README
```
  962008fe
- Merge branch 'development' of https://github.com/siacs/Conversations into development · c48407f3
  iNPUTmice authored Nov 03, 2014
  
  c48407f3
- basic beam code / untested · 696dd07a
  iNPUTmice authored Nov 03, 2014
  
  696dd07a
- more error handling for http connection · ec9c264c
  iNPUTmice authored Nov 03, 2014
  
  ec9c264c
- disabled proguard. fixed gradle libs · 21069003
  iNPUTmice authored Nov 03, 2014
  
  21069003