aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge pull request #845 from SamWhited/materialDaniel Gultsch2015-01-072-0/+15
| |\ \
| | * | Add materials themeSam Whited2015-01-062-0/+15
| * | | basic affiliation changes in mucDaniel Gultsch2015-01-072-1/+28
| | |/ | |/|
| * | Merge pull request #846 from kruks23/translation4Daniel Gultsch2015-01-071-0/+5
| |\ \ | | |/ | |/|
| | * Update affiliation in MUC details and advance modekruks232015-01-071-0/+5
| * | Czech translation for - show affiliation instead of role in MucDetailsJaroslav Lichtblau2015-01-061-0/+5
| * | Update strings.xmlBenoit Bouvarel2015-01-061-1/+1
| * | Update strings.xmlBenoit Bouvarel2015-01-051-1/+86
| * | corrected German spellingsChristian Schneppe2015-01-051-16/+16
| * | Show affiliation instead of role in MucDetails and offer 'advanced mode' to d...Daniel Gultsch2015-01-052-0/+12
| * | Updated languages for higher auto accept file sizes and changed labeling to M...Christian Schneppe2015-01-0514-416/+437
| * | added higher auto accept file sizesDaniel Gultsch2015-01-041-33/+37
| * | Czech translation updateJaroslav Lichtblau2015-01-041-1/+39
| * | Merge pull request #829 from kriztan/patch-1Daniel Gultsch2015-01-041-1/+1
| |\ \ | | |/ | |/|
| | * corrected German 'private_message_to'kriztan2015-01-041-1/+1
| * | Update spanish translationssergio2015-01-041-1/+15
| |/
* | - 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
| |\