aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/beriain/Conversations into ↵iNPUTmice2014-08-281-12/+20
|\ | | | | | | | | | | | | development Conflicts: res/values-eu/strings.xml
| * Update strings.xmlAitor Beriain2014-08-271-20/+20
| |
* | translated missing string in settingsiNPUTmice2014-08-275-44/+39
| |
* | added swedish translations by Anders Sandblad @andersrunesoniNPUTmice2014-08-271-1/+24
| |
* | added missing string to german translationiNPUTmice2014-08-261-0/+1
| |
* | Merge pull request #385 from rostovtsev/developmentDaniel Gultsch2014-08-261-23/+59
|\ \ | | | | | | russian translation for 0.6
| * | Updated to 0.6.1Ilia2014-08-261-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.
* | Merge pull request #384 from wapolinar/typosDaniel Gultsch2014-08-261-11/+11
|\ \ | | | | | | Typos in readme.
| * | Typos in readme.Wolfgang Apolinarski2014-08-261-11/+11
|/ /
* | removed deprecated strings from translationsiNPUTmice2014-08-266-49/+1
| |
* | Merge pull request #376 from wapolinar/developmentDaniel Gultsch2014-08-251-1/+1
|\ \ | | | | | | Update strings.xml
| * | Update strings.xmlwapolinar2014-08-251-1/+1
| | | | | | | | | Typo in a key for the German translation.
* | | Merge pull request #377 from kruks23/translation2Daniel Gultsch2014-08-251-11/+6
|\ \ \ | | | | | | | | Update Spanish Translations
| * | | Update Spanish Translationskruks232014-08-251-11/+6
|/ / /
* / / fixing duplicate private muc messagesiNPUTmice2014-08-251-3/+10
|/ /
* | fixed message hintiNPUTmice2014-08-251-51/+61
| |
* | fixed faulty db creation on first installiNPUTmice2014-08-241-9/+12
| |
* | Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2014-08-241-11/+12
|\ \
| * \ Merge pull request #375 from kriztan/patch-2Daniel Gultsch2014-08-241-11/+12
| |\ \ | | | | | | | | Update german translations
| | * | Update strings.xmlkriztan2014-08-241-11/+12
| |/ /
* | | use otr encrypiton instead of plain when contact has exactly one online ↵Daniel Gultsch2014-08-241-0/+10
| | | | | | | | | | | | presence and an otr fingerprint
* | | jump right into edit account if now accounts are configuredDaniel Gultsch2014-08-233-10/+19
| | |
* | | changed workflow on inital avatar publicationDaniel Gultsch2014-08-233-11/+40
|/ /
* | experimental muc message deduplicationDaniel Gultsch2014-08-233-2/+25
| |
* | removed server compat value in favor of a (small xep list)Daniel Gultsch2014-08-234-177/+187
| |
* | Merge pull request #373 from kruks23/translation1Daniel Gultsch2014-08-231-3/+10
|\ \ | | | | | | Update Spanish Translations
| * | Update Spanish Translationskruks232014-08-211-3/+10
| | |
* | | fixed another npeiNPUTmice2014-08-221-7/+10
| | |
* | | tiny redesign for private muc messagesiNPUTmice2014-08-223-23/+31
|/ /
* | make avatars persisent / available even without internetiNPUTmice2014-08-216-19/+65
| |
* | save newly taken photos in DCIM diriNPUTmice2014-08-213-33/+42
| |
* | added roster versioning to calculation of server compatiNPUTmice2014-08-211-0/+5
| |
* | added PEP to readmeiNPUTmice2014-08-211-0/+1
| |
* | check if service is bound before adding conferences or contactsiNPUTmice2014-08-211-25/+30
| |
* | avoid race condition for otr key in jingleiNPUTmice2014-08-211-1/+1
| |
* | deregister listener in editaccountiNPUTmice2014-08-211-0/+8
| |
* | added missing string resource againiNPUTmice2014-08-201-0/+2
| |
* | revised manage account activity. removed contexual action modeiNPUTmice2014-08-206-237/+159
| |
* | fixed lint erroriNPUTmice2014-08-191-1/+0
| |
* | better error display and additional infos (stats) for the edit account activityiNPUTmice2014-08-1911-377/+314
| |
* | Merge pull request #365 from beriain/developmentDaniel Gultsch2014-08-191-3/+19
|\| | | | | Update strings.xml
| * Update strings.xmlAitor Beriain2014-08-181-3/+19
| |
* | Merge pull request #363 from kriztan/patch-1Daniel Gultsch2014-08-191-0/+1
|\ \ | | | | | | Update german translations
| * | Update strings.xmlkriztan2014-08-171-0/+1
|/ /
* | more error handling for avatar publicationiNPUTmice2014-08-162-1/+17
| |
* | some improvements for the edit account activityiNPUTmice2014-08-163-31/+25
| |
* | moved add/edit account from dialog into seperate activityiNPUTmice2014-08-1513-255/+521
| |
* | better handling of null streamsiNPUTmice2014-08-153-14/+22
| |
* | refactored Conversations Adapter into seperate classiNPUTmice2014-08-152-93/+114
| |
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-08-151-18/+29
|\ \