Commits · 843a978ca1f0a0607cb164696087c66785a367eb · Android-smartphones / Conversation

Oct 20, 2014
- Went a bit wild on the README... · 843a978c
  Sam Whited authored Oct 19, 2014
  
  843a978c
Oct 19, 2014
- A few typo fixes in the README · 268f790b
  Sam Whited authored Oct 19, 2014
  
  268f790b
- Fixed some strange wording in a string · 47485fe0
  Sam Whited authored Oct 19, 2014
```
Still doesn't sound right to me though...
```
  47485fe0
- Merge pull request #554 from SamWhited/tls · 0b61fb01
  Daniel Gultsch authored Oct 20, 2014
```
Enable TLSv1.1 and 1.2 and add option to enable/disable SSLv3
```
  0b61fb01
- mtm support for image downloader · 8263e073
  iNPUTmice authored Oct 19, 2014
  
  8263e073
- use new 'api' to add messages to a conversation · 44f9022d
  iNPUTmice authored Oct 19, 2014
  
  44f9022d
- force tls for registrations as well · c9238ef5
  iNPUTmice authored Oct 19, 2014
  
  c9238ef5
- got rid of copyonwrite array list for messages · a201f9e5
  iNPUTmice authored Oct 19, 2014
  
  a201f9e5
- Make legacy SSL option default to false · 99ee0491
  Sam Whited authored Oct 19, 2014
  
  99ee0491
- Add "Enable legacy SSL" preference · 6c7c3ddf
  Sam Whited authored Oct 19, 2014
  
  6c7c3ddf
- force tls · e8bf75d7
  iNPUTmice authored Oct 19, 2014
  
  e8bf75d7
- Merge branch 'lactide-srv_fix' into development · 9372a98c
  iNPUTmice authored Oct 19, 2014
  
  9372a98c
- Merge branch 'srv_fix' of https://github.com/lactide/Conversations into lactide-srv_fix · f824193c
  iNPUTmice authored Oct 19, 2014
  
  f824193c
- fixed typo in french translation · 713cd6ef
  iNPUTmice authored Oct 19, 2014
  
  713cd6ef
- Merge pull request #555 from SamWhited/build-fixes · 30648a83
  Daniel Gultsch authored Oct 19, 2014
```
Fix problem when merging manifests during a Gradle build
```
  30648a83
- Merge pull request #566 from BenoitBouvarel/patch-1 · 75392614
  Daniel Gultsch authored Oct 19, 2014
```
Update french strings.xml
```
  75392614
- Merge pull request #565 from the-solipsist/patch-2 · 3f280134
  Daniel Gultsch authored Oct 19, 2014
```
Update README.md
```
  3f280134
- Remove support for legacy SSL · 113b7d17
  Sam Whited authored Oct 18, 2014
  
  113b7d17
Oct 18, 2014
- Update README.md · ac3c96b0
  the-solipsist authored Oct 18, 2014
  
  ac3c96b0
- Update strings.xml · 09abf7b9
  Benoit Bouvarel authored Oct 18, 2014
```
French translation update
```
  09abf7b9
Oct 17, 2014
- Update README.md · 1d9bd64e
  the-solipsist authored Oct 17, 2014
```
Changed "little" to the grammatically correct "few", and corrected the spelling of "permissions".
```
  1d9bd64e
- do not attempt to download images when not connected · 06053901
  iNPUTmice authored Oct 17, 2014
  
  06053901
- made grace period on a per account basis · 3372e501
  iNPUTmice authored Oct 17, 2014
  
  3372e501
Oct 16, 2014
- try all srv responses if necessary · c725da95
  Frank Zschockelt authored Oct 16, 2014
  
  c725da95
- additonal safty net for disabling notifications · 5e3caf96
  iNPUTmice authored Oct 16, 2014
  
  5e3caf96
- Fix problem when merging manifests · 5c2a7936
  Sam Whited authored Oct 16, 2014
  
  5c2a7936
- simplified determination whether otr needs starting in a session · 0fd634ae
  iNPUTmice authored Oct 16, 2014
  
  0fd634ae
- Enable all supported protocols including TLSv1.1 and 1.2 · c4b9d428
  Sam Whited authored Oct 16, 2014
  
  c4b9d428
- log ending otr sessions on disconnect · c1a55608
  iNPUTmice authored Oct 16, 2014
  
  c1a55608
- forground/background logging without csi · 6cfb14a2
  iNPUTmice authored Oct 16, 2014
  
  6cfb14a2
- make image download message to type=image only after completion · 45e0f99b
  iNPUTmice authored Oct 16, 2014
  
  45e0f99b
- added file observer to get notified when files are deleted: fixes #396 · 88d88ffb
  iNPUTmice authored Oct 16, 2014
  
  88d88ffb
Oct 15, 2014
- detect deleted files on start up. got rid of lagecy image provider for... · f5019ba9
  iNPUTmice authored Oct 15, 2014
```
detect deleted files on start up. got rid of lagecy image provider for performance reasons. NOTE: this will prevent you to access images older than version 0.6
```
  f5019ba9
- Merge branch 'development' of github.com:siacs/Conversations into development · 89cc4d12
  iNPUTmice authored Oct 15, 2014
  
  89cc4d12
- refactored file download status. make image http download available for carbon... · cb4069f0
  iNPUTmice authored Oct 15, 2014
```
refactored file download status. make image http download available for carbon copied (sent) messages as well
```
  cb4069f0
- Merge pull request #551 from emdete/p4 · 4c9ac613
  Daniel Gultsch authored Oct 15, 2014
```
beautify render script to be easier to diff/patch
```
  4c9ac613
- beautify render script to be easier to diff/patch · e08b49f6
  M. Dietrich authored Oct 15, 2014
  
  e08b49f6
- Merge pull request #547 from emdete/p0 · 1927a3d9
  Daniel Gultsch authored Oct 15, 2014
```
remove warning about <> cast
```
  1927a3d9
- remove warning about <> cast · f021ee85
  M. Dietrich authored Oct 08, 2014
  
  f021ee85
- Merge branch 'development' of github.com:siacs/Conversations into development · 299a5074
  iNPUTmice authored Oct 15, 2014
  
  299a5074