Commits · f9e61f154b7af9b47b652234abd93e40fd74e733 · Android-smartphones / Conversations

Nov 17, 2014
- Updated launcher icon: Bigger circles · f9e61f15
  Ilia Rostovtsev authored Nov 18, 2014
  
  f9e61f15
- Notification icon: Solid version · 0bf108a9
  Ilia Rostovtsev authored Nov 18, 2014
  
  0bf108a9
- Notification icon: Dashed-solid version · 853bddd0
  Ilia Rostovtsev authored Nov 18, 2014
```
Keeping this icon in case it's needed later
```
  853bddd0
- bump to version 0.9-alpha to differentiate stack traces. no feature freeze or anything else · 123036fd
  iNPUTmice authored Nov 17, 2014
  
  123036fd
- clear avatar cache with new roster push from server · 86241a26
  iNPUTmice authored Nov 17, 2014
  
  86241a26
- avoided some null pointers · abbadcb5
  iNPUTmice authored Nov 17, 2014
  
  abbadcb5
- context menu for muc participants + refactor trueCounterpart to use Jid class · f41c3eee
  iNPUTmice authored Nov 17, 2014
  
  f41c3eee
- synchronized around cache clear in avatar service · 283d5058
  iNPUTmice authored Nov 17, 2014
  
  283d5058
- Merge pull request #681 from SamWhited/searchlocalefix · c058594f
  Daniel Gultsch authored Nov 17, 2014
```
Use `Locale.US' for string comparisons in search
```
  c058594f
- Use `Locale.US' for string comparisons in search · b6d89772
  Sam Whited authored Nov 17, 2014
  
  b6d89772
- Merge pull request #680 from ferdev1/patch-2 · e664a0c9
  Daniel Gultsch authored Nov 17, 2014
```
Fix string 2
```
  e664a0c9
- trim search before searching · 8865cc40
  iNPUTmice authored Nov 17, 2014
  
  8865cc40
- Merge branch 'development' of https://github.com/siacs/Conversations into development · 1a5af45a
  iNPUTmice authored Nov 17, 2014
  
  1a5af45a
- split search keywords by whitespaces and imply AND operatior · 252c7e68
  iNPUTmice authored Nov 17, 2014
  
  252c7e68
- slightly modified logo / launcher icon · e30e84c8
  iNPUTmice authored Nov 17, 2014
  
  e30e84c8
- Update strings.xml · 6c13b8a9
  ferdev1 authored Nov 17, 2014
  
  6c13b8a9
- Merge pull request #679 from SamWhited/lintfix · c7b8d364
  Daniel Gultsch authored Nov 17, 2014
```
Fix broken SuppressLint
```
  c7b8d364
- Fix linter suppression · 55957a77
  Sam Whited authored Nov 17, 2014
  
  55957a77
- Merge branch 'development' of https://github.com/siacs/Conversations into development · ceecc8ff
  iNPUTmice authored Nov 17, 2014
  
  ceecc8ff
- highlight muc members by touching their name in muc details. fixed #503 · 967cd922
  iNPUTmice authored Nov 17, 2014
  
  967cd922
Nov 16, 2014
- Merge pull request #675 from ferdev1/patch-1 · 81b93c76
  Daniel Gultsch authored Nov 17, 2014
```
Fix string
```
  81b93c76
- made tags searchable · 2036c58c
  iNPUTmice authored Nov 16, 2014
  
  2036c58c
- fixed regression of xmpp uris not working · 8c4236b0
  iNPUTmice authored Nov 16, 2014
  
  8c4236b0
- Fix string · c147f44c
  ferdev1 authored Nov 16, 2014
  
  c147f44c
- Merge pull request #673 from SamWhited/development · 155b607f
  Daniel Gultsch authored Nov 16, 2014
```
Fix fetching accounts by JIDs
```
  155b607f
- happy hanukkah · cf00f3fa
  iNPUTmice authored Nov 16, 2014
  
  cf00f3fa
- Fix fetching accounts by JIDs · 5765a91d
  Sam Whited authored Nov 16, 2014
```
Fixes a crash when publishing an avatar
```
  5765a91d
- Merge branch 'development' of https://github.com/siacs/Conversations into development · 84b2ce10
  iNPUTmice authored Nov 16, 2014
  
  84b2ce10
- Merge branch 'master' into development · d43aeb72
  iNPUTmice authored Nov 16, 2014
```
Conflicts:
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
```
  d43aeb72
- version bump to 0.8.4 · 279534dd
  iNPUTmice authored Nov 16, 2014
  
  279534dd
- show full time stamp in connection established field · ccc3c100
  iNPUTmice authored Nov 16, 2014
  
  ccc3c100
- show full time stamp in connection established field · ac8c2b7e
  iNPUTmice authored Nov 16, 2014
  
  ac8c2b7e
- better error checking in ssl switch over · f41f3b12
  iNPUTmice authored Nov 16, 2014
```
Conflicts:
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
```
  f41f3b12
- better error checking in ssl switch over · f18f3086
  iNPUTmice authored Nov 16, 2014
  
  f18f3086
- Merge pull request #672 from SamWhited/development · 2c654775
  Daniel Gultsch authored Nov 16, 2014
```
Don't escape passwords in SASL
```
  2c654775
- Don't escape passwords in SASL · cfdda5f8
  Sam Whited authored Nov 15, 2014
```
Fixes #671
```
  cfdda5f8
- made scan and show qr code more accessible in VerifyOtrActivity · 2067b9bd
  iNPUTmice authored Nov 16, 2014
  
  2067b9bd
Nov 15, 2014
- Merge branch 'master' into development · 2b21bc13
  iNPUTmice authored Nov 16, 2014
  
  2b21bc13
- close cursor for database · ac4eabbd
  iNPUTmice authored Nov 16, 2014
  
  ac4eabbd
- parse otr-fingerprint in qr codes and nfc. include otr fingerprint in... · 88c3537b
  iNPUTmice authored Nov 16, 2014
```
parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible
```
  88c3537b