Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-09-22 | 1 | -0/+260 | |
|\ | ||||||
| * | Merge pull request #479 from AizazAZ/master | Daniel Gultsch | 2014-09-22 | 1 | -0/+260 | |
| |\ | | | | | | | Added Chinese (Simplified) Translation | |||||
| | * | Added Chinese (Simplified) Translation | AZ | 2014-09-22 | 1 | -0/+260 | |
| | | | ||||||
* | | | fixed #452 | iNPUTmice | 2014-09-22 | 2 | -1/+8 | |
|/ / | ||||||
* | | changed some preference descriptions | iNPUTmice | 2014-09-21 | 2 | -5/+5 | |
| | | ||||||
* | | changed security indicator and changed opacity of received tick to match the ↵ | iNPUTmice | 2014-09-20 | 6 | -14/+18 | |
| | | | | | | | | text | |||||
* | | indicates received messages with a tick. | Michael | 2014-09-20 | 8 | -3/+26 | |
| | | ||||||
* | | Merge pull request #469 from svetlemodry/development | Daniel Gultsch | 2014-09-19 | 2 | -18/+18 | |
|\ \ | | | | | | | Czech Conversations strings update | |||||
| * | | Czech strings.xml file update | Jaroslav Lichtblau | 2014-09-19 | 1 | -17/+17 | |
| | | | | | | | | | typo fixes, app name unified and some more changes for better string understanding | |||||
| * | | improvement fix | Jaroslav Lichtblau | 2014-09-19 | 1 | -1/+1 | |
| | | | | | | | | | better to have all in Czech, even the app name | |||||
* | | | fixed compile errors in italian translation | iNPUTmice | 2014-09-19 | 2 | -14/+14 | |
|/ / | ||||||
* | | Merge pull request #453 from Elinvention/development | Daniel Gultsch | 2014-09-19 | 2 | -0/+299 | |
|\ \ | | | | | | | Created Italian translation | |||||
| * | | Created Italian translation | Elia Argentieri | 2014-09-14 | 2 | -0/+299 | |
| |/ | ||||||
* | | Merge pull request #467 from qooob/development | Daniel Gultsch | 2014-09-19 | 2 | -43/+69 | |
|\ \ | | | | | | | Localization update to 0.7.1 | |||||
| * | | Updated localization | Ilia Rostovtsev | 2014-09-19 | 1 | -40/+66 | |
| | | | | | | | | | Localization update in compliance with Conversations 0.7.1 | |||||
| * | | Typoes | Ilia Rostovtsev | 2014-09-19 | 1 | -3/+3 | |
| |/ | | | | | Fixing typos | |||||
* | | Merge pull request #465 from beriain/development | Daniel Gultsch | 2014-09-19 | 2 | -4/+43 | |
|\ \ | | | | | | | Update basque translation | |||||
| * | | Update strings.xml | Aitor Beriain | 2014-09-18 | 1 | -3/+28 | |
| | | | ||||||
| * | | Update arrays.xml | Aitor Beriain | 2014-09-18 | 1 | -1/+15 | |
| |/ | ||||||
* / | Add missing German translations | Holger Weiß | 2014-09-19 | 1 | -0/+24 | |
|/ | ||||||
* | Merge branch 'development' | iNPUTmice | 2014-09-12 | 81 | -553/+663 | |
|\ | ||||||
| * | updated swedish translations. thank you Anders Sandblad | iNPUTmice | 2014-09-12 | 1 | -6/+30 | |
| | | ||||||
| * | more formating | iNPUTmice | 2014-09-11 | 4 | -63/+64 | |
| | | ||||||
| * | added missing strings back. + formating | iNPUTmice | 2014-09-11 | 59 | -489/+565 | |
| | | ||||||
| * | match color in contact details to the colors in the send button. also ↵ | iNPUTmice | 2014-09-11 | 1 | -1/+3 | |
| | | | | | | | | migrated some other colors from hard coding to using resources | |||||
| * | IT'S CHRISTMAS ALREADY! | iNPUTmice | 2014-09-10 | 21 | -1/+8 | |
| | | ||||||
* | | Merge branch 'master' of github.com:siacs/Conversations | iNPUTmice | 2014-09-12 | 2 | -0/+299 | |
|\ \ | |/ |/| | ||||||
| * | Created Czech strings.xml translation file | Jaroslav Lichtblau | 2014-09-12 | 1 | -0/+260 | |
| | | ||||||
| * | czech arrays.xml file created | Jaroslav Lichtblau | 2014-09-11 | 1 | -0/+39 | |
| | | ||||||
* | | Update Spanish Translations | kruks23 | 2014-09-09 | 2 | -0/+38 | |
|/ | ||||||
* | setting to increase font size. fixed #420 | iNPUTmice | 2014-09-08 | 19 | -77/+103 | |
| | ||||||
* | hide encryption settings under 'expert options' | iNPUTmice | 2014-09-08 | 2 | -58/+65 | |
| | ||||||
* | introduced downloadable interface. reverted some of the changes made to OTR | iNPUTmice | 2014-09-08 | 1 | -1/+0 | |
| | ||||||
* | fixed sending offline pgp messages | iNPUTmice | 2014-09-08 | 1 | -1/+1 | |
| | ||||||
* | settings to force encryption and setting for not saving messages to disk. ↵ | iNPUTmice | 2014-09-08 | 2 | -0/+18 | |
| | | | | fixed #353 | |||||
* | warn on missing presence subscription | iNPUTmice | 2014-09-08 | 1 | -0/+2 | |
| | ||||||
* | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-09-07 | 12 | -121/+0 | |
|\ | ||||||
| * | deleted some unused string-resources and imports, also deleted ↵ | Michael | 2014-09-07 | 12 | -121/+0 | |
| | | | | | | | | edit_account_dialog.xml. | |||||
* | | fixed #321 - delete otr fingerprints | iNPUTmice | 2014-09-07 | 6 | -14/+34 | |
|/ | ||||||
* | made otr a little bit more solid when there is no presence subscription | iNPUTmice | 2014-09-06 | 1 | -0/+1 | |
| | ||||||
* | warn user if no presence subscription exists | iNPUTmice | 2014-09-05 | 1 | -0/+3 | |
| | ||||||
* | added support for password protected muc - fixed #203 and fixed #395 | iNPUTmice | 2014-09-03 | 1 | -0/+2 | |
| | ||||||
* | added ability to disable notifications for specific conversations - fixed #322 | iNPUTmice | 2014-09-03 | 3 | -0/+23 | |
| | ||||||
* | Merge branch 'unused_resources' of https://github.com/betheg/Conversations ↵ | iNPUTmice | 2014-09-02 | 11 | -496/+0 | |
|\ | | | | | | | into betheg-unused_resources | |||||
| * | removed unused string resources. | Michael | 2014-09-01 | 11 | -496/+0 | |
| | | ||||||
* | | fixed #410 by removing that config option | iNPUTmice | 2014-09-02 | 1 | -8/+0 | |
| | | ||||||
* | | refactored share with activity | iNPUTmice | 2014-09-02 | 2 | -46/+20 | |
|/ | ||||||
* | Merge pull request #401 from jelmer/dutch-updates | Daniel Gultsch | 2014-08-31 | 1 | -0/+33 | |
|\ | | | | | Update Dutch translations. | |||||
| * | Update Dutch translations. | Jelmer Vernooij | 2014-08-31 | 1 | -0/+33 | |
| | | ||||||
* | | Merge pull request #398 from betheg/fix_res | Daniel Gultsch | 2014-08-31 | 9 | -17/+13 | |
|\ \ | | | | | | | fix: warning: string 'publish_avatar' has no default translation. |