Commit Graph

1512 Commits

Author SHA1 Message Date
Sorunome bae9299fa1 Merge branch 'soru/e2ee-fixes' into 'main'
fix: Various small e2ee fixes

See merge request famedly/famedlysdk!588
2020-12-28 13:58:07 +00:00
Sorunome ccd03ecd22
fix: Various small e2ee fixes 2020-12-28 14:49:55 +01:00
Sorunome d93f420d38 Merge branch 'soru/deepcopy-map' into 'main'
chore: Implement a proper deep-copy function for json maps

See merge request famedly/famedlysdk!587
2020-12-28 13:38:21 +00:00
Sorunome 768baa7602
chore: Implement a proper deep-copy function for json maps 2020-12-28 14:35:21 +01:00
Christian Pauly c69a8ac927 Merge branch 'soru/fix-history-state-events' into 'main'
fix: Sort state events of history requests correctly

See merge request famedly/famedlysdk!586
2020-12-28 07:42:33 +00:00
Sorunome c6f718adcc
fix: Sort state events of history requests correctly 2020-12-27 10:55:41 +01:00
Sorunome 1fff05d663 Merge branch 'krille/fixtyping' into 'main'
fix: sendTypingNotification

Closes fluffychat#221

See merge request famedly/famedlysdk!585
2020-12-27 09:41:37 +00:00
Christian Pauly f91349a45e fix: sendTypingNotification 2020-12-27 09:58:14 +01:00
Christian Pauly bce0c1d485 Merge branch 'krille/magicstrings' into 'main'
refactor: Replace some magic strings

See merge request famedly/famedlysdk!584
2020-12-23 11:28:43 +00:00
Christian Pauly e2f2c124d2 Merge branch 'krille/clearlogs' into 'main'
fix: Clear logs on clear()

See merge request famedly/famedlysdk!583
2020-12-23 11:28:36 +00:00
Christian Pauly 79fe7b0878 refactor: Replace some magic strings 2020-12-23 12:14:16 +01:00
Christian Pauly 40a314e840 Merge branch 'ci-bot/dependency-updates' into 'main'
chore: automated dependency update

See merge request famedly/famedlysdk!581
2020-12-23 10:35:16 +00:00
Christian Pauly dacd007780 fix: Clear logs on clear() 2020-12-23 11:32:58 +01:00
Christian Pauly 27dd05e1dd Merge branch 'soru/cache-self-signature' into 'main'
fix: Cache the result of the self-signature check

See merge request famedly/famedlysdk!582
2020-12-23 09:57:16 +00:00
Sorunome 48904b3a1b
fix: Cache the result of the self-signature check 2020-12-23 10:52:39 +01:00
Famedly Bot 35b0fcaedb chore: Update dependencies 2020-12-22 17:06:30 +00:00
Marcus 294d82752a Merge branch 'Bubu/clear_cache' into 'main'
fix: clear cache

See merge request famedly/famedlysdk!567
2020-12-22 16:38:10 +00:00
Marcus Hoffmann 54fc29f203 clear cache fix 2020-12-22 17:34:50 +01:00
Sorunome 0ed5c44919 Merge branch 'soru/verify-device-signatures' into 'main'
fix: Verify device signatures before storing devices and block those with invalid signatures

See merge request famedly/famedlysdk!578
2020-12-22 09:27:09 +00:00
Sorunome 6f9deb5ae2
fix: Verify device signatures before storing devices and block those with invalid signatures 2020-12-22 10:22:42 +01:00
Sorunome 150f742458 Merge branch 'soru/fix-power-level-string-is-not-int' into 'main'
fix: Don't assume a power level of a person is an int

See merge request famedly/famedlysdk!579
2020-12-22 09:13:52 +00:00
Sorunome f5b1c5fc5f
fix: Don't assume a power level of a person is an int 2020-12-22 10:05:44 +01:00
Sorunome 00299f292d Merge branch 'soru/encrypt-to-device' into 'main'
feat: Better determine which devices to encrypt to

See merge request famedly/famedlysdk!577
2020-12-21 14:39:47 +00:00
Sorunome b00a9e8834
feat: Better determine which devices to encrypt to 2020-12-21 15:26:46 +01:00
Sorunome dfd88277b9 Merge branch 'soru/autoreply-more-key-requests' into 'main'
feat: Auto-Share megolm sessions with other users we know for a fact are...

