Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |
| | | | ||||||
* | | | jump right into edit account if now accounts are configured | Daniel Gultsch | 2014-08-23 | 1 | -1/+1 | |
| | | | ||||||
* | | | changed workflow on inital avatar publication | Daniel Gultsch | 2014-08-23 | 1 | -0/+1 | |
|/ / | ||||||
* | | removed server compat value in favor of a (small xep list) | Daniel Gultsch | 2014-08-23 | 2 | -136/+164 | |
| | | ||||||
* | | Merge pull request #373 from kruks23/translation1 | Daniel Gultsch | 2014-08-23 | 1 | -3/+10 | |
|\ \ | | | | | | | Update Spanish Translations | |||||
| * | | Update Spanish Translations | kruks23 | 2014-08-21 | 1 | -3/+10 | |
| | | | ||||||
* | | | tiny redesign for private muc messages | iNPUTmice | 2014-08-22 | 1 | -2/+2 | |
|/ / | ||||||
* | | added missing string resource again | iNPUTmice | 2014-08-20 | 1 | -0/+2 | |
| | | ||||||
* | | revised manage account activity. removed contexual action mode | iNPUTmice | 2014-08-20 | 4 | -65/+50 | |
| | | ||||||
* | | better error display and additional infos (stats) for the edit account activity | iNPUTmice | 2014-08-19 | 3 | -166/+74 | |
| | | ||||||
* | | Merge pull request #365 from beriain/development | Daniel Gultsch | 2014-08-19 | 1 | -3/+19 | |
|\| | | | | | Update strings.xml | |||||
| * | Update strings.xml | Aitor Beriain | 2014-08-18 | 1 | -3/+19 | |
| | | ||||||
* | | Update strings.xml | kriztan | 2014-08-17 | 1 | -0/+1 | |
| | | ||||||
* | | moved add/edit account from dialog into seperate activity | iNPUTmice | 2014-08-15 | 2 | -1/+109 | |
| | | ||||||
* | | Update strings.xml | kriztan | 2014-08-15 | 1 | -1/+1 | |
| | | | | | | corrected missspelling | |||||
* | | Update strings.xml | kriztan | 2014-08-15 | 1 | -17/+28 | |
| | | | | | | Added German Translations and corrected misspellings. | |||||
* | | Add Hebrew translation. | GreenLunar | 2014-08-14 | 1 | -0/+284 | |
| | | ||||||
* | | Add Hebrew translation. | GreenLunar | 2014-08-14 | 1 | -0/+22 | |
| | | ||||||
* | | Update Spanish Translations + publish_avatar button and menu conflict | kruks23 | 2014-08-12 | 3 | -2/+10 | |
| | | ||||||
* | | added limited private muc chat feature (messages are now properly marked) - ↵ | iNPUTmice | 2014-08-10 | 1 | -0/+3 | |
| | | | | | | | | long press on user icon will sent private messages. fixed #259 | |||||
* | | changed all displays of avatars to be center crop instead of fitXY | iNPUTmice | 2014-08-09 | 5 | -4/+6 | |
| | |