Commit graph

1157 commits

Author SHA1 Message Date
Christian Pauly d4a7345b8a Enable transactions again to fix web 2020-08-03 13:28:30 +00:00
MTRNord f6a253de88
repo!: Make CI ready for change from master to main.
BREAKING CHANGE: This only works with main as the default instead of master
2020-08-01 15:55:41 +02:00
Marcel a6adb791c6 Merge branch 'krille/detect-file-message-type' into 'master'
Detect the file message type

See merge request famedly/famedlysdk!405
2020-08-01 13:04:03 +00:00
Christian Pauly 938540eca5 Detect the file message type 2020-08-01 13:04:03 +00:00
Christian Pauly 050222cede Merge branch 'soru/key-request-try-catch' into 'master'
put key request in try...catch

See merge request famedly/famedlysdk!404
2020-08-01 07:06:39 +00:00
Sorunome 18a790be84 put key request in try...catch 2020-08-01 07:06:39 +00:00
Sorunome 2697f88397 Merge branch 'krille/fake-syncs-for-fake-events' into 'master'
Use SyncUpdate for pending messages

See merge request famedly/famedlysdk!385
2020-07-30 08:48:47 +00:00
Christian Pauly dc1ed0c6e2 Use SyncUpdate for pending messages 2020-07-30 08:48:47 +00:00
Christian Pauly 5bf52664e1 Merge branch 'soru/key-verification-fixes' into 'master'
some key verification fixes and temporarily disable transactions

See merge request famedly/famedlysdk!403
2020-07-30 08:33:44 +00:00
Sorunome 69431a1aff
some key verification fixes and temporarily disable transactions 2020-07-30 09:57:45 +02:00
Christian Pauly 969467c497 Merge branch 'soru/no-reply-flickering' into 'master'
Prevent m.relates_to to be removed from the status=1 object in encrypted rooms

Closes app#529

See merge request famedly/famedlysdk!402
2020-07-29 10:45:42 +00:00
Sorunome 6915781e6a
Prevent m.relates_to to be removed from the status=1 object in encrypted rooms 2020-07-29 11:43:27 +02:00
Christian Pauly a28ab5fc60 Merge branch 'soru/remove-trailing-slash' into 'master'
Remove trailing slash in checkServer

Closes ChristianPauly/fluffychat-flutter#130

See merge request famedly/famedlysdk!400
2020-07-27 07:40:25 +00:00
Sorunome 6696a8b3ca Remove trailing slash in checkServer 2020-07-27 07:40:25 +00:00
Christian Pauly 1cd430ab3b Merge branch 'soru/event-aggregation' into 'master'
Properly imlement event aggregations

See merge request famedly/famedlysdk!399
2020-07-27 07:39:48 +00:00
Sorunome f48f6bca12 Properly imlement event aggregations 2020-07-27 07:39:48 +00:00
Sorunome 654f34cce0 Merge branch 'soru/no-http-in-sync' into 'master'
make sure that no http requests are done inside of /sync

Closes app#613

See merge request famedly/famedlysdk!401
2020-07-26 09:30:02 +00:00
Sorunome 14c8377a2f
make sure that no http requests are done inside of /sync 2020-07-26 07:54:03 +02:00
Christian Pauly 3fae58439b Merge branch 'soru/sync-filter' into 'master'
add update filters

See merge request famedly/famedlysdk!398
2020-07-25 14:46:36 +00:00
Sorunome 31614364d3 add update filters 2020-07-25 14:46:36 +00:00
Christian Pauly 7cc14687c4 Merge branch 'soru/update-emotes' into 'master'
Add data-mx-emote to emotes as per MSC

See merge request famedly/famedlysdk!397
2020-07-25 11:56:23 +00:00
Sorunome 6cd745bd1a
Add data-mx-emote to emotes 2020-07-24 17:59:39 +02:00
Marcel 772cb2cf1d Merge branch 'soru/test-web' into 'master'
test web

See merge request famedly/famedlysdk!396
2020-07-24 13:51:35 +00:00
Sorunome 84a94f5c9d
format 2020-07-24 15:44:55 +02:00
Sorunome d4818bd677
forgot to ctrl+s 2020-07-24 15:37:40 +02:00
Sorunome 9cb4dab9d4
test web 2020-07-24 15:37:00 +02:00
Sorunome f90b8c81b1 Merge branch 'soru/test-web' into 'master'
test web

