Commits · 2127fcb90285028c056670cace7534bb9588c32b · Android-smartphones / Conversations

Sep 12, 2014
- Merge branch 'development' of github.com:siacs/Conversations into development · 2127fcb9
  iNPUTmice authored Sep 12, 2014
  
  2127fcb9
- fixed #446 · 8a36958b
  iNPUTmice authored Sep 12, 2014
  
  8a36958b
- Merge pull request #445 from betheg/namespace · e6eef537
  Daniel Gultsch authored Sep 12, 2014
```
add proper namespace in carbon
```
  e6eef537
- add proper namespace in carbon · 0d873903
  Michael authored Sep 12, 2014
  
  0d873903
- Merge branch 'development' · 83c3b33f
  iNPUTmice authored Sep 12, 2014
  
  83c3b33f
- Merge branch 'master' of github.com:siacs/Conversations · cee89808
  iNPUTmice authored Sep 12, 2014
  
  cee89808
- version bump to 0.7.1 · 73cba91c
  iNPUTmice authored Sep 12, 2014
  
  73cba91c
- updated swedish translations. thank you Anders Sandblad · ca560ae4
  iNPUTmice authored Sep 12, 2014
  
  ca560ae4
- Merge pull request #441 from svetlemodry/master · 62cdd7c6
  Daniel Gultsch authored Sep 12, 2014
```
Czech translation for Conversations
```
  62cdd7c6
- Created Czech strings.xml translation file · 00d2757b
  Jaroslav Lichtblau authored Sep 12, 2014
  
  00d2757b
Sep 11, 2014
- czech arrays.xml file created · 19488d39
  Jaroslav Lichtblau authored Sep 11, 2014
  
  19488d39
- check if market is available before starting to install openkey chain · db816187
  iNPUTmice authored Sep 11, 2014
  
  db816187
- more formating · c9a342fc
  iNPUTmice authored Sep 11, 2014
  
  c9a342fc
- added missing strings back. + formating · 12b62ade
  iNPUTmice authored Sep 11, 2014
  
  12b62ade
- match color in contact details to the colors in the send button. also migrated... · dee46f34
  iNPUTmice authored Sep 11, 2014
```
match color in contact details to the colors in the send button. also migrated some other colors from hard coding to using resources
```
  dee46f34
- missed show=chat for send button colorization · ff41918c
  iNPUTmice authored Sep 11, 2014
  
  ff41918c
- pare body in type=normal messages as well · fef41ba2
  iNPUTmice authored Sep 11, 2014
  
  fef41ba2
- added something about delivery failed to readme · 7fd4f13f
  iNPUTmice authored Sep 11, 2014
  
  7fd4f13f
Sep 10, 2014
- IT'S CHRISTMAS ALREADY! · 31f11070
  iNPUTmice authored Sep 10, 2014
  
  31f11070
- started development on 0.8-alpha · a6d4a9cd
  iNPUTmice authored Sep 10, 2014
  
  a6d4a9cd
Sep 09, 2014
- added bookmarks to XEP list · a1d6f910
  iNPUTmice authored Sep 09, 2014
  
  a1d6f910
- added a list of XEPs · 1cd5949a
  iNPUTmice authored Sep 09, 2014
  
  1cd5949a
- Merge pull request #435 from kruks23/translation4 · 79a8c29b
  Daniel Gultsch authored Sep 09, 2014
```
Update Spanish Translations
```
  79a8c29b
- Update Spanish Translations · 8d4ad583
  kruks23 authored Sep 09, 2014
  
  8d4ad583
- version bump, changelog and one last minute change for OTR · 4b2e06b9
  iNPUTmice authored Sep 09, 2014
  
  4b2e06b9
- Merge branch 'master' of github.com:siacs/Conversations · c02ef800
  iNPUTmice authored Sep 09, 2014
```
Conflicts:
	src/eu/siacs/conversations/crypto/PgpEngine.java
	src/eu/siacs/conversations/persistance/FileBackend.java
	src/eu/siacs/conversations/ui/ShareWithActivity.java
```
  c02ef800
- don't reset images from sending to waiting · facb1242
  iNPUTmice authored Sep 09, 2014
  
  facb1242
Sep 08, 2014
- setting to increase font size. fixed #420 · d92e8381
  iNPUTmice authored Sep 08, 2014
  
  d92e8381
- hide encryption settings under 'expert options' · d9c4637b
  iNPUTmice authored Sep 08, 2014
  
  d9c4637b
- bumped openpgp-api to version 5 · 3f77e5fa
  iNPUTmice authored Sep 08, 2014
  
  3f77e5fa
- simplefied some code that might have been the source for some strange bugs · 1871521a
  iNPUTmice authored Sep 08, 2014
  
  1871521a
- introduced downloadable interface. reverted some of the changes made to OTR · b23f8bd4
  iNPUTmice authored Sep 08, 2014
  
  b23f8bd4
- bug fixes for forcing encryption · a6f0f0cb
  iNPUTmice authored Sep 08, 2014
  
  a6f0f0cb
- fixed sending offline pgp messages · 5cb11396
  iNPUTmice authored Sep 08, 2014
  
  5cb11396
- settings to force encryption and setting for not saving messages to disk. fixed #353 · 58953e61
  iNPUTmice authored Sep 08, 2014
  
  58953e61
- don't fail displayed or received messages · 3b9fd28e
  iNPUTmice authored Sep 08, 2014
  
  3b9fd28e
- warn on missing presence subscription · 19f98f51
  iNPUTmice authored Sep 08, 2014
  
  19f98f51
Sep 07, 2014
- Merge branch 'development' of github.com:siacs/Conversations into development · 409fdd85
  iNPUTmice authored Sep 07, 2014
  
  409fdd85
- fixed #321 - delete otr fingerprints · 449c2a54
  iNPUTmice authored Sep 07, 2014
  
  449c2a54
- Merge pull request #426 from betheg/remove_strings · 5fe3f207
  Daniel Gultsch authored Sep 07, 2014
```
deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.
```
  5fe3f207