aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-2283-346/+2218
|\
| * show load more messages when auto loading is disabled and messages are still ...Daniel Gultsch2016-02-212-6/+14
| * check for uuid change when decrypting pgp messagesDaniel Gultsch2016-02-211-7/+6
| * some mucs may grant voice to visitors in unmoderated roomsDaniel Gultsch2016-02-211-1/+3
| * pulled translations from transifexDaniel Gultsch2016-02-202-0/+49
| * change uuid when replacing messagesDaniel Gultsch2016-02-202-1/+9
| * decrypt pgp message correctionsDaniel Gultsch2016-02-191-8/+9
| * skip avatar ui when pep is not available. fixes #1706Daniel Gultsch2016-02-191-5/+5
| * don't reset whisper on reInit. fixes #1637Daniel Gultsch2016-02-191-3/+0
| * pulled translations from transifexDaniel Gultsch2016-02-1929-253/+212
| * never parse show in presences as offlineDaniel Gultsch2016-02-192-12/+16
| * don't log start reasonDaniel Gultsch2016-02-171-1/+0
| * only offer message correction for the very last messageDaniel Gultsch2016-02-174-8/+37
| * fixed regression that caused messages in muc not being sendDaniel Gultsch2016-02-172-7/+8
| * log reason why otr message won't be parsedDaniel Gultsch2016-02-161-1/+2
| * fixed regression that caused ui to redraw a lotDaniel Gultsch2016-02-161-4/+8
| * made clear that archiving preferences are server sideDaniel Gultsch2016-02-162-5/+5
| * 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-141-2/+2
| * optional mode to close tcp connection when going into backgroundDaniel Gultsch2016-02-143-29/+63
| * send push enable to server. simplified loggingDaniel Gultsch2016-02-133-2/+22
| * fixed compile bug in free versionDaniel Gultsch2016-02-132-3/+3
| * push gcm token on bind instead of every connectDaniel Gultsch2016-02-121-5/+3
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-127-17/+82
| * pulled translations from transifexDaniel Gultsch2016-02-115-16/+768
* | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-1629-241/+919
|\|
| * 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
| * 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