Commits · 9a945af6b9df40102402f593f57c125fc005f04e · Android-smartphones / Conversations

Sep 06, 2014
- Merge branch 'development' of github.com:siacs/Conversations into development · 9a945af6
  iNPUTmice authored Sep 06, 2014
  
  9a945af6
- made otr a little bit more solid when there is no presence subscription · 0e5a0a07
  iNPUTmice authored Sep 06, 2014
  
  0e5a0a07
- Merge pull request #422 from betheg/muc_password · dfc5942b
  Daniel Gultsch authored Sep 06, 2014
```
MUC: set password from invite message.
```
  dfc5942b
Sep 05, 2014
- MUC: set password from invite message. · 375ec3a6
  Michael authored Sep 05, 2014
  
  375ec3a6
- warn user if no presence subscription exists · dc021371
  iNPUTmice authored Sep 05, 2014
  
  dc021371
- improved logging for avatar fetches · 34228d0e
  iNPUTmice authored Sep 05, 2014
  
  34228d0e
Sep 04, 2014
- fixed #342 - otr with facebook and other services without resources · b8d289a9
  iNPUTmice authored Sep 04, 2014
  
  b8d289a9
- reconnect accounts when resource has been changed in settings · 01389e90
  iNPUTmice authored Sep 04, 2014
  
  01389e90
- made muc password dialog hide the password (password field) · 9817251e
  iNPUTmice authored Sep 04, 2014
  
  9817251e
- nick parsing (xep 0172) also enabled for messages and for pep · 7a3bc5dc
  iNPUTmice authored Sep 04, 2014
  
  7a3bc5dc
- Merge pull request #397 from GZep/development · 1d6c09e8
  Daniel Gultsch authored Sep 04, 2014
```
XEP-0172
```
  1d6c09e8
- Merge pull request #417 from emdete/unicode_emoticons · 50f90d37
  Daniel Gultsch authored Sep 04, 2014
```
improve regex, implement pattern cache
```
  50f90d37
Sep 03, 2014
- added support for password protected muc - fixed #203 and fixed #395 · 6b9219c5
  iNPUTmice authored Sep 03, 2014
  
  6b9219c5
- changed order of snackbar hints · f19b1fb8
  iNPUTmice authored Sep 03, 2014
  
  f19b1fb8
- improve emo mapping · 0a2c73f2
  M. Dietrich authored Sep 03, 2014
  
  0a2c73f2
- use class, use codepoint · 0a686bc7
  M. Dietrich authored Sep 03, 2014
  
  0a686bc7
- set openpgp-api-lib to a version that actually works · ceddf99a
  iNPUTmice authored Sep 03, 2014
  
  ceddf99a
- make pattern static · 58498480
  M. Dietrich authored Sep 03, 2014
  
  58498480
- improve regex, implement pattern cache · cb3ba404
  M. Dietrich authored Sep 03, 2014
  
  cb3ba404
- more openpgp bug fixes · 253438e6
  iNPUTmice authored Sep 03, 2014
  
  253438e6
- avoiding resource conflicts · 664c9c43
  iNPUTmice authored Sep 03, 2014
  
  664c9c43
- fixed pgp signature creation · 5ae62f18
  iNPUTmice authored Sep 03, 2014
  
  5ae62f18
- added ability to disable notifications for specific conversations - fixed #322 · 1a09a470
  iNPUTmice authored Sep 03, 2014
  
  1a09a470
- made emoticon parsing enableable - default false · 1f378bff
  iNPUTmice authored Sep 03, 2014
  
  1f378bff
Sep 02, 2014
- Merge branch 'betheg-unused_resources' into development · c1453db5
  iNPUTmice authored Sep 02, 2014
  
  c1453db5
- Merge branch 'unused_resources' of https://github.com/betheg/Conversations... · 3235c67e
  iNPUTmice authored Sep 02, 2014
```
Merge branch 'unused_resources' of https://github.com/betheg/Conversations into betheg-unused_resources
```
  3235c67e
- fixed #410 by removing that config option · 97b52aba
  iNPUTmice authored Sep 02, 2014
  
  97b52aba
- refactored share with activity · 0ae852a6
  iNPUTmice authored Sep 02, 2014
  
  0ae852a6
- fixed #406 · 2c9b2e6b
  iNPUTmice authored Sep 02, 2014
  
  2c9b2e6b
- rotate avatars · f888b167
  iNPUTmice authored Sep 02, 2014
  
  f888b167
- Merge pull request #408 from emdete/unicode_emoticons · 6045bcc2
  Daniel Gultsch authored Sep 02, 2014
```
add all whitespaces in regex
```
  6045bcc2
Sep 01, 2014
- add all whitespaces in regex · a7b3aa34
  M. Dietrich authored Sep 02, 2014
  
  a7b3aa34
- Merge pull request #380 from emdete/unicode_emoticons · 6291ebf1
  Daniel Gultsch authored Sep 01, 2014
```
add translation from ascii to unicode emoticons
```
  6291ebf1
- transform ascii to emoticons (on display only) · 54608214
  M. Dietrich authored Sep 01, 2014
  
  54608214
- removed unused string resources. · 8f0882eb
  Michael authored Sep 01, 2014
  
  8f0882eb
- fixed #403 · a7881754
  iNPUTmice authored Sep 01, 2014
  
  a7881754
- Merge pull request #402 from emdete/remove_poormans_tostring · 0ffdb03a
  Daniel Gultsch authored Sep 01, 2014
```
optimize string operations a bit
```
  0ffdb03a
- optimize string operations a bit · 2acf510e
  M. Dietrich authored Sep 01, 2014
  
  2acf510e
Aug 31, 2014
- updated readme · 271b0f9c
  iNPUTmice authored Aug 31, 2014
  
  271b0f9c
- Contact presenceName property · 5b24534a
  Gayaz Yusipov authored Aug 31, 2014
  
  5b24534a