Commits · 836366bf2d6765234f467c726a686b34429ebeab · Android-smartphones / Conversations

May 17, 2014
- added translators to readme · 836366bf
  Daniel Gultsch authored May 17, 2014
  
  836366bf
- version bump to 0.2.2 · 84a46206
  Daniel Gultsch authored May 17, 2014
  
  84a46206
- permanent notification disapears now when account is being deleted + code clean up · 8bf0945f
  Daniel Gultsch authored May 17, 2014
  
  8bf0945f
- fixed #113 · b84b6726
  Daniel Gultsch authored May 17, 2014
  
  b84b6726
May 16, 2014
- Merge pull request #120 from kruks23/development · f9394e2e
  Daniel Gultsch authored May 16, 2014
```
Update Spanish Translations + harcoded pref_advanced_options
```
  f9394e2e
- reworked message to conferences · cd1afbd3
  Daniel Gultsch authored May 16, 2014
  
  cd1afbd3
- fixed npe for otr sessions with non contacts · a0a5ca95
  Daniel Gultsch authored May 16, 2014
  
  a0a5ca95
- Update Spanish Translations + harcoded pref_advanced_settings · e50f0090
  kruks23 authored May 16, 2014
  
  e50f0090
- updated german translation · 225447f2
  Daniel Gultsch authored May 16, 2014
  
  225447f2
- offline sending of pgp fixed · aa68045c
  Daniel Gultsch authored May 16, 2014
  
  aa68045c
- formating · c8f8bab2
  Daniel Gultsch authored May 16, 2014
  
  c8f8bab2
- fixed null in shared link · 1cf1e62e
  Daniel Gultsch authored May 16, 2014
  
  1cf1e62e
- Merge pull request #117 from BenoitBouvarel/development · afd1ba65
  Daniel Gultsch authored May 16, 2014
```
French translation + hard-coded string > @string
```
  afd1ba65
May 15, 2014
- French translation + hard-coded string > @string · 3d0f08e3
  Benoit Bouvarel authored May 16, 2014
  
  3d0f08e3
- Merge pull request #109 from kruks23/development · 3426df21
  Daniel Gultsch authored May 15, 2014
```
Update Spanish Translations
```
  3426df21
- fixed npe · 13d73a19
  Daniel Gultsch authored May 15, 2014
  
  13d73a19
May 14, 2014
- Update Spanish Translations · ad19100b
  kruks23 authored May 14, 2014
  
  ad19100b
- hiding the prepare image toast after error or success · ca7e24c3
  Daniel Gultsch authored May 14, 2014
  
  ca7e24c3
- fixed possible npe · 08a26d27
  Daniel Gultsch authored May 14, 2014
  
  08a26d27
- fixed #105 · f4eebd09
  Daniel Gultsch authored May 14, 2014
  
  f4eebd09
- made message parser non static · 81d27605
  Daniel Gultsch authored May 14, 2014
  
  81d27605
- code clean up · 1f600be4
  Daniel Gultsch authored May 14, 2014
  
  1f600be4
May 13, 2014
- Merge branch 'development' into feature/take_picture · 65e72948
  Daniel Gultsch authored May 14, 2014
  
  65e72948
- one more entry to strings file · ebae779d
  Daniel Gultsch authored May 13, 2014
  
  ebae779d
- version bump · bc87f596
  Daniel Gultsch authored May 13, 2014
  
  bc87f596
- added presence selection · a1a90a03
  Daniel Gultsch authored May 13, 2014
  
  a1a90a03
- Merge branch 'development' into feature/take_picture · 888de850
  Daniel Gultsch authored May 13, 2014
  
  888de850
- Merge branch 'beriain-development' into development · a3d24102
  Daniel Gultsch authored May 13, 2014
  
  a3d24102
- Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development · c0f5b26d
  Daniel Gultsch authored May 13, 2014
  
  c0f5b26d
- Merge branch 'development' into feature/take_picture · f1bdf1d4
  Daniel Gultsch authored May 13, 2014
  
  f1bdf1d4
- code cleanup · 71545f4f
  Daniel Gultsch authored May 13, 2014
  
  71545f4f
- Fix · efac008f
  Beriain authored May 13, 2014
  
  efac008f
- takeing pictures over intent · 9492e289
  Daniel Gultsch authored May 13, 2014
  
  9492e289
- Merge https://github.com/siacs/Conversations into development · 8d27d0c4
  Beriain authored May 13, 2014
  
  8d27d0c4
- Update basque translation and include preferences · 1150f47a
  Beriain authored May 13, 2014
  
  1150f47a
- Merge branch 'development' into feature/take_picture · a8010e71
  Daniel Gultsch authored May 13, 2014
  
  a8010e71
- static method for providing content uri · 84e79040
  Daniel Gultsch authored May 13, 2014
  
  84e79040
- submenu for attach file · 6dfd885d
  Daniel Gultsch authored May 13, 2014
  
  6dfd885d
- ensure that iq response is being send out for jingle packets. remove jingle... · 7e667319
  Daniel Gultsch authored May 13, 2014
```
ensure that iq response is being send out for jingle packets. remove jingle connection from manager after termination
```
  7e667319
- german translation · 3cd369fb
  Daniel Gultsch authored May 13, 2014
  
  3cd369fb