Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #554 from SamWhited/tls | Daniel Gultsch | 2014-10-20 | 3 | -10/+48 |
|\ | | | | | Enable TLSv1.1 and 1.2 and add option to enable/disable SSLv3 | ||||
| * | Make legacy SSL option default to false | Sam Whited | 2014-10-19 | 2 | -2/+2 |
| | | |||||
| * | Add "Enable legacy SSL" preference | Sam Whited | 2014-10-19 | 3 | -14/+43 |
| | | |||||
| * | Remove support for legacy SSL | Sam Whited | 2014-10-18 | 1 | -1/+9 |
| | | |||||
| * | Enable all supported protocols including TLSv1.1 and 1.2 | Sam Whited | 2014-10-16 | 1 | -0/+1 |
| | | |||||
* | | mtm support for image downloader | iNPUTmice | 2014-10-19 | 7 | -16/+59 |
| | | |||||
* | | use new 'api' to add messages to a conversation | iNPUTmice | 2014-10-19 | 1 | -3/+3 |
| | | |||||
* | | force tls for registrations as well | iNPUTmice | 2014-10-19 | 1 | -2/+5 |
| | | |||||
* | | got rid of copyonwrite array list for messages | iNPUTmice | 2014-10-19 | 4 | -20/+26 |
| | | |||||
* | | force tls | iNPUTmice | 2014-10-19 | 1 | -3/+5 |
| | | |||||
* | | Merge branch 'lactide-srv_fix' into development | iNPUTmice | 2014-10-19 | 1 | -4/+17 |
|\ \ | |||||
| * | | Merge branch 'srv_fix' of https://github.com/lactide/Conversations into ↵ | iNPUTmice | 2014-10-19 | 1 | -4/+17 |
|/| | | | | | | | | | | | lactide-srv_fix | ||||
| * | | try all srv responses if necessary | Frank Zschockelt | 2014-10-16 | 1 | -4/+17 |
| | | | |||||
* | | | fixed typo in french translation | iNPUTmice | 2014-10-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #555 from SamWhited/build-fixes | Daniel Gultsch | 2014-10-19 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Fix problem when merging manifests during a Gradle build | ||||
| * | | | Fix problem when merging manifests | Sam Whited | 2014-10-16 | 1 | -0/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #566 from BenoitBouvarel/patch-1 | Daniel Gultsch | 2014-10-19 | 1 | -2/+63 |
|\ \ \ | | | | | | | | | Update french strings.xml | ||||
| * | | | Update strings.xml | Benoit Bouvarel | 2014-10-18 | 1 | -2/+63 |
| | | | | | | | | | | | | French translation update | ||||
* | | | | Merge pull request #565 from the-solipsist/patch-2 | Daniel Gultsch | 2014-10-19 | 1 | -7/+7 |
|\ \ \ \ | |/ / / |/| | | | Update README.md | ||||
| * | | | Update README.md | the-solipsist | 2014-10-18 | 1 | -5/+5 |
| | | | | |||||
| * | | | Update README.md | the-solipsist | 2014-10-17 | 1 | -2/+2 |
|/ / / | | | | | | | Changed "little" to the grammatically correct "few", and corrected the spelling of "permissions". | ||||
* | | | do not attempt to download images when not connected | iNPUTmice | 2014-10-17 | 8 | -45/+60 |
| | | | |||||
* | | | made grace period on a per account basis | iNPUTmice | 2014-10-17 | 6 | -37/+30 |
| |/ |/| | |||||
* | | additonal safty net for disabling notifications | iNPUTmice | 2014-10-16 | 1 | -0/+1 |
| | | |||||
* | | simplified determination whether otr needs starting in a session | iNPUTmice | 2014-10-16 | 1 | -7/+2 |
| | | |||||
* | | log ending otr sessions on disconnect | iNPUTmice | 2014-10-16 | 2 | -3/+10 |
| | | |||||
* | | forground/background logging without csi | iNPUTmice | 2014-10-16 | 1 | -4/+2 |
| | | |||||
* | | make image download message to type=image only after completion | iNPUTmice | 2014-10-16 | 1 | -3/+2 |
|/ | |||||
* | added file observer to get notified when files are deleted: fixes #396 | iNPUTmice | 2014-10-16 | 2 | -3/+32 |
| | |||||
* | detect deleted files on start up. got rid of lagecy image provider for ↵ | iNPUTmice | 2014-10-15 | 12 | -197/+67 |
| | | | | performance reasons. NOTE: this will prevent you to access images older than version 0.6 | ||||
* | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-10-15 | 1 | -2/+12 |
|\ | |||||
| * | Merge pull request #551 from emdete/p4 | Daniel Gultsch | 2014-10-15 | 1 | -2/+12 |
| |\ | | | | | | | beautify render script to be easier to diff/patch | ||||
| | * | beautify render script to be easier to diff/patch | M. Dietrich | 2014-10-15 | 1 | -2/+12 |
| | | | |||||
* | | | refactored file download status. make image http download available for ↵ | iNPUTmice | 2014-10-15 | 24 | -210/+273 |
|/ / | | | | | | | carbon copied (sent) messages as well | ||||
* | | Merge pull request #547 from emdete/p0 | Daniel Gultsch | 2014-10-15 | 1 | -4/+4 |
|\ \ | | | | | | | remove warning about <> cast | ||||
| * | | remove warning about <> cast | M. Dietrich | 2014-10-15 | 1 | -4/+4 |
| |/ | |||||
* | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-10-15 | 1 | -2/+2 |
|\| | |||||
| * | Merge pull request #506 from SamWhited/string_fixes | Daniel Gultsch | 2014-10-15 | 1 | -2/+2 |
| |\ | | | | | | | Summary string typo fix | ||||
| | * | Remove full stop in description for consistency | Sam Whited | 2014-09-29 | 1 | -1/+1 |
| | | | |||||
| | * | Fix typos in string resource | Sam Whited | 2014-09-29 | 1 | -2/+2 |
| | | | |||||
* | | | synchronization for listeners | iNPUTmice | 2014-10-15 | 1 | -43/+60 |
| | | | |||||
* | | | synchronization for notification | iNPUTmice | 2014-10-15 | 1 | -11/+17 |
| | | | |||||
* | | | removed unecessary update | iNPUTmice | 2014-10-15 | 1 | -1/+0 |
|/ / | |||||
* | | changed pgp decoding mechanism | iNPUTmice | 2014-10-15 | 3 | -36/+47 |
| | | |||||
* | | don't show invalid file size | iNPUTmice | 2014-10-14 | 1 | -1/+4 |
| | | |||||
* | | recreate http connection after restart. fixes stale download button. better ↵ | iNPUTmice | 2014-10-14 | 4 | -26/+95 |
| | | | | | | | | failing | ||||
* | | catch can't open database exception | iNPUTmice | 2014-10-14 | 1 | -4/+9 |
| | | |||||
* | | read image bounds on downloaded image | iNPUTmice | 2014-10-14 | 6 | -31/+104 |
| | | |||||
* | | possible work around for notification bug | iNPUTmice | 2014-10-14 | 1 | -0/+17 |
| | | |||||
* | | fixed rare npe | iNPUTmice | 2014-10-14 | 1 | -2/+6 |
| | |