Commits · 3558fa5f5bcbf73ecb5c8174b208ac0c36e708b1 · Android-smartphones / Conversation

Aug 31, 2014
- deleted unnecessary log · 3558fa5f
  iNPUTmice authored Aug 31, 2014
  
  3558fa5f
- Merge pull request #401 from jelmer/dutch-updates · e30599b9
  Daniel Gultsch authored Aug 31, 2014
```
Update Dutch translations.
```
  e30599b9
- Update Dutch translations. · 86b85062
  Jelmer Vernooij authored Aug 31, 2014
  
  86b85062
- show merged time and status in message adapter · 94389ac2
  iNPUTmice authored Aug 31, 2014
  
  94389ac2
- improvements for merge conditions · bda7724e
  iNPUTmice authored Aug 31, 2014
  
  bda7724e
- add missing blank before nick · 28fa4870
  iNPUTmice authored Aug 31, 2014
  
  28fa4870
- Merge pull request #400 from xsrc/development · 4793081c
  Daniel Gultsch authored Aug 31, 2014
```
Smarter nickname highlight insert in confernces
```
  4793081c
- Smarter nickname highlight insert in confernces · 3e3451bc
  Bahtiar `kalkin-` Gadimov authored Aug 31, 2014
  
  3e3451bc
- some code cleanup · 1ac5be48
  iNPUTmice authored Aug 31, 2014
  
  1ac5be48
- Merge pull request #391 from betheg/fix_typo · 8d456085
  Daniel Gultsch authored Aug 31, 2014
```
fix forgotten spelling.
```
  8d456085
- Merge pull request #398 from betheg/fix_res · 5ab025d0
  Daniel Gultsch authored Aug 31, 2014
```
fix: warning: string 'publish_avatar' has no default translation.
```
  5ab025d0
- require encrypted to be the same for messages to get merged · 1cc16161
  iNPUTmice authored Aug 31, 2014
  
  1cc16161
- experimental message merging · 8f8d4e32
  iNPUTmice authored Aug 31, 2014
  
  8f8d4e32
Aug 30, 2014
- fix: warning: string 'publish_avatar' has no default translation. · 733041ae
  Michael authored Aug 30, 2014
```
also altered the types of resources from array to string-array in some res-files.
```
  733041ae
- Merge remote-tracking branch 'upstream/development' into fix_typo · 969cba5e
  Michael authored Aug 30, 2014
  
  969cba5e
- version bump to 0.7-alpha · 9eafb100
  iNPUTmice authored Aug 30, 2014
  
  9eafb100
- Merge branch 'sm' into development · c494f4f7
  iNPUTmice authored Aug 30, 2014
```
Conflicts:
	src/eu/siacs/conversations/services/XmppConnectionService.java
```
  c494f4f7
- reset unsend messages to waiting · 4435b005
  iNPUTmice authored Aug 27, 2014
  
  4435b005
- properly set stanza count on session resume · 9075d385
  iNPUTmice authored Aug 27, 2014
  
  9075d385
- basic message acking · 4a6a6c84
  iNPUTmice authored Aug 26, 2014
  
  4a6a6c84
- proper namespaces for xep-0352 · 9de77b19
  iNPUTmice authored Aug 29, 2014
  
  9de77b19
- send inactive or active on every connect and resume · 6d82a69b
  iNPUTmice authored Aug 28, 2014
  
  6d82a69b
- added basic csi · 265bd062
  iNPUTmice authored Aug 26, 2014
  
  265bd062
- version bump to 0.6 with changelogs · 9ad5c692
  iNPUTmice authored Aug 30, 2014
  
  9ad5c692
- brought npe catcher back for kxml parser · 8840d082
  iNPUTmice authored Aug 30, 2014
  
  8840d082
Aug 29, 2014
- Merge remote-tracking branch 'upstream/development' into fix_typo · 3714947d
  Michael authored Aug 29, 2014
  
  3714947d
- fixed link to old resource · 5450a2ae
  iNPUTmice authored Aug 29, 2014
  
  5450a2ae
- fixed npe · b0d777d9
  iNPUTmice authored Aug 29, 2014
  
  b0d777d9
- more swedish translations · 9be78cbb
  iNPUTmice authored Aug 29, 2014
  
  9be78cbb
- fixed #389 · 33172246
  iNPUTmice authored Aug 29, 2014
  
  33172246
- Merge pull request #394 from suraia/translation-de · 37e87e72
  Daniel Gultsch authored Aug 29, 2014
```
Fix some typos in the German translation.
```
  37e87e72
Aug 28, 2014
- Fix some typos in the German translation. · fc7f57cd
  Michael Kuhn authored Aug 28, 2014
  
  fc7f57cd
- fix forgotten spelling. · 98dabe9a
  Michael authored Aug 28, 2014
  
  98dabe9a
- fixed spelling thanks @betheg · 85b31b8d
  iNPUTmice authored Aug 28, 2014
  
  85b31b8d
- formating in strings file · 12cbd076
  iNPUTmice authored Aug 28, 2014
  
  12cbd076
- Merge branch 'development' of https://github.com/beriain/Conversations into development · d8eeab08
  iNPUTmice authored Aug 28, 2014
```
Conflicts:
	res/values-eu/strings.xml
```
  d8eeab08
Aug 27, 2014
- Update strings.xml · 9c8b6b16
  Aitor Beriain authored Aug 27, 2014
  
  9c8b6b16
- translated missing string in settings · 431d4ed4
  iNPUTmice authored Aug 27, 2014
  
  431d4ed4
- added swedish translations by Anders Sandblad @andersruneson · 16eb8c39
  iNPUTmice authored Aug 27, 2014
  
  16eb8c39
Aug 26, 2014
- added missing string to german translation · d617f099
  iNPUTmice authored Aug 26, 2014
  
  d617f099