Closes #127

See merge request famedly/famedlysdk!570
2020-12-21 14:08:17 +00:00
Sorunome df1c249011
feat: Auto-Share megolm sessions with other users we know for a fact are allowed to see said message 2020-12-21 14:41:44 +01:00
Christian Pauly 589f75240a Merge branch 'krille/logger' into 'main'
chore: Nicer logs in tests

See merge request famedly/famedlysdk!576
2020-12-21 13:30:34 +00:00
Christian Pauly cd4dafcd45 chore: Nicer logs in tests 2020-12-21 14:21:12 +01:00
Christian Pauly 7188d23eb3 Merge branch 'krille/better-logs' into 'main'
chore: Implement logoutput

See merge request famedly/famedlysdk!575
2020-12-21 08:38:16 +00:00
Christian Pauly 3d6dbc9dc3 chore: Implement logoutput 2020-12-21 09:35:36 +01:00
Christian Pauly d561c3f29e Merge branch 'krille/update-logger' into 'main'
chore: Update logger

See merge request famedly/famedlysdk!574
2020-12-21 08:07:11 +00:00
Christian Pauly 4b2d2d6f59 chore: Update logger 2020-12-21 08:04:34 +00:00
Marcel b5cf8cacb6 Merge branch 'krille/logfilter' into 'main'
fix: Logfilter

See merge request famedly/famedlysdk!573
2020-12-19 18:16:18 +00:00
Christian Pauly 715c5ccfb6 fix: Logfilter 2020-12-19 16:43:03 +01:00
Christian Pauly efadef4f3e Merge branch 'krille/new-logger' into 'main'
feat: Use logger package

See merge request famedly/famedlysdk!572
2020-12-19 12:04:25 +00:00
Christian Pauly 57286d4c28 feat: Use logger package 2020-12-19 12:04:25 +00:00
Sorunome 155b47428a Merge branch 'soru/equal-operator-on-receipt' into 'main'
feat: Add == operator to the Receipt, User and Room objects

See merge request famedly/famedlysdk!571
2020-12-19 11:18:49 +00:00
Sorunome 405306f84e
feat: Add == operator to the Receipt, User and Room objects 2020-12-19 12:15:50 +01:00
Sorunome 59d5849acc Merge branch 'krille/create-megolm-session-handling' into 'main'
fix: Dont create new megolm session if one is creating

Closes #129

See merge request famedly/famedlysdk!569
2020-12-17 11:58:32 +00:00
Christian Pauly fbd7393fce fix: Dont create new megolm session if one is creating 2020-12-17 12:55:08 +01:00
Christian Pauly 2841d1636c Merge branch 'soru/auto-cache-media' into 'main'
feat: Automatically cache storable files on upload

Closes #131

See merge request famedly/famedlysdk!568
2020-12-17 11:08:24 +00:00
Sorunome d1ce075b5b
feat: Automatically cache storable files on upload 2020-12-17 11:59:31 +01:00
Marcus bc47859999 Merge branch 'ci-bot/dependency-updates' into 'main'
chore: automated dependency update

See merge request famedly/famedlysdk!566
2020-12-15 18:09:32 +00:00
Famedly Bot 25ad7fd96e chore: Update dependencies 2020-12-15 17:06:54 +00:00
Christian Pauly b0e90f000d Merge branch 'krille/refactor-encryption-errors' into 'main'
refactor: Encryption errors

See merge request famedly/famedlysdk!565
2020-12-15 07:27:34 +00:00
Christian Pauly 3856b618e8 refactor: Encryption errors 2020-12-15 08:24:55 +01:00
Nicolas Werner 60af1d0259 Merge branch 'krille/fix-ci' into 'main'
CI: Remove installing the game

See merge request famedly/famedlysdk!564
2020-12-14 14:08:32 +00:00
Christian Pauly 01bd6703ce CI: Remove installing the game 2020-12-14 14:05:06 +00:00
Nicolas Werner 03eba89297 Merge branch 'krille/fix-missing-null-check' into 'main'
fix: Missing null check which F*cks me up!

See merge request famedly/famedlysdk!563
2020-12-14 13:24:39 +00:00
Christian Pauly d3c44687f6 fix: Missing null check which F*cks me up! 2020-12-14 13:24:39 +00:00