aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-02Apply the new brace wrapping to source filesKitsune Ral
2019-08-02.clang-format: Alter brace wrapping to (mostly) match WebKit styleKitsune Ral
2019-08-02e2ee.h: add a missing #includeKitsune Ral
Revealed after reordering #includes with clang-format.
2019-08-02.clang-format: Enable ConstructorInitializerAllOnOneLineOrOnePerLineKitsune Ral
2019-08-02.clang-format: Bring back AlwaysBreakTemplateDeclarationsKitsune Ral
It was accidentally left commented out in trying to support clang-format 5. Now that we're embracing clang-format 6+ only, it really should be on.
2019-08-02Merge branch 'master' into use-clang-formatKitsune Ral
2019-08-01Merge pull request #341 from quotient-im/kitsune-relationsKitsune Ral
Reactions and edited messages support
2019-08-01Add EncryptedEvent to libqmatrixclient.pri as wellKitsune Ral
2019-08-01Merge branch 'master' into kitsune-relationsKitsune Ral
Unified *Key -> *KeyL identifiers in roommessageevent.cpp along the way.
2019-07-31Merge pull request #335 from quotient-im/aa13q-e2ee-encrypted-msgKitsune Ral
E2EE: introduce EncryptedEvent
2019-07-31.travis.yml: temporarily disabling Valgrind because it's brokenKitsune Ral
2019-07-31.travis.yml: switch to xenial and Qt 5.9Kitsune Ral
2019-07-31Room::postReaction()Kitsune Ral
2019-07-31Support for receiving m.reaction eventsKitsune Ral
* struct EventRelation; class ReactionEvent; Room::relatedEvents() * Reaction events are processed in both history and sync batches * Redacting a reaction removes it from the list of related events * QMCTest::sendReaction()
2019-07-31Initial support for edited messages (receive only)Kitsune Ral
2019-07-31converters.h: fallback to intrusive toJson() for JsonObjectConverter; ↵Kitsune Ral
general improvements Single-argument fromJson<Omittable<T>>() now works as well.
2019-07-31.appveyor.yml: Switch to Qt 5.12; no more Visual Studio 2015 buildsKitsune Ral
2019-07-31QMCTest::loadingMembers(): find a room by aliasKitsune Ral
...now that #264 is closed. Also, it gets the newest #quotient:matrix.org rather than the old upgraded room.
2019-07-31converters.h: more comments; documented addParam<>()Kitsune Ral
[skip ci]
2019-07-27E2EE: introduce EncryptedEventAlexey Andreyev
2019-07-25Merge pull request #334 from quotient-im/bhat-olm-qmake-macosKitsune Ral
libQtOlm: Upstream fix of qmake not able to find libOlm on macOS.
2019-07-18libQtOlm: Upstream fix of qmake not able to find libOlm on macOS.Black Hat
2019-07-14E2EE: provide a shared header with encryption standard key namesAlexey Andreyev
2019-07-12Minor polishKitsune Ral
2019-07-11.travis.yml: temporarily disabling Valgrind because it's brokenKitsune Ral
2019-07-10.travis.yml: switch to xenial and Qt 5.9Kitsune Ral
2019-07-10CMakeLists.txt: fix things around clang-format, inherit CLANG_FORMAT_ARGSKitsune Ral
2019-07-10Merge pull request #330 from quotient-im/bhat-wellknownKitsune Ral
.well-known support
2019-07-09Add more checks according to the specBlack Hat
2019-07-09Merge branch 'master' into use-clang-formatKitsune Ral
2019-07-09Move serverPart() to the public APIKitsune Ral
Also: Connection::resolveServer() now only accepts MXIDs, not domains.
2019-07-09Merge pull request #333 from quotient-im/aa13q-e2ee-enc-mngKitsune Ral
E2EE: fix EncryptionManager algorithm names
2019-07-08E2EE: fix EncryptionManager algorithm namesAlexey Andreyev
2019-07-08Merge pull request #332 from quotient-im/aa13q-e2ee-pickleKitsune Ral
E2EE: add new account and identity keys generation logic
2019-07-08Room: Set roomId and sender on pending eventsKitsune Ral
Also: refactoring to streamline state events submission.
2019-07-08RoomEvent::setRoomId()/setSender()Kitsune Ral
2019-07-08E2EE: fix uploadIdentityKeys signatures generationAlexey Andreyev
2019-07-08E2EE: add new account generation logicAlexey Andreyev
2019-07-07.travis.yml: Fix a typo in qmc-example invocationKitsune Ral
2019-07-07Optimize Travis CI executionKitsune Ral
The same code is already in Quaternion's .travis.yml, just copy it here as well.
2019-07-07.travis.yml: pass LD_LIBRARY_PATH so that the example could find olmKitsune Ral
2019-07-07Documentation: libQMatrixClient -> libQuotient, QMatrixClient -> ↵Kitsune Ral
quotient-im, etc.
2019-07-07Logging categories: libqmatrixclient.* -> quotient.*Kitsune Ral
2019-07-07Merge pull request #329 from a-andreyev/aa13q-e2ee-enc-mngKitsune Ral
E2EE: Introduce EncryptionManager with uploadIdentityKeys and uploadOneTimeKeys API.
2019-07-07Fix qmake builds in CIKitsune Ral
2019-07-06EncryptionEvent: Adjust upon merge from masterKitsune Ral
2019-07-06Merge branch 'master' into e2ee-enc-mngKitsune Ral
2019-07-06.appveyor.yml: stick with static libsKitsune Ral
2019-07-06Fix building with ClangKitsune Ral
2019-07-06Be stricter on usage of stateKeyKitsune Ral
A few places in the library dealt with state events without any notion of state_key inside events, including StateEvent[Base] and relevant functions in Room. A number of workarounds have been made; e.g., Room::setMemberState() accepted userId as a separate parameter, ignoring the state key inside the RoomMemberEvent already passed to it, and Room::setLocalAliases() had a bug in the initial version where the function still tried to pass aliases in an event with an empty state key. This commit fixes this shortcoming: StateEventBase now gets stateKey as one more parameter, Room::Private::getCurrentState() respects stateKey and returns properly constructed stub events, and Room::setMemberState() gives way to a more generic Room::setState() that works uniformly with whatever state event you pass to it.