aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #794 from svetlemodry/developmentDaniel Gultsch2014-12-201-2/+2
|\ | | | | Czech image transfer string fix
| * Czech image transfer string fixJaroslav Lichtblau2014-12-191-2/+2
| |
* | Update spanish translationskruks232014-12-201-4/+12
|/
* Czech translation updatedJaroslav Lichtblau2014-12-181-0/+8
| | | | added missing strings
* Update german translationskriztan2014-12-181-0/+8
|
* made scroling smoother + bug fixes for history loadingiNPUTmice2014-12-171-0/+1
|
* smoothed out scrolling a bitiNPUTmice2014-12-171-0/+1
|
* Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations ↵iNPUTmice2014-12-152-2/+29
|\ | | | | | | into SamWhited-quiet-hours
| * Add quiet hours featureSam Whited2014-12-142-2/+29
| |
* | Merge pull request #775 from kruks23/translation1Daniel Gultsch2014-12-151-33/+33
|\ \ | | | | | | Update spanish translations.
| * | Update spanish translations.kruks232014-12-131-33/+33
| |/
* / fixed typo in italian translationdrizzt2014-12-151-1/+1
|/ | | s/gallaria/galleria/
* Update spanish translations.kruks232014-12-091-6/+6
|
* Update/improve German translationsHolger Weiß2014-12-021-2/+4
|
* Merge pull request #737 from kruks23/translation2Daniel Gultsch2014-12-021-9/+11
|\ | | | | Update spanish translations
| * Update spanish translationskruks232014-12-011-9/+11
| |
* | Merge pull request #730 from svetlemodry/developmentDaniel Gultsch2014-12-021-23/+97
|\ \ | |/ |/| Updated Czech translation file
| * pref_about_message string deletedJaroslav Lichtblau2014-12-011-24/+0
| |
| * Updated Czech translation fileJaroslav Lichtblau2014-12-011-23/+121
| | | | | | | | | | added missing strings fixing typos, improvements for better understanding
* | fixed italian translationiNPUTmice2014-12-011-5/+5
| |
* | Removed pref_about_message which is not translatableElinvention2014-11-301-24/+0
| |
* | Added missing italian translations with some minor fixes to existing onesElinvention2014-11-302-10/+113
|/
* Merge pull request #721 from SamWhited/warning_fixesDaniel Gultsch2014-11-293-3/+8
|\ | | | | Warning "fixes"
| * Accessibility: Add missing image descriptionsSam Whited2014-11-293-3/+8
| |
* | Update basque translationAitor Beriain2014-11-271-0/+6
|/
* Update german translationskriztan2014-11-261-1/+1
| | | modified translations a bit
* Merge pull request #714 from betheg/muc_bookmark_cdDaniel Gultsch2014-11-241-0/+10
|\ | | | | MUC: option to set/delete bookmark in conference details.
| * MUC: option to set/delete bookmark in conference details.Michael2014-11-231-0/+10
| |
* | Update german translationskriztan2014-11-231-0/+2
|/
* Update spanish translationskruks232014-11-221-2/+8
|
* verify contacts key only on initiating side of smpiNPUTmice2014-11-211-0/+2
|
* Update german translationskriztan2014-11-201-16/+20
|
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-201-0/+4
|
* Merge pull request #691 from kruks23/developmentDaniel Gultsch2014-11-191-5/+11
|\ | | | | Update spanish translation
| * Update spanish translationskruks232014-11-191-4/+4
| |
| * Update spanish translationskruks232014-11-181-2/+8
| |
* | Merge pull request #692 from kriztan/patch-3Daniel Gultsch2014-11-191-0/+41
|\ \ | | | | | | Update german translations
| * | Update german translationskriztan2014-11-191-0/+41
| |/
* / Update basque translationAitor Beriain2014-11-191-0/+56
|/
* put error notification into notification serviceiNPUTmice2014-11-184-0/+0
|
* show dynamic tags in contacts activity as welliNPUTmice2014-11-181-12/+7
|
* properly remove conversations context menuiNPUTmice2014-11-182-11/+7
|
* added rendered versions of new iconsiNPUTmice2014-11-188-0/+0
|
* context menu for conversations. fixed #630iNPUTmice2014-11-182-0/+12
|
* context menu for muc participants + refactor trueCounterpart to use Jid classiNPUTmice2014-11-171-1/+4
|
* synchronized around cache clear in avatar serviceiNPUTmice2014-11-171-0/+4
|
* Merge pull request #680 from ferdev1/patch-2Daniel Gultsch2014-11-171-2/+2
|\ | | | | Fix string 2
| * Update strings.xmlferdev12014-11-171-2/+2
| |
* | slightly modified logo / launcher iconiNPUTmice2014-11-178-0/+0
|/
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-171-1/+1
|\ | | | | | | development