Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update arrays.xml | Aitor Beriain | 2014-09-18 | 1 | -1/+15 |
| | |||||
* | Merge branch 'development'0.7.1 | 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. | ||||
| * | | fix: warning: string 'publish_avatar' has no default translation. | Michael | 2014-08-30 | 9 | -17/+13 |
| |/ | | | | | | | also altered the types of resources from array to string-array in some res-files. | ||||
* / | experimental message merging | iNPUTmice | 2014-08-31 | 1 | -0/+5 |
|/ | |||||
* | more swedish translations | iNPUTmice | 2014-08-29 | 1 | -0/+3 |
| | |||||
* | fixed #389 | iNPUTmice | 2014-08-29 | 4 | -4/+4 |
| | |||||
* | Fix some typos in the German translation. | Michael Kuhn | 2014-08-28 | 1 | -19/+19 |
| | |||||
* | fixed spelling thanks @betheg | iNPUTmice | 2014-08-28 | 2 | -43/+39 |
| | |||||
* | formating in strings file | iNPUTmice | 2014-08-28 | 1 | -3/+3 |
| | |||||
* | Merge branch 'development' of https://github.com/beriain/Conversations into ↵ | iNPUTmice | 2014-08-28 | 1 | -12/+20 |
|\ | | | | | | | | | | | | | development Conflicts: res/values-eu/strings.xml | ||||
| * | Update strings.xml | Aitor Beriain | 2014-08-27 | 1 | -20/+20 |
| | | |||||
* | | translated missing string in settings | iNPUTmice | 2014-08-27 | 4 | -42/+33 |
| | | |||||
* | | added swedish translations by Anders Sandblad @andersruneson | iNPUTmice | 2014-08-27 | 1 | -1/+24 |
| | | |||||
* | | added missing string to german translation | iNPUTmice | 2014-08-26 | 1 | -0/+1 |
| | | |||||
* | | Updated to 0.6.1 | Ilia | 2014-08-26 | 1 | -23/+59 |
| | | | | | | | | 1. Different bug fixed. 2. Added new __<string name="general">Общие</string>__, guys you must add this to your _Conversation_ code, because now, if you go to settings, you can't change the label General - it's hard-coded for all languages. | ||||
* | | removed deprecated strings from translations | iNPUTmice | 2014-08-26 | 6 | -49/+1 |
| | | |||||
* | | Merge pull request #376 from wapolinar/development | Daniel Gultsch | 2014-08-25 | 1 | -1/+1 |
|\ \ | | | | | | | Update strings.xml | ||||
| * | | Update strings.xml | wapolinar | 2014-08-25 | 1 | -1/+1 |
| | | | | | | | | | Typo in a key for the German translation. | ||||
* | | | Update Spanish Translations | kruks23 | 2014-08-25 | 1 | -11/+6 |
|/ / | |||||
* | | Merge branch 'development' of github.com:siacs/Conversations into development | Daniel Gultsch | 2014-08-24 | 1 | -11/+12 |
|\ \ | |||||
| * | | Update strings.xml | kriztan | 2014-08-24 | 1 | -11/+12 |
| | | |