See merge request famedly/famedlysdk!395
2020-07-24 13:00:12 +00:00
Sorunome ff2de35d28
test web 2020-07-24 14:53:06 +02:00
Christian Pauly ad8135990d Merge branch 'soru/fix-too-early-event-update' into 'master'
fix issue with sending messages

See merge request famedly/famedlysdk!393
2020-07-23 08:09:00 +00:00
Sorunome c68487ac21 fix issue with sending messages 2020-07-23 08:09:00 +00:00
Sorunome a46942a140 Merge branch 'soru/fix-members-requests' into 'master'
try to load members from database first and cache them in-memory

Closes app#596

See merge request famedly/famedlysdk!382
2020-07-21 08:05:48 +00:00
Christian Pauly 3947b0aa73 Merge branch 'krille/fix-request-history-2' into 'master'
Fix request history

See merge request famedly/famedlysdk!390
2020-07-21 07:34:30 +00:00
Christian Pauly 4f2a8febf9 Fix request history 2020-07-21 07:34:30 +00:00
Sorunome 845d0cf791 Merge branch 'MTRNord/utf8-encode-fake-api-responses' into 'master'
[Tests] Properly encode fake api responses as utf8. Also remove not needed returns as they do the same as the last return.

Closes #84

See merge request famedly/famedlysdk!392
2020-07-20 13:28:02 +00:00
Marcel 7690c4ef9c [Fake API] Further reduce amount of returns
Took 5 minutes
2020-07-20 15:21:46 +02:00
Marcel 0647df37e3 [Test] Properly encode fake api responses as utf8. Also remove not needed returns as they do the same as the last return.
Took 15 minutes
2020-07-20 15:16:23 +02:00
Sorunome bf1a4fe91b Merge branch 'MTRNord/utf-8-decode-json' into 'master'
[Requests] Make sure to not use the latin1 version of the json but instead...

See merge request famedly/famedlysdk!391
2020-07-20 11:50:10 +00:00
Marcel 3c0fbf784f [Requests] Add try_catch for utf8 decoding because dart really seems to have issues with json encoding and decoding. (also use camelCase)
Took 18 minutes
2020-07-20 13:43:55 +02:00
Marcel 9f6bd740ca [Requests] Make sure to not use the latin1 version of the json but instead convert the bytes to utf8 as required by various RFCs.
Took 14 minutes
2020-07-20 13:19:57 +02:00
Sorunome 0ece2717e0
Merge branch 'master' into soru/fix-members-requests 2020-07-20 11:53:55 +02:00
Sorunome f4c8cfe992 Merge branch 'krille/fix-room-sorting' into 'master'
Fix room sorting

See merge request famedly/famedlysdk!389
2020-07-20 07:46:46 +00:00
Christian Pauly b8f80c7071 Fix room sorting 2020-07-20 07:46:46 +00:00
Christian Pauly 811c00c350 Merge branch 'soru/use-prev-content-username-fallback' into 'master'
use prev_content to calculate displayname and avatar_url, if content unavailable

See merge request famedly/famedlysdk!386
2020-07-20 06:33:03 +00:00
Christian Pauly 5b87d389b0 Merge branch 'soru/database-connect' into 'master'
add Databse.connect to be able to run in isaltes

See merge request famedly/famedlysdk!387
2020-07-20 06:31:26 +00:00
Christian Pauly 38430ebddf Merge branch 'soru/key-verification-fix' into 'master'
fixes a racing condition in key verification

See merge request famedly/famedlysdk!388
2020-07-20 06:31:05 +00:00
Sorunome 2214ac2d0a fixes a racing condition in key verification 2020-07-20 06:31:05 +00:00
Sorunome 175cb0fbd2
add Databse.connect to be able to run in isaltes 2020-07-17 13:20:23 +02:00
Sorunome 864151ec83
use prev_content to calculate displayname and avatar_url, if content unavailable 2020-07-17 12:02:43 +02:00
Christian Pauly 26510173de Merge branch 'lukaslihotzki/pub-olm' into 'master'
olm and matrix_file_e2ee from pub

See merge request famedly/famedlysdk!384
2020-07-14 16:21:53 +00:00
Christian Pauly 2c9a09ed5e Merge branch 'soru/fix-migration' into 'master'
indexes are already created when creating a talbe

Closes app#591

See merge request famedly/famedlysdk!381
2020-07-14 16:21:37 +00:00