aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* corrected german stringsChristian S2015-10-221-2/+2
* Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-201-1/+1
|\
| * open manage account + certificate chooser when cbe mode is enabledDaniel Gultsch2015-10-201-0/+1
* | move received tick setttings from expert options into ui optionsChristian S2015-10-171-5/+5
* | copy commitsChristian S2015-10-171-0/+2
|\|
| * improved error reporting in trust keys activityDaniel Gultsch2015-10-171-0/+2
* | corrected strings-deChristian S2015-10-161-11/+1
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-1631-478/+999
|\|
| * pulled translations from transifexDaniel Gultsch2015-10-1426-26/+61
| * changed some source stringsDaniel Gultsch2015-10-141-2/+2
| * pulled translations from transifexDaniel Gultsch2015-10-137-453/+913
| * add config variable to enable x509 verificationDaniel Gultsch2015-10-122-3/+3
| * add menu item in account details to renew certificateDaniel Gultsch2015-10-112-1/+11
| * make add account from key visibleDaniel Gultsch2015-10-111-1/+1
| * Captcha support.Armin Novak2015-10-111-0/+3
| * Fixed a typo in string.xmlSafwat Halaby2015-10-101-1/+1
| * initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-092-0/+9
* | updated german stringsChristian S2015-10-101-2/+2
* | update missing stringsChristian S2015-10-102-0/+10
* | updated AppUpdater a bitChristian S2015-10-101-9/+5
* | copy commitsChristian S2015-10-102-2/+18
|\|
| * introduced expert options to set status to away and xa if screen is off or if...Daniel Gultsch2015-10-082-0/+17
* | Merge branch 'Update_Startup' into developmentChristian S2015-10-072-2/+2
|\ \
| * | update UpdaterChristian S2015-10-061-1/+0
| * | Update strings.xmlChristian S.2015-10-061-1/+1
| * | Update strings.xmlChristian S.2015-10-061-1/+1
| * | updated strings for updaterChristian S.2015-10-061-0/+1
| * | updated German strings for updaterChristian S.2015-10-061-1/+1
* | | Merge branch 'siacs/master' into developmentChristian S2015-10-077-132/+181
|\ \ \ | |/ / |/| / | |/
| * Show whether MAM is supported in MUCssaqura2015-10-061-1/+30
| * pulled translations from transifexDaniel Gultsch2015-10-056-132/+153
* | changed message ticksChristian S2015-10-036-5/+4
* | modified read indicator a bitChristian S2015-09-261-4/+4
* | copy commitsChristian S2015-09-267-0/+7
|\|
| * swapped icons for foreground servicesDaniel Gultsch2015-09-225-0/+0
| * Export logs to SD card preferencefiaxh2015-09-212-0/+7
* | added blue tick as read indicatorChristian S2015-09-266-0/+9
* | add german string for 'checking for updates'Christian S.2015-09-211-0/+1
* | add string for 'checking for updates'Christian S.2015-09-211-6/+7
* | copy commitsChristian S2015-09-187-3/+30
|\|
| * pulled translations from transifexDaniel Gultsch2015-09-157-2/+30
* | Merge branch 'siacs/master' into developmentChristian S2015-09-1521-21/+133
|\|
| * Merge pull request #1409 from sespivak/masterDaniel Gultsch2015-09-141-0/+14
| |\
| | * some string localization for russian languageSergey Spivak2015-09-141-0/+14
| * | pulled translations from transifexDaniel Gultsch2015-09-1420-20/+0
| |/
| * added possibiltiy to set conferences as moderated (only visible in advanced m...Daniel Gultsch2015-09-131-1/+3
| * pulled new translations from transifexDaniel Gultsch2015-09-137-0/+116
* | Version 1.6.9Christian S2015-09-121-7/+8
|\|
| * indicate broken pep in server infoDaniel Gultsch2015-09-061-0/+1
* | added some toasts to UpdaterActivityChristian S2015-09-062-0/+4