Commit graph

1154 commits

Author SHA1 Message Date
Christian Pauly bf23664ccd Merge branch 'client-fix-upload-keys-try-again' into 'master'
[Client] Try again to upload keys

See merge request famedly/famedlysdk!196
2020-02-17 17:15:49 +00:00
Christian Pauly f13fc98609 [Client] Try again to upload keys 2020-02-17 18:10:53 +01:00
Christian Pauly d6e5937066 Merge branch 'event-fix-get-reply-event' into 'master'
[Event] Fix getReplyEvent

See merge request famedly/famedlysdk!195
2020-02-17 15:47:05 +00:00
Christian Pauly 600820a40d [Event] Fix getReplyEvent 2020-02-17 15:42:11 +00:00
Christian Pauly 75c1dc1c56 Merge branch 'client-fix-losing-verified-devices' into 'master'
[Client] Fix storing verified and blocked devices

See merge request famedly/famedlysdk!194
2020-02-17 11:53:11 +00:00
Christian Pauly 54e88e6c95 [Client] Fix storing verified and blocked devices 2020-02-17 12:49:01 +01:00
Christian Pauly b7dea7c6a5 Merge branch 'client-enhance-add-timeout-factor' into 'master'
[Client] Add timeout factor

See merge request famedly/famedlysdk!193
2020-02-17 08:15:33 +00:00
Christian Pauly 26bf204bd5 [Client] Add timeout factor 2020-02-17 08:15:32 +00:00
Christian Pauly 806f6449fc Merge branch 'devicekeys-fix-request-wrong-keys' into 'master'
[DeviceKeys] outdated by default not null

See merge request famedly/famedlysdk!192
2020-02-15 13:52:41 +00:00
Christian Pauly 8bf7eacc46 [DeviceKeys] outdated by default not null 2020-02-15 14:21:27 +01:00
Christian Pauly 1f5e3d3873 Merge branch 'client-fix-trust-own-device' into 'master'
[Client] Trust own device

See merge request famedly/famedlysdk!191
2020-02-15 12:38:06 +00:00
Christian Pauly f8c65d5d59 [Client] Trust own device 2020-02-15 13:33:03 +01:00
Christian Pauly b16a59a7cb Merge branch 'room-fix-internal-type' into 'master'
[Room] Fix internal message type

See merge request famedly/famedlysdk!190
2020-02-15 12:27:09 +00:00
Christian Pauly 45193624c2 [Room] Fix internal message type 2020-02-15 12:21:03 +00:00
Christian Pauly 4d4eabb9a2 Merge branch 'olm-fix-minor-bugs' into 'master'
[Timeline] Try to decrypt but not block

See merge request famedly/famedlysdk!189
2020-02-15 08:58:09 +00:00
Christian Pauly 3c386391cf [Timeline] Try to decrypt but not block 2020-02-15 08:58:08 +00:00
Christian Pauly 4921c4c31b Merge branch 'sdk-enhance-add-dart-olm' into 'master'
[SDK] Add dart-olm library and update CI

See merge request famedly/famedlysdk!182
2020-02-15 07:48:41 +00:00
Christian Pauly f5b493f9bd [SDK] Add dart-olm library and update CI 2020-02-15 07:48:41 +00:00
Christian Pauly a43f659a48 Merge branch 'event-fix-null-sender' into 'master'
[Event] Fix null sender

See merge request famedly/famedlysdk!188
2020-02-14 14:10:45 +00:00
Christian Pauly 86a192efd8 [Event] Fix null sender 2020-02-14 14:06:46 +00:00
Christian Pauly 0f68b60f16 Merge branch 'states-fix-return-null' into 'master'
[States] Return null on null key

See merge request famedly/famedlysdk!187
2020-02-14 13:30:57 +00:00
Christian Pauly 8e0373cdb9 [States] Return null on null key 2020-02-14 13:16:26 +00:00
Christian Pauly e2fde3fa92 Merge branch 'event-fix-reply-check' into 'master'
[Event] Fix reply check

See merge request famedly/famedlysdk!185
2020-02-11 11:28:26 +00:00
Christian Pauly cc02668593 [Event] Fix reply check 2020-02-11 11:28:26 +00:00
Christian Pauly 76d0167038 Merge branch 'client-refactor-clean-logs' into 'master'
[Client] Clean up logs

