aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * added gcm values file to gitignoreDaniel Gultsch2016-02-161-0/+2
| * added setting to opt-out of message correction. renamed preferences and optio...Daniel Gultsch2016-02-166-19/+36
| * added some OTR loggingDaniel Gultsch2016-02-162-5/+14
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-1542-41/+228
| * removed unnecessary conditions when sending read markerDaniel Gultsch2016-02-151-5/+1
| * add missing type='submit' attribute to enable push formDaniel Gultsch2016-02-151-0/+1
| * pulled translations from transifexDaniel Gultsch2016-02-1511-9/+656
| * only show load more messages button when mam is availableDaniel Gultsch2016-02-142-1/+6
| * fixed server info push not showing up when unavailableDaniel Gultsch2016-02-143-4/+12
| * be more carefull when checking push availabilityDaniel Gultsch2016-02-141-1/+3
* | try to automatically rejoin muc after beeing kickedChristian S2016-02-141-1/+2
* | Merge branch 'siacs/master' into developmentChristian S2016-02-1420-94/+521
|\|
| * deleted invalid gcm stringsDaniel Gultsch2016-02-141-5/+0
| * optional mode to close tcp connection when going into backgroundDaniel Gultsch2016-02-143-29/+63
| * send push enable to server. simplified loggingDaniel Gultsch2016-02-134-3/+57
| * fixed compile bug in free versionDaniel Gultsch2016-02-135-9/+15
| * removed gcm plugin from gradle. fixes #1693Daniel Gultsch2016-02-121-4/+2
| * push gcm token on bind instead of every connectDaniel Gultsch2016-02-121-5/+3
| * add play services to travis configDaniel Gultsch2016-02-121-0/+4
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-1213-37/+267
| * pulled translations from transifexDaniel Gultsch2016-02-115-16/+768
| * version bump to 1.9.4 + changelogDaniel Gultsch2016-02-112-2/+6
| * catch all axolotl parse exception at once. fixes #1692Daniel Gultsch2016-02-111-5/+4
| * send muc messages after joinDaniel Gultsch2016-02-101-1/+2
| * allow user to set MAM preferencesDaniel Gultsch2016-02-095-16/+119
* | Update CHANGELOG.mdChristian S2016-02-061-1/+1
* | added missing strings/translationsChristian S2016-02-062-1/+10
* | optimized subtitle in MUCsChristian S2016-02-062-22/+19
* | match new presence modificationsChristian S2016-02-042-9/+2
* | Add device name to client infoArtem Shipovskiy2016-02-043-0/+15
* | removed duplicate stringChristian S2016-02-041-1/+0
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-0432-328/+900
|\|
| * prepend instead off append mam messages to conversations when going in reverseDaniel Gultsch2016-02-042-2/+13
| * fixed performance regression in on scroll listenerDaniel Gultsch2016-02-042-3/+8
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-049-17/+92
| * add more fault tolerant checks for messages left on serverDaniel Gultsch2016-02-043-7/+21
| * removed unecessary logging when muc tiles updateDaniel Gultsch2016-02-041-1/+0
| * use TLSv1.2 as SSL context on supported plattformsDaniel Gultsch2016-02-033-2/+14
| * cache server capsDaniel Gultsch2016-02-033-3/+36
| * count all messages in a queryDaniel Gultsch2016-02-032-8/+3
| * Revert "get rid of broken totalMessageCount for mam queries"Daniel Gultsch2016-02-032-4/+16
| * refactored disco cache. avoid making duplicate call. check hashDaniel Gultsch2016-02-036-43/+116
| * Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...Daniel Gultsch2016-02-0211-152/+467
| |\
| | * Do disco for caps hashes we have never seenStephen Paul Weber2016-01-241-2/+23
| | * Fetch cached caps result on new presenceStephen Paul Weber2016-01-242-3/+14
| | * Use a Presence class for presence informationStephen Paul Weber2016-01-248-102/+121
| | * Persisitence and loading for ServiceDiscoveryResultStephen Paul Weber2016-01-232-11/+98
| | * Implement toJSON on ServiceDiscoveryResultStephen Paul Weber2016-01-231-0/+34
| | * Generate capHash from any discovery resultStephen Paul Weber2016-01-231-4/+80
| | * Factor out a representation of XEP-0030 resultsStephen Paul Weber2016-01-232-47/+114