aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #43 from siacs/masterChristian S.2015-10-031-14/+16
|\
| * don't put conference joins into pending on initial bindDaniel Gultsch2015-10-011-11/+14
| * reset muc options immediately befor joinDaniel Gultsch2015-10-011-3/+2
* | Merge branch 'siacs-master' into developmentChristian S2015-10-0110-37/+128
|\ \
| * | copy commitsChristian S2015-10-0110-37/+128
|/| | | |/
| * version bump and changelogDaniel Gultsch2015-09-302-2/+7
| * request stanza count after every ibb data stanza to not fill our own stanza q...Daniel Gultsch2015-09-302-6/+9
| * only invoke MTM in interactive mode after direct user inputDaniel Gultsch2015-09-292-11/+26
| * rotate thumbnails. fixes #1438Daniel Gultsch2015-09-291-6/+15
| * fixed NPE when executing rename callback in mucDaniel Gultsch2015-09-281-1/+3
| * do tab completion only if neither ctrl nor alt are being pressedDaniel Gultsch2015-09-281-4/+4
| * catch rare activity not found exception when opening downloaded filesDaniel Gultsch2015-09-271-4/+9
| * allow tab completion in conferencesDaniel Gultsch2015-09-272-4/+59
* | changed theme of appupdaterChristian S2015-09-271-1/+1
* | updated to version 1.6.12 beta and changelogChristian S2015-09-263-8/+8
* | modified read indicator a bitChristian S2015-09-261-4/+4
* | Merge branch 'siacs-master' into developmentChristian S2015-09-2615-11/+224
|\ \
| * | copy commitsChristian S2015-09-2615-11/+224
|/| | | |/
| * use Conversations 1.x.y as user agent string in http upload and downloadDaniel Gultsch2015-09-233-3/+6
| * swapped icons for foreground servicesDaniel Gultsch2015-09-227-4/+3
| * Merge pull request #1426 from fiaxh/export_logsDaniel Gultsch2015-09-226-0/+216
| |\
| | * Export logs to SD card preferencefiaxh2015-09-215-0/+178
| | * Iterator to go through all messages of a conversationfiaxh2015-09-201-0/+38
* | | added blue tick as read indicatorChristian S2015-09-2611-79/+83
* | | modified readme for own forkChristian S.2015-09-221-162/+32
* | | Version 1.6.11Christian S2015-09-212-3/+6
* | | corrected importsChristian S2015-09-211-3/+4
* | | 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