aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #1461 from akallabeth/captcha_supportDaniel Gultsch2015-10-116-24/+238
|\ \
| * | Captcha support.Armin Novak2015-10-116-24/+238
* | | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2015-10-112-7/+5
|\| |
| * | Merge pull request #1482 from SafwatHalaby/readmeDaniel Gultsch2015-10-101-5/+3
| |\ \ | | |/ | |/|
| | * Added OMEMO to ReadmeSafwat Halaby2015-10-101-5/+3
| |/
| * Merge pull request #1480 from SafwatHalaby/patch-1Andreas Straub2015-10-101-1/+1
| |\
| | * Update build system in READMESafwat Halaby2015-10-101-1/+1
| |/
| * Merge pull request #1478 from SafwatHalaby/patch-1Daniel Gultsch2015-10-101-1/+1
| |\
| | * Fixed a typo in string.xmlSafwat Halaby2015-10-101-1/+1
| |/
* / prevent null pointer when trying to display device fingerprints of not existi...Daniel Gultsch2015-10-111-0/+3
|/
* initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-098-44/+156
* do not dismiss editAccountActivity when still trying to register new accountDaniel Gultsch2015-10-091-1/+3
* catch exception when unregistering receivers that have not been registered be...Daniel Gultsch2015-10-081-3/+11
* removed oob element from file messagesDaniel Gultsch2015-10-081-1/+0
* introduced expert options to set status to away and xa if screen is off or if...Daniel Gultsch2015-10-087-28/+122
* add xhtml image tag to unencrypted image urls. add oob tag to all files that ...Daniel Gultsch2015-10-071-2/+18
* do mam query after joinDaniel Gultsch2015-10-061-1/+3
* Use MAM for MUC initial history retrievalsaqura2015-10-062-28/+66
* Properly check for MUC MAM supportsaqura2015-10-061-6/+8
* Show whether MAM is supported in MUCssaqura2015-10-063-2/+47
* changed store path for filesDaniel Gultsch2015-10-061-20/+10
* clean up log exporting service. properly end service after exportingDaniel Gultsch2015-10-061-102/+106
* clear notification and activate grace period when receiving chat marker from ...Daniel Gultsch2015-10-061-1/+5
* pulled translations from transifexDaniel Gultsch2015-10-056-132/+153
* try to catch plattform bugs1.6.11Daniel Gultsch2015-10-021-1/+6
* increased version codeDaniel Gultsch2015-10-021-1/+1
* properly recycle bitmapsDaniel Gultsch2015-10-021-4/+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
* 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
* 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
* | version bump to 1.6.101.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
|/
* 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