Commit graph

1110 commits

Author SHA1 Message Date
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
Christian Pauly c689f6d344 Merge branch 'soru/fix-push-payload' into 'master'
url in PusherData is optional

See merge request famedly/famedlysdk!383
2020-07-14 16:21:24 +00:00
Lukas Lihotzki fc1b78d712 olm and matrix_file_e2ee from pub 2020-07-14 17:08:30 +02:00
Sorunome 8294231f78
url in PusherData is optional 2020-07-14 12:00:37 +02:00
Sorunome 8b3e2e6c86
fix tests 2020-07-14 11:46:37 +02:00
Sorunome 4394196ba1
try to load members from database first and cache them in-memory 2020-07-14 11:30:13 +02:00
Sorunome 79ea85bf4d
indexes are already created when creating a talbe 2020-07-14 10:43:21 +02:00
Christian Pauly 259cede94e Merge branch 'matrixapi-refactor-query' into 'master'
refactor matrix_api query strings and enums

See merge request famedly/famedlysdk!376
2020-07-08 07:15:26 +00:00
Lukas Lihotzki 8d83d4a699 refactor matrix_api query strings and enums 2020-07-08 07:15:26 +00:00
Christian Pauly e88e60ec09 Merge branch 'ChristianPauly-master-patch-10645' into 'master'
Remove deprecated contactlist method

See merge request famedly/famedlysdk!378
2020-07-02 10:41:23 +00:00
Christian Pauly c87450dafb Remove deprecated contactlist method 2020-07-02 10:41:23 +00:00
Sorunome ac720df3d2 Merge branch 'soru/performance' into 'master'
Greatly imporve initial loading performance

See merge request famedly/famedlysdk!377
2020-07-02 08:55:31 +00:00
Sorunome 7351319f28
address things 2020-07-02 10:32:11 +02:00
Sorunome 8f122195c5
re-work state lazy loading after discussion 2020-07-01 11:09:31 +02:00
Christian Pauly ad098aa246 Merge branch 'krille/catch-all-sync-errors' into 'master'
Catch all sync errors

See merge request famedly/famedlysdk!374
2020-06-30 14:47:40 +00:00
Sorunome b7b369923f
only lazy-load m.room.member, not store presence 2020-06-30 13:41:52 +02:00
Sorunome 2e3d8205b1
analyze and format 2020-06-30 12:21:03 +02:00
Sorunome a1f8120c59
Greatly imporve initial loading performance 2020-06-30 12:17:56 +02:00
Christian Pauly 00b844c118 Merge branch 'soru/hide-bad-sync-errors' into 'master'
hide red herring sync errors

Closes #82

See merge request famedly/famedlysdk!375
2020-06-29 13:33:48 +00:00
Sorunome dbfaf7fa72
hide red herring sync errors 2020-06-29 15:27:14 +02:00
Christian Pauly 2f32791117 Catch all sync errors 2020-06-29 14:09:40 +02:00
Christian Pauly 4790925929 Merge branch 'soru/no-contains-key' into 'master'
Better validate event contents

See merge request famedly/famedlysdk!353
2020-06-29 12:02:18 +00:00
Sorunome fd406987c1 Better validate event contents 2020-06-29 12:02:18 +00:00
Christian Pauly 0ac7aec071 Merge branch 'matrixfile-refactor-all' into 'master'
MatrixFile refactoring for thumbnails

See merge request famedly/famedlysdk!371
2020-06-29 12:00:26 +00:00
Lukas Lihotzki 842581699c MatrixFile refactoring for thumbnails 2020-06-29 12:00:26 +00:00
Christian Pauly 4582574e5b Merge branch 'krille/calc-displayname-without-local-part' into 'master'
Implement calcDisplayname without local part

See merge request famedly/famedlysdk!373
2020-06-29 08:40:16 +00:00
Christian Pauly 7e9c8f88f3 Implement calcDisplayname without local part 2020-06-29 08:40:16 +00:00
Christian Pauly 01daa3ec44 Merge branch 'ChristianPauly-master-patch-89224' into 'master'
Fix wellknown with trailing slash

See merge request famedly/famedlysdk!369
2020-06-28 11:54:01 +00:00
Christian Pauly 386248a046 Fix wellknown with trailing slash 2020-06-28 11:54:00 +00:00
Sorunome 28fd207f2a Merge branch 'soru/fix-account-data' into 'master'
Hotfix: account_data stored incorrectly in the database

See merge request famedly/famedlysdk!372
2020-06-26 16:53:48 +00:00
Sorunome 163cbdb923
Hotfix: account_data stored incorrectly in the database 2020-06-26 18:46:54 +02:00
Christian Pauly ab812e0da2 Merge branch 'mime-refactor-use-mime' into 'master'
Use mime instead of mime_type

See merge request famedly/famedlysdk!368
2020-06-26 07:54:55 +00:00
Lukas Lihotzki 58dcedb883 Use mime instead of mime_type 2020-06-25 17:35:46 +02:00
Christian Pauly 8e2c8b0d11 Merge branch 'soru/fix-tag-model' into 'master'
parse order of tags better

See merge request famedly/famedlysdk!367
2020-06-25 14:05:10 +00:00
Sorunome 663d0a2638 parse order of tags better 2020-06-25 14:05:10 +00:00
Christian Pauly 00be163153 Merge branch 'soru/fix-ci' into 'master'
Fix CI

See merge request famedly/famedlysdk!366
2020-06-25 08:55:08 +00:00
Sorunome e3241558f5
Fix CI 2020-06-25 10:15:38 +02:00
Sorunome 62f63ebf1f Merge branch 'soru/olm-session-recovery' into 'master'
Adds olm session recovery

See merge request famedly/famedlysdk!355
2020-06-25 08:01:37 +00:00
Sorunome 35ba666c0a Merge branch 'krille/fix-sorting-again' into 'master'
Fix sorting again and again god damn

See merge request famedly/famedlysdk!365
2020-06-25 07:57:16 +00:00
Sorunome 5dda0c3623 Merge branch 'soru/cross-signing' into 'master'
Cross-Signing

See merge request famedly/famedlysdk!319
2020-06-25 07:53:30 +00:00
Christian Pauly 34425b035f Fix sorting again and again god damn 2020-06-25 09:51:24 +02:00
Sorunome 8de4b5acc0
update link in comments 2020-06-25 09:46:01 +02:00
Sorunome 33c2edae19 Merge branch 'krille/fix-wrong-sort-type' into 'master'
Fix wrong type for sort

See merge request famedly/famedlysdk!364
2020-06-25 07:41:51 +00:00
Christian Pauly c536af32f5 Fix wrong type for sort 2020-06-25 09:36:28 +02:00
Sorunome 66e137582e Merge branch 'krille/sort-invites-on-top' into 'master'
Sort invites on top

See merge request famedly/famedlysdk!363
2020-06-25 07:32:52 +00:00
Christian Pauly 2b393ff193 Sort invites on top 2020-06-25 09:27:01 +02:00
Sorunome 2cd4ab11ce Merge branch 'krille/minor-refactoring' into 'master'
Minor refactoring

See merge request famedly/famedlysdk!361
2020-06-25 07:17:00 +00:00
Christian Pauly 52e57f8dc2 Minor refactoring 2020-06-25 07:16:59 +00:00