Commits · 33530a9e3020beedef7f01b0d602d48a769d9257 · Android-smartphones / Conversation

Feb 01, 2015
- pulled translations from transifex · 33530a9e
  iNPUTmice authored Feb 01, 2015
  
  33530a9e
- Merge pull request #953 from SamWhited/remove_unused_strings · f5b1f699
  Daniel Gultsch authored Feb 01, 2015
```
Removes some unused strings (the legacy SSL stuff)
```
  f5b1f699
- Removes some unused strings (the legacy SSL stuff) · ce5c6c62
  Sam Whited authored Feb 01, 2015
  
  ce5c6c62
- fixed text preview for images · d0e764c1
  iNPUTmice authored Feb 01, 2015
  
  d0e764c1
- Merge pull request #949 from kruks23/title_activity · f5427837
  Daniel Gultsch authored Feb 01, 2015
```
Remove title_activity_conversations and use app_name instead
```
  f5427837
Jan 30, 2015
- Remove title_activity_conversations and use app_name instead · e76a9c06
  kruks23 authored Jan 30, 2015
  
  e76a9c06
Jan 29, 2015
- made version codes ready for release candidate in beta channel · 3216813e
  iNPUTmice authored Jan 29, 2015
  
  3216813e
- don't count when attempt failed completly · 3a52f318
  iNPUTmice authored Jan 29, 2015
  
  3a52f318
- Merge branch 'development' of https://github.com/siacs/Conversations into development · 6c3ea7f2
  iNPUTmice authored Jan 29, 2015
  
  6c3ea7f2
- Merge pull request #923 from SamWhited/material-design-icons · 26bc2d38
  Daniel Gultsch authored Jan 29, 2015
```
Start experimenting with material design icons
```
  26bc2d38
- Merge branch 'development' of https://github.com/siacs/Conversations into development · f2bf64d1
  iNPUTmice authored Jan 29, 2015
  
  f2bf64d1
- Use Material Design Icons on API 21+ · 48604a66
  Sam Whited authored Jan 21, 2015
  
  48604a66
- properly clear notifications. fixed #921 · 0eeead49
  iNPUTmice authored Jan 29, 2015
  
  0eeead49
Jan 28, 2015
- Merge pull request #941 from SamWhited/snackbar_ordering · c237a550
  Daniel Gultsch authored Jan 28, 2015
```
Show errors before mute snackbar
```
  c237a550
Jan 27, 2015
- fixed broken caps · 3c64839d
  iNPUTmice authored Jan 28, 2015
  
  3c64839d
- Show errors before mute snackbar · 8cbf610b
  Sam Whited authored Jan 27, 2015
```
See #939
```
  8cbf610b
Jan 26, 2015
- muc tics for consistency · f8b662e7
  iNPUTmice authored Jan 26, 2015
  
  f8b662e7
Jan 25, 2015
- changed version code and version name to 1.0-beta2 · 2a14a0d9
  iNPUTmice authored Jan 26, 2015
  
  2a14a0d9
- adapt caps on whether or not message confirmation is on · 91e85d2f
  iNPUTmice authored Jan 26, 2015
  
  91e85d2f
- don't put ejabberds status code muc messages into an actual conversation · 94086bb9
  iNPUTmice authored Jan 26, 2015
  
  94086bb9
- made connect time out more failsave · f0d428a5
  iNPUTmice authored Jan 25, 2015
  
  f0d428a5
- Merge pull request #930 from betheg/otr · 4afdd648
  Daniel Gultsch authored Jan 25, 2015
```
otr: switch to the otr-state the partner alternate.
```
  4afdd648
- Merge pull request #933 from betheg/mergeable · 15591447
  Daniel Gultsch authored Jan 25, 2015
```
fix mergable() for /me command.
```
  15591447
- fix mergable() for /me command. · 29331e49
  Michael authored Jan 25, 2015
  
  29331e49
- updated translations · 14fc520e
  iNPUTmice authored Jan 25, 2015
  
  14fc520e
- set jingle file transfer to offer after iq offer has returned · 82a74fab
  iNPUTmice authored Jan 25, 2015
  
  82a74fab
- Merge pull request #932 from svetlemodry/development · e5700f07
  Daniel Gultsch authored Jan 25, 2015
```
Czech translation
```
  e5700f07
- Czech translation · 0f3fb3ab
  Jaroslav Lichtblau authored Jan 25, 2015
```
for "hide offline" added
```
  0f3fb3ab
- Merge pull request #931 from betheg/gradle_plugin · 48dbf57c
  Daniel Gultsch authored Jan 25, 2015
```
update android gradle plugin to 1.0.1
```
  48dbf57c
- update android gradle plugin to 1.0.1 · 56dec464
  Michael authored Jan 25, 2015
  
  56dec464
- otr: switch to the otr-state the partner alternate. · 78006478
  Michael authored Jan 25, 2015
```
should also fixed #877
```
  78006478
- Merge pull request #927 from betheg/otr_query_message · 90d06d38
  Daniel Gultsch authored Jan 25, 2015
```
MessageParser: fix the regex for otr query messages.
```
  90d06d38
Jan 24, 2015
- MessageParser: fix the regex for otr query messages. · 8041d23c
  Michael authored Jan 24, 2015
  
  8041d23c
Jan 23, 2015
- Merge pull request #924 from andersruneson/changeonlinecolor · 7769d305
  Daniel Gultsch authored Jan 24, 2015
```
Changed online color to green instead of primary
```
  7769d305
- fixed mam to work with muc · b9af3846
  iNPUTmice authored Jan 24, 2015
  
  b9af3846
- Changed online color to green instead of primary · cbebd14d
  Anders Sandblad authored Jan 23, 2015
  
  cbebd14d
Jan 21, 2015
- mentioned hide offline feature in the changelog · ed3d76bc
  iNPUTmice authored Jan 22, 2015
  
  ed3d76bc
- show checkbox to hide offline contacts · 4e50098e
  iNPUTmice authored Jan 21, 2015
  
  4e50098e
- fixed bug in find conference in database method · 2dc69eea
  iNPUTmice authored Jan 21, 2015
  
  2dc69eea
- deal with user entering full jids in join conference dialog · 00c74503
  iNPUTmice authored Jan 21, 2015
  
  00c74503