| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #588 from betheg/remove_unused_cast | Daniel Gultsch | 2014-10-26 | 10 | -32/+25 |
| |\ | | | | | remove some unused cast | ||||
| | * | remove some unused cast | Michael | 2014-10-26 | 10 | -32/+25 |
| | | | |||||
| * | | Merge pull request #587 from betheg/fix_possible_fallthrough | Daniel Gultsch | 2014-10-26 | 2 | -0/+2 |
| |\ \ | |/ |/| | fix possible fallthrough. | ||||
| | * | fix possible fallthrough. | Michael | 2014-10-26 | 2 | -0/+2 |
| |/ | |||||
| * | Merge pull request #586 from SamWhited/issue585 | Daniel Gultsch | 2014-10-26 | 1 | -2/+2 |
| |\ | | | | | Use consistent numbering | ||||
| | * | Use consistent numbering | Sam Whited | 2014-10-26 | 1 | -2/+2 |
| |/ | | | | Fixes #585 | ||||
| * | don't merge downloadable messages | iNPUTmice | 2014-10-24 | 1 | -1/+3 |
| | | |||||
| * | added message option to download images | iNPUTmice | 2014-10-24 | 3 | -3/+18 |
| | | |||||
| * | Merge pull request #582 from kruks23/translation7 | Daniel Gultsch | 2014-10-24 | 1 | -2/+11 |
| |\ | | | | | Update Spanish Translations | ||||
| | * | Update Spanish Translations | kruks23 | 2014-10-24 | 1 | -2/+11 |
| | | | |||||
| * | | also show some text in new image notification | iNPUTmice | 2014-10-24 | 1 | -73/+122 |
| |/ | |||||
| * | picture notification and some drive by bug fixes | iNPUTmice | 2014-10-24 | 4 | -33/+40 |
| | | |||||
| * | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-10-24 | 1 | -0/+7 |
| |\ | |||||
| | * | Merge pull request #581 from kruks23/translation7 | Daniel Gultsch | 2014-10-23 | 1 | -0/+7 |
| | |\ | | | | | | | Update Spanish Translations | ||||
| | | * | Update Spanish Translations | kruks23 | 2014-10-23 | 1 | -0/+7 |
| | | | | |||||
| * | | | notify only after image has been received over http. introduced mini grace ↵ | iNPUTmice | 2014-10-24 | 6 | -33/+64 |
| |/ / | | | | | | | for catching up with SM or offline messages | ||||
| * / | context menu for messages. allow to resend single messages | iNPUTmice | 2014-10-23 | 11 | -39/+189 |
| |/ | |||||
| * | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-10-22 | 1 | -2/+18 |
| |\ | |||||
| | * | Merge pull request #577 from beriain/development | Daniel Gultsch | 2014-10-22 | 1 | -2/+18 |
| | |\ | | | | | | | Update strings.xml for 0.8 | ||||
| | | * | Update strings.xml | Aitor Beriain | 2014-10-22 | 1 | -2/+18 |
| | | | | |||||
| * | | | ability to download pgp encrypted files over http as well | iNPUTmice | 2014-10-22 | 2 | -5/+9 |
| |/ / | |||||
| * / | small bug fixes for the conversation activity | iNPUTmice | 2014-10-22 | 1 | -2/+9 |
| |/ | |||||
| * | made httpconnection accept aes encrypted files | iNPUTmice | 2014-10-22 | 5 | -16/+33 |
| | | |||||
| * | better aproach on thread saftey | iNPUTmice | 2014-10-22 | 1 | -13/+7 |
| | | |||||
| * | changed version to 0.8 alpha | iNPUTmice | 2014-10-22 | 1 | -3/+3 |
| | | |||||
| * | added hostname verifier to httpconnection | iNPUTmice | 2014-10-22 | 2 | -11/+32 |
| | | |||||
| * | made iterating over hashmap in notification service thread safe | iNPUTmice | 2014-10-21 | 1 | -1/+8 |
| | | |||||
| * | throw exception when no servers are left to try | iNPUTmice | 2014-10-21 | 1 | -0/+6 |
| | | |||||
| * | fixed #564 | iNPUTmice | 2014-10-21 | 3 | -6/+6 |
| | | |||||
| * | update ui when new avatar was found | iNPUTmice | 2014-10-21 | 2 | -0/+8 |
| | | |||||
| * | proper avatar caching | iNPUTmice | 2014-10-21 | 15 | -164/+223 |
| | | |||||
| * | refactored avatar generation. first step | iNPUTmice | 2014-10-20 | 25 | -368/+405 |
| | | |||||
| * | keep reference to previous and next message in message | iNPUTmice | 2014-10-20 | 3 | -13/+28 |
| | | |||||
| * | Merge pull request #569 from kriztan/patch-1 | Daniel Gultsch | 2014-10-20 | 1 | -0/+1 |
| |\ | | | | | Set default preference ... | ||||
| | * | Set default preference ... | kriztan | 2014-10-19 | 1 | -1/+2 |
| | | | | | | | ... for MUC notifications to true | ||||
| * | | Merge pull request #570 from SamWhited/typo-fixes | Daniel Gultsch | 2014-10-20 | 2 | -140/+187 |
| |\ \ | | | | | | | Minor typo fixes, and big changes to README | ||||
| | * | | Went a bit wild on the README... | Sam Whited | 2014-10-19 | 1 | -137/+184 |
| | | | | |||||
| | * | | A few typo fixes in the README | Sam Whited | 2014-10-19 | 1 | -10/+10 |
| | | | | |||||
| | * | | Fixed some strange wording in a string | Sam Whited | 2014-10-19 | 1 | -1/+1 |
| |/ / | | | | | | | Still doesn't sound right to me though... | ||||
| * | | 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 |
| |\ \ \ | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |