Commits · 1ff9293ee14a3989fa8a112f28e7f611b49bfb7a · Android-smartphones / Conversations

Nov 29, 2014
- fix for concurrency issue · 1ff9293e
  iNPUTmice authored Nov 29, 2014
  
  1ff9293e
Nov 27, 2014
- Merge branch 'development' of https://github.com/siacs/Conversations into development · 3d8a2e79
  iNPUTmice authored Nov 27, 2014
  
  3d8a2e79
- fixed npe. fixed #717 · 7ba41c6a
  iNPUTmice authored Nov 27, 2014
  
  7ba41c6a
- create conversation with bare jid · 2f02d8d3
  iNPUTmice authored Nov 27, 2014
  
  2f02d8d3
- use getAttributeAsJid method · 0b8032db
  iNPUTmice authored Nov 27, 2014
  
  0b8032db
Nov 26, 2014
- Merge pull request #716 from kriztan/patch-3 · 228af527
  Daniel Gultsch authored Nov 26, 2014
```
Update german translations
```
  228af527
- Update german translations · e1e28e9e
  kriztan authored Nov 26, 2014
```
modified translations a bit
```
  e1e28e9e
Nov 24, 2014
- Merge pull request #713 from betheg/muc · 7a75a8bc
  Daniel Gultsch authored Nov 24, 2014
```
MUC: do not add yourself to the muc user list.
```
  7a75a8bc
- Merge pull request #714 from betheg/muc_bookmark_cd · 6f21dc84
  Daniel Gultsch authored Nov 24, 2014
```
MUC: option to set/delete bookmark in conference details.
```
  6f21dc84
- Merge pull request #712 from kriztan/patch-2 · 7ae3e364
  Daniel Gultsch authored Nov 24, 2014
```
Update german translation
```
  7ae3e364
Nov 23, 2014
- MUC: option to set/delete bookmark in conference details. · 31b539da
  Michael authored Nov 23, 2014
  
  31b539da
- Update german translations · 4d841587
  kriztan authored Nov 23, 2014
  
  4d841587
- add an listener for the muc roster update. · dbe82806
  Michael authored Nov 23, 2014
```
this is for the ConferenceDetailsActivity to show
precence updates immediately.
```
  dbe82806
- MUC: do not add yourself to the muc user list. · bdfdc5fb
  Michael authored Nov 23, 2014
  
  bdfdc5fb
Nov 21, 2014
- Merge pull request #709 from kruks23/translation · 49403fda
  Daniel Gultsch authored Nov 22, 2014
```
Update spanish translations
```
  49403fda
- Update spanish translations · ca761bac
  kruks23 authored Nov 22, 2014
  
  ca761bac
- work around to not confuse irc transport with real conference servers · 28fefad8
  iNPUTmice authored Nov 21, 2014
  
  28fefad8
- Merge pull request #706 from betheg/unused_imports · 36f8a31d
  Daniel Gultsch authored Nov 21, 2014
```
remove unused imports.
```
  36f8a31d
- update action bar with conversations updates as well · 81a1a48b
  iNPUTmice authored Nov 21, 2014
  
  81a1a48b
- Merge pull request #707 from betheg/joinmuc · 97344c07
  Daniel Gultsch authored Nov 21, 2014
```
MUC: set from when join muc.
```
  97344c07
- MUC: set from when join muc. · febbefef
  Michael authored Nov 21, 2014
  
  febbefef
- remove unused imports. · dc0dba3f
  Michael authored Nov 21, 2014
  
  dc0dba3f
- move task to back and not finish when hitting back button · 424de3ea
  iNPUTmice authored Nov 21, 2014
  
  424de3ea
- Merge pull request #705 from betheg/muc · 40ee9b6a
  Daniel Gultsch authored Nov 21, 2014
```
STATUS_CODE_SELF_PRESENCE is not set in all case.
```
  40ee9b6a
- STATUS_CODE_SELF_PRESENCE is not set in all case. · 44faec70
  Michael authored Nov 21, 2014
  
  44faec70
- additional null pointer saftey checks · 888475d4
  iNPUTmice authored Nov 21, 2014
  
  888475d4
- verify contacts key only on initiating side of smp · de0b36fc
  iNPUTmice authored Nov 21, 2014
  
  de0b36fc
Nov 20, 2014
- changed listener timing and cache clearing after muc presences · 92ad4cb7
  iNPUTmice authored Nov 20, 2014
  
  92ad4cb7
- create file and dirs before creating file · 66abdfcc
  iNPUTmice authored Nov 20, 2014
  
  66abdfcc
- Merge pull request #698 from kriztan/patch-1 · 8fe3b297
  Daniel Gultsch authored Nov 20, 2014
```
Update german translations
```
  8fe3b297
- Merge pull request #699 from betheg/status_code · 3e8a1e5f
  Daniel Gultsch authored Nov 20, 2014
```
change status codes string 'number' to a better readable constant.
```
  3e8a1e5f
- change status codes string 'number' to a better readable constant. · 3e3767cb
  Michael authored Nov 20, 2014
  
  3e3767cb
- Update german translations · 13bb46d5
  kriztan authored Nov 20, 2014
  
  13bb46d5
- fixed potential NPEs · a2072408
  iNPUTmice authored Nov 20, 2014
  
  a2072408
- import fixes · a142dcc2
  iNPUTmice authored Nov 20, 2014
  
  a142dcc2
- Merge branch 'development' of https://github.com/siacs/Conversations into development · 8b10ea67
  iNPUTmice authored Nov 20, 2014
  
  8b10ea67
- brought ad hoc conferences back. fixed #688 fixed #367 · 0ad6d061
  iNPUTmice authored Nov 20, 2014
  
  0ad6d061
Nov 19, 2014
- Merge pull request #696 from SamWhited/development · 6bb0eb0b
  Daniel Gultsch authored Nov 19, 2014
```
Remove broken / unused imports
```
  6bb0eb0b
- Remove broken / unused imports · 73d18435
  Sam Whited authored Nov 19, 2014
  
  73d18435
- sent read marker to full jid · e9948f6b
  iNPUTmice authored Nov 19, 2014
  
  e9948f6b