Commits · 15176417132a88364efeb64713f8ac1267001cc4 · Android-smartphones / Conversations

Dec 20, 2014
- get rid of special self presence object and incorporate that into roster · 15176417
  iNPUTmice authored Dec 20, 2014
  
  15176417
- more null checks for otr fingerprints · ce4848f7
  iNPUTmice authored Dec 20, 2014
  
  ce4848f7
- don't include empty fingerprints in list of otrfingerprints · 40335785
  iNPUTmice authored Dec 20, 2014
  
  40335785
- fixed another break continue bug · 6b047bed
  iNPUTmice authored Dec 20, 2014
  
  6b047bed
- inject ui callback into running mam query · 88f43643
  iNPUTmice authored Dec 20, 2014
  
  88f43643
- Merge pull request #794 from svetlemodry/development · 675bac72
  Daniel Gultsch authored Dec 20, 2014
```
Czech image transfer string fix
```
  675bac72
- Merge pull request #797 from kruks23/translation · 64ebbaec
  Daniel Gultsch authored Dec 20, 2014
```
Update spanish translations
```
  64ebbaec
- Update spanish translations · 6dd75cbb
  kruks23 authored Dec 20, 2014
  
  6dd75cbb
Dec 19, 2014
- Czech image transfer string fix · c8cfd1b0
  Jaroslav Lichtblau authored Dec 19, 2014
  
  c8cfd1b0
- Merge branch 'development' of https://github.com/siacs/Conversations into development · a68cb5d3
  iNPUTmice authored Dec 19, 2014
  
  a68cb5d3
- fixed #755 · 627982df
  iNPUTmice authored Dec 19, 2014
  
  627982df
- Merge pull request #789 from svetlemodry/development · 11cb06ed
  Daniel Gultsch authored Dec 19, 2014
```
Czech translation updated
```
  11cb06ed
Dec 18, 2014
- Czech translation updated · 7c4a306a
  Jaroslav Lichtblau authored Dec 18, 2014
```
added missing strings
```
  7c4a306a
- Merge pull request #787 from kriztan/patch-1 · a8afc6ae
  Daniel Gultsch authored Dec 18, 2014
```
Update german translations
```
  a8afc6ae
- Update german translations · 948112c2
  kriztan authored Dec 18, 2014
  
  948112c2
Dec 17, 2014
- clean up conversation history after swtiching to a different conversation · f00e1687
  iNPUTmice authored Dec 17, 2014
  
  f00e1687
- show error if jid couldn't be parsed in new contact dialog · de952cc9
  iNPUTmice authored Dec 17, 2014
  
  de952cc9
- Merge branch 'development' of https://github.com/siacs/Conversations into development · c30108eb
  iNPUTmice authored Dec 17, 2014
  
  c30108eb
- made scroling smoother + bug fixes for history loading · 741a0c12
  iNPUTmice authored Dec 17, 2014
  
  741a0c12
- smoothed out scrolling a bit · 80435eca
  iNPUTmice authored Dec 17, 2014
  
  80435eca
- Merge pull request #783 from SamWhited/quiet-hours · 5603440a
  Daniel Gultsch authored Dec 17, 2014
```
Update summary in TimePreference change listener
```
  5603440a
- properly detect images in share with · 1a7ed4ed
  iNPUTmice authored Dec 17, 2014
  
  1a7ed4ed
- Merge branch 'issue756' of https://github.com/SamWhited/Conversations into SamWhited-issue756 · fd4cf499
  iNPUTmice authored Dec 17, 2014
  
  fd4cf499
- properly count mam messages · 3f6638cb
  iNPUTmice authored Dec 17, 2014
  
  3f6638cb
Dec 16, 2014
- Handle time comparisons using longs · 0b498758
  Sam Whited authored Dec 16, 2014
  
  0b498758
- Allow sending of any filetype via intent · 6659339e
  Sam Whited authored Dec 15, 2014
```
Fixes #756
```
  6659339e
Dec 15, 2014
- Update summary in TimePreference change listener · f9c78308
  Sam Whited authored Dec 15, 2014
```
Ensures the summary is updated even if we change the time preference
programatically; also allows other places to stop the summary from being
updated by setting a new listener.
```
  f9c78308
- go through mam history page by page. load mam dynamically on scroll · e2f50ab8
  iNPUTmice authored Dec 15, 2014
  
  e2f50ab8
- Merge pull request #782 from SamWhited/quiet-hours · 03ca971e
  Daniel Gultsch authored Dec 15, 2014
```
Make some magic number constants final
```
  03ca971e
- Make some magic number constants final · ea61142d
  Sam Whited authored Dec 15, 2014
  
  ea61142d
- fixed crashing on unparsed jids · ab2187db
  iNPUTmice authored Dec 15, 2014
  
  ab2187db
- Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours · 183e31ad
  iNPUTmice authored Dec 15, 2014
  
  183e31ad
- migrated more jid parsing to use getAttributeAsJid. added error logging · e0842665
  iNPUTmice authored Dec 15, 2014
  
  e0842665
- Make silent notification when quiet hours are on · af0f8e87
  Sam Whited authored Dec 15, 2014
```
Notify, just don't play a sound or vibrate
Also make the Java annoyingly verbose... I can't help myself... ahh!
```
  af0f8e87
- Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours · 25d8546a
  iNPUTmice authored Dec 15, 2014
  
  25d8546a
- fixed history deletion. fixed #780 · 2bd46212
  iNPUTmice authored Dec 15, 2014
  
  2bd46212
- Merge pull request #775 from kruks23/translation1 · a6cfbf2f
  Daniel Gultsch authored Dec 15, 2014
```
Update spanish translations.
```
  a6cfbf2f
- Merge pull request #781 from drizzt/patch-1 · 16360242
  Daniel Gultsch authored Dec 15, 2014
```
fixed typo in italian translation
```
  16360242
- avoid npe on weird platform bugs · 209e62d6
  iNPUTmice authored Dec 15, 2014
  
  209e62d6
- fixed typo in italian translation · 9f6537ac
  drizzt authored Dec 15, 2014
```
s/gallaria/galleria/
```
  9f6537ac