aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* made app update time configurable in config.javaChristian S2015-09-212-2/+2
* 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
* disabled touch events on checking for updatesChristian S.2015-09-211-2/+15
* modified AppUpdaterChristian S2015-09-203-13/+51
* Merge branch 'siacs-master' into developmentChristian S2015-09-206-49/+53
|\
| * Version 1.6.10Christian S2015-09-206-49/+53
|/|
| * version bump to 1.6.10Daniel Gultsch2015-09-202-2/+7
| * let DnsHelper provide a fallback solutionDaniel Gultsch2015-09-192-43/+41
| * fixed content-type indication in http uploadDaniel Gultsch2015-09-191-1/+1
| * update build toolsDaniel Gultsch2015-09-192-2/+3
| * Merge pull request #1420 from betheg/fix_1419Daniel Gultsch2015-09-191-1/+0
| |\
| | * remove the from attribute from sendStartStream() fixes #1419Michael2015-09-191-1/+0
| |/
* | Start AppUpdater automaticallyChristian S2015-09-201-0/+4
* | show the update dialog and not the whole activityChristian S2015-09-202-10/+18
* | changed HTTP Upload namespace to legacy namespaceChristian S2015-09-181-1/+1
* | Merge branch 'siacs-master' into developmentChristian S2015-09-1820-89/+145
|\ \
| * | copy commitsChristian S2015-09-1820-89/+145
|/| | | |/
| * introduced Config variable to use legacy namespace for http uploadDaniel Gultsch2015-09-172-1/+5
| * be more careful when publishing device bundleDaniel Gultsch2015-09-171-0/+14
| * ignore spoofed stanzas in facebook chatDaniel Gultsch2015-09-171-1/+1
| * catch IndexOutOfBoundsException when swiping away conversationsDaniel Gultsch2015-09-171-1/+5
| * fixed rare NPE in DnsHelper. fixed spelling and added loggingDaniel Gultsch2015-09-171-5/+13
| * pulled translations from transifexDaniel Gultsch2015-09-157-2/+30
| * Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2015-09-151-0/+14
| |\
| * | added missing type='submit' to mam queriesDaniel Gultsch2015-09-156-20/+17
| * | work around a NPE caused by arace condition in the http uploadDaniel Gultsch2015-09-151-3/+6
* | | Merge branch 'siacs/master' into developmentChristian S2015-09-1527-40/+196
|\ \ \ | | |/ | |/|
| * | 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
| |/
| * changed http upload namespace to reflect the one in the XEPDaniel Gultsch2015-09-141-1/+1
| * added possibiltiy to set conferences as moderated (only visible in advanced m...Daniel Gultsch2015-09-135-16/+62
| * pulled new translations from transifexDaniel Gultsch2015-09-137-0/+116
| * added mp4 to well known extensions. fixes #1403Daniel Gultsch2015-09-121-1/+1
| * added referrer to playstore linksDaniel Gultsch2015-09-121-3/+3
* | Merge branch 'siacs-master' into developmentChristian S2015-09-1215-82/+227
|\ \
| * | Version 1.6.9Christian S2015-09-1215-82/+227
|/| | | |/
| * increment version codeDaniel Gultsch2015-09-101-1/+1
| * increased dns timeoutDaniel Gultsch2015-09-102-1/+2
| * version bump to 1.6.9 + changelogDaniel Gultsch2015-09-092-2/+5
| * added alt as possible modifier key. use mod+(0..9) to jump to a conversationDaniel Gultsch2015-09-092-26/+46
| * added rotation detection to up/down navigationDaniel Gultsch2015-09-071-4/+23
| * added some key bindingDaniel Gultsch2015-09-073-5/+87
| * catch npe in setupIme methodDaniel Gultsch2015-09-071-1/+3
| * version bump to 1.6.8 and changelogDaniel Gultsch2015-09-062-2/+7
| * indicate broken pep in server infoDaniel Gultsch2015-09-063-1/+12
| * Only show that have sessions in fingerprint listAndreas Straub2015-09-067-50/+58
| * Don't manually add keys to the storeAndreas Straub2015-09-061-2/+0
* | version 1.6.9-beta2Christian S2015-09-061-2/+2