See merge request famedly/famedlysdk!186
2020-02-11 11:26:13 +00:00
Christian Pauly 214201f9d3 [Client] Clean up logs 2020-02-11 11:23:37 +00:00
Christian Pauly fb9d8613ee Merge branch 'event-feature-add-replies' into 'master'
[Event] Add support for replies

See merge request famedly/famedlysdk!184
2020-02-11 11:06:54 +00:00
Christian Pauly 3404cffada [Event] Add support for replies 2020-02-11 11:06:54 +00:00
Christian Pauly 38f7bf9476 Merge branch 'identifier-feature-implement-string-extension' into 'master'
[Identifier] Implement string extension

See merge request famedly/famedlysdk!183
2020-02-10 11:37:15 +00:00
Christian Pauly 9395b8fcd3 [Identifier] Implement string extension 2020-02-10 12:33:18 +01:00
Christian Pauly 4bf6a4bcb6 Merge branch 'client-enhance-get-own-devices' into 'master'
[Client] Always claim own devices

See merge request famedly/famedlysdk!180
2020-02-05 08:23:47 +00:00
Christian Pauly 24d08d83b9 [Client] Always claim own devices 2020-02-05 08:23:47 +00:00
Christian Pauly 6301255ad4 Merge branch 'client-feature-canonical-json' into 'master'
[Client] Add canonical json

See merge request famedly/famedlysdk!181
2020-02-04 17:05:47 +00:00
Christian Pauly cabb5679a7 [Client] Add canonical json 2020-02-04 18:01:53 +01:00
Christian Pauly 166b1a9464 Merge branch 'client-feature-add-device-tracking' into 'master'
Client feature add device tracking

Closes #46

See merge request famedly/famedlysdk!179
2020-02-04 13:41:14 +00:00
Christian Pauly edd8aa5c4c Client feature add device tracking 2020-02-04 13:41:13 +00:00
Christian Pauly e1335ae2f3 Merge branch 'openid-fix-type' into 'master'
[OpenIdCredentials] Fix type

See merge request famedly/famedlysdk!178
2020-02-03 09:45:33 +00:00
Christian Pauly 0c7efaff62 [OpenIdCredentials] Fix type 2020-02-03 09:45:33 +00:00
Christian Pauly 2dc388ca0f Merge branch 'add-refactor-codeowners' into 'master'
Add codeowners

See merge request famedly/famedlysdk!177
2020-02-03 09:42:16 +00:00
Niklas Zender 4c8b58783f Add new file 2020-02-03 08:34:53 +00:00
Christian Pauly 103eb6734b Merge branch 'client-enhance-upload' into 'master'
[Client] Upload with StreamedRequest

See merge request famedly/famedlysdk!176
2020-02-01 12:08:14 +00:00
Christian Pauly 995da7d255 [Client] Upload with StreamedRequest 2020-02-01 12:08:14 +00:00
Christian Pauly 6e18838725 Merge branch 'ci-fix-remove-workaround' into 'master'
[CI] Remove gradle workaround

See merge request famedly/famedlysdk!174
2020-01-30 13:14:41 +00:00
Christian Pauly 0db1d50aef [CI] Remove gradle workaround 2020-01-30 13:11:18 +00:00
Christian Pauly 929b26ddbe Merge branch 'events-fix-typo' into 'master'
[Event] Fix typo

See merge request famedly/famedlysdk!173
2020-01-29 12:11:21 +00:00
Christian Pauly c710768937 [Event] Fix typo 2020-01-29 12:11:21 +00:00
Christian Pauly 2e6a1ab4d4 Merge branch 'matrixexception-fix-nullchecker' into 'master'
[MatrixException] Add nullchecker

See merge request famedly/famedlysdk!172
2020-01-29 09:25:41 +00:00
Christian Pauly f2c92aa9bb [MatrixException] Add nullchecker 2020-01-29 09:21:23 +00:00
Christian Pauly 87f1a4ed99 Merge branch 'room-fix-invite-direct-chat' into 'master'
[Room] Fix join invitation to direct chat

See merge request famedly/famedlysdk!171
2020-01-28 08:19:26 +00:00
Christian Pauly 289c5c618d [Room] Fix join invitation to direct chat 2020-01-28 09:15:53 +01:00