aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-2025-162/+471
|\
| * resetting fetch status error when mutual subscription is reestablishedDaniel Gultsch2016-05-194-2/+37
| * sync around individual calls instead of synchronizing entire objectDaniel Gultsch2016-05-191-49/+79
| * show password dialog when account was magic createdDaniel Gultsch2016-05-194-0/+47
| * access disco over caching mechanism instead of querying dbDaniel Gultsch2016-05-191-1/+1
| * remove unwanted 'use previous encryption' lookupDaniel Gultsch2016-05-191-22/+1
| * also save form elements in disco storageDaniel Gultsch2016-05-194-6/+64
| * don't NPE on rare race condition while fetching MAMDaniel Gultsch2016-05-191-0/+9
| * synchronize around identity key generationDaniel Gultsch2016-05-191-7/+9
| * improved ordering of muc participantsDaniel Gultsch2016-05-173-9/+25
| * refactored muc item parsing to also parse muc status messagesDaniel Gultsch2016-05-175-27/+44
| * offer offline members to be invited againDaniel Gultsch2016-05-172-3/+17
| * change affiliation for in memory users that are currently not joined in a con...Daniel Gultsch2016-05-164-7/+18
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-1610-99/+186
| * cap exponential backoff at 300s (10 attempts)Daniel Gultsch2016-05-161-1/+1
| * cap messages after 256 lines in UIDaniel Gultsch2016-05-162-0/+2
* | Merge remote-tracking branch 'refs/remotes/origin/imageloader'Christian Schneppe2016-05-206-219/+174
|\ \
| * | changed colors to standard from @color and add border to imagesChristian Schneppe2016-05-204-11/+13
| * | use glide as image loader and add a simple video previewChristian Schneppe2016-05-203-231/+159
| * | try out some faster image loaderChristian Schneppe2016-05-172-4/+29
|/ /
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-165-25/+53
|\|
| * use the same typo in both saving disco and reading discoDaniel Gultsch2016-05-151-1/+2
| * escape HTML in OTR messages if other client is PidginDaniel Gultsch2016-05-152-4/+41
| * include name in locations received in MUCsDaniel Gultsch2016-05-152-8/+12
* | refactored preference screenChristian Schneppe2016-05-1648-170/+165
* | revert checkbox meaning from chrash reportChristian Schneppe2016-05-161-3/+3
* | use wakelock on retrieve filesizeChristian Schneppe2016-05-161-0/+3
* | make "is tiping..." in bold italicChristian Schneppe2016-05-162-0/+3
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-153-6/+7
|\|
| * log incoming iq requestsDaniel Gultsch2016-05-152-0/+6
| * send caps hash in muc joinDaniel Gultsch2016-05-151-6/+1
* | fixed crash on startupChristian Schneppe2016-05-151-6/+5
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-155-10/+15
|\|
| * version bump to 1.12.3 + changelogDaniel Gultsch2016-05-132-2/+8
| * don't show duplicate status message in contact detailsDaniel Gultsch2016-05-131-3/+3
| * only default to omemo when all our devices support itDaniel Gultsch2016-05-131-0/+1
| * do not process self presenceDaniel Gultsch2016-05-131-2/+2
| * show presence of other resources as templateDaniel Gultsch2016-05-136-6/+49
| * Update ISSUE_TEMPLATE.mdDaniel Gultsch2016-05-131-0/+1
| * create contributing guidelinesDaniel Gultsch2016-05-131-0/+11
| * Create issue templateDaniel Gultsch2016-05-131-0/+28
| * reset attempt count when reconnecting because of timeoutDaniel Gultsch2016-05-121-0/+3
| * interrupt XMPPConnection ThreadDaniel Gultsch2016-05-122-1/+15
| * prefer IPv4 DNS serversDaniel Gultsch2016-05-121-3/+16
| * improve keyboard handling. fixes #1387Daniel Gultsch2016-05-123-6/+51
| * use 'phone' or 'tablet' as default resourceDaniel Gultsch2016-05-124-2/+10
| * make omemo default when all resources support itDaniel Gultsch2016-05-125-15/+38
| * check if pgpengine is still bound before using itDaniel Gultsch2016-05-123-2/+5
| * scroll to bottom after sending multi-line messageDaniel Gultsch2016-05-121-2/+8
| * stop processing PreKeyWhisperMessage if there is no PreKeyIdDaniel Gultsch2016-05-101-3/+5