aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* - Avoiding accessing shared preferences to know if emoticons should be parsed...steckbrief2015-01-201-1/+11
* Setting added for parsing emoticons or notTristan Zur2015-01-113-0/+9
* Merge branch 'master' of ssh://git.fucktheforce.de/conversationslookshe2015-01-0327-397/+901
|\
| * Added and modified German translationskriztan2015-01-031-5/+11
| * record voice and attachment refactorDaniel Gultsch2015-01-032-1/+5
| * disable / enable all accountsDaniel Gultsch2015-01-032-11/+19
| * added missing layout fileDaniel Gultsch2015-01-031-0/+105
| * migrated change password into separate activityDaniel Gultsch2015-01-033-9/+8
| * some further otr improvementsDaniel Gultsch2015-01-023-6/+20
| * Added German translationskriztan2015-01-021-0/+7
| * fixed layout fileDaniel Gultsch2015-01-021-1/+1
| * improved OTR verification part oneDaniel Gultsch2015-01-022-188/+153
| * Make `app_name' string untranslatableSam Whited2014-12-2915-22/+8
| * fixed nl stringsDaniel Gultsch2014-12-301-25/+1
| * Merge pull request #812 from kriztan/patch-1Daniel Gultsch2014-12-301-0/+4
| |\
| | * Update german translationskriztan2014-12-271-0/+4
| * | Merge pull request #813 from plsng/translationDaniel Gultsch2014-12-302-114/+292
| |\ \
| | * | Update Dutch translationsNathan Follens2014-12-292-10/+10
| | * | Update Dutch translationsNathan Follens2014-12-272-113/+291
| | |/
| * / Update spanish translationssergio2014-12-271-3/+27
| |/
| * code cleanup for change password stuffDaniel Gultsch2014-12-252-2/+2
| * added callback to change account password to notify UI on success / failureDaniel Gultsch2014-12-251-0/+3
| * Add ability to change password on serverSam Whited2014-12-252-3/+11
| * Update german translationskriztan2014-12-251-0/+20
| * Add more server compatibility info.Sam Whited2014-12-233-4/+114
| * Add support for XEP-0191 (Blocking command)Sam Whited2014-12-224-0/+34
| * Merge pull request #794 from svetlemodry/developmentDaniel Gultsch2014-12-201-2/+2
| |\
| | * 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
| * 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 into...iNPUTmice2014-12-152-2/+29
| |\
| | * Add quiet hours featureSam Whited2014-12-142-2/+29
| * | Merge pull request #775 from kruks23/translation1Daniel Gultsch2014-12-151-33/+33
| |\ \
| | * | Update spanish translations.kruks232014-12-131-33/+33
| | |/
| * / fixed typo in italian translationdrizzt2014-12-151-1/+1
| |/
| * Update spanish translations.kruks232014-12-091-6/+6
* | added smilies from patch. remaining changes will follow laterlookshe2015-01-0318-0/+0
|/
* Update/improve German translationsHolger Weiß2014-12-021-2/+4
* Merge pull request #737 from kruks23/translation2Daniel Gultsch2014-12-021-9/+11
|\
| * Update spanish translationskruks232014-12-011-9/+11
* | Merge pull request #730 from svetlemodry/developmentDaniel Gultsch2014-12-021-23/+97
|\ \ | |/ |/|
| * pref_about_message string deletedJaroslav Lichtblau2014-12-011-24/+0
| * Updated Czech translation fileJaroslav Lichtblau2014-12-011-23/+121
* | 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
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 21:06:15 +0000