Commit graph

938 commits

Author SHA1 Message Date
Christian Pauly 34425b035f Fix sorting again and again god damn 2020-06-25 09:51:24 +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
Sorunome 802e3c3f4d Merge branch 'krille/timestamp-as-sort-order' into 'master'
Use timestamp as sort order

Closes #78

See merge request famedly/famedlysdk!362
2020-06-25 07:10:07 +00:00
Christian Pauly 6846b7d5c6 Use timestamp as sort order 2020-06-25 09:04:26 +02:00
Sorunome ad67a5abdb Merge branch 'krille/fix-direct-chats' into 'master'
Fix direct chats

See merge request famedly/famedlysdk!360
2020-06-25 06:59:03 +00:00
Christian Pauly e6cf5cb927 Fix direct chats 2020-06-25 06:59:03 +00:00
Christian Pauly 869bc6567b Merge branch 'krille/add-room-tag-support' into 'master'
Add room tag support

See merge request famedly/famedlysdk!359
2020-06-24 09:22:08 +00:00
Christian Pauly 13b3c0df4d Add room tag support 2020-06-24 09:22:08 +00:00
Christian Pauly edd30460e7 Merge branch 'krille/implement-pinned-events' into 'master'
Implement pinned events

See merge request famedly/famedlysdk!358
2020-06-24 08:41:52 +00:00
Christian Pauly 2afd0bb3a8 Implement pinned events 2020-06-24 08:41:52 +00:00
Christian Pauly ed262c0d51 Merge branch 'soru/fix-incorrect-olm-session-create' into 'master'
Fix some olm sessions not being loaded from database

See merge request famedly/famedlysdk!356
2020-06-23 18:20:43 +00:00
Niklas Zender 36cb6d63db Merge branch 'soru/query-single-room' into 'master'
add database.getRoom

See merge request famedly/famedlysdk!357
2020-06-23 12:07:54 +00:00
Sorunome 1a9f6e38dc
add database.getRoom 2020-06-23 13:35:22 +02:00
Sorunome 439f6f0aa0
Fix some olm sessions not being loaded from database 2020-06-23 11:42:01 +02:00
Sorunome 5a57c886ae Merge branch 'soru/remove-transaction-hack' into 'master'
remove transaction hack

See merge request famedly/famedlysdk!354
2020-06-22 15:33:19 +00:00
Sorunome 3d40a8d81b
remove transaction hack 2020-06-22 17:27:06 +02:00
Christian Pauly aea86aaf10 Merge branch 'soru/direct-chats' into 'master'
potentially fix direct chats going missing

Closes ChristianPauly/fluffychat-flutter#86

See merge request famedly/famedlysdk!346
2020-06-22 06:48:30 +00:00
Sorunome 2999ceec9e potentially fix direct chats going missing 2020-06-22 06:48:30 +00:00
Sorunome 22d8225f46 Merge branch 'krille/fix-sending-sort-order' into 'master'
Fix sending sort order

See merge request famedly/famedlysdk!350
2020-06-20 19:50:49 +00:00
Sorunome d8cb53e32f Merge branch 'krille/fix-send-again' into 'master'
Fix send again

See merge request famedly/famedlysdk!351
2020-06-20 19:50:08 +00:00
Sorunome bb73b4ea2f Merge branch 'krille/fix-database-transaction' into 'master'
Database transaction workaround

See merge request famedly/famedlysdk!352
2020-06-19 15:29:03 +00:00
Christian Pauly f1579a5f0f Database transaction workaround 2020-06-19 15:28:03 +02:00
Christian Pauly ee2974e51e Fix send again 2020-06-19 14:05:53 +02:00
Christian Pauly 9f8d170dd4 Fix sending sort order 2020-06-19 14:00:32 +02:00
Marcel b8c6decafc Merge branch 'soru/wal' into 'master'
Better format switching to WAL mode

See merge request famedly/famedlysdk!349
2020-06-16 12:36:33 +00:00
Sorunome 12bdddee03
Better format switching to WAL mode 2020-06-16 14:26:37 +02:00
Marcel 13b2c2602b Merge branch 'soru/sqlite-wal' into 'master'
switch database to wal mode

See merge request famedly/famedlysdk!348
2020-06-16 10:57:29 +00:00
Sorunome 77378e3ebc
switch database to wal mode 2020-06-16 12:51:29 +02:00
Sorunome fca86d09d6 Merge branch 'patch-1' into 'master'
Update CODEOWNERS

See merge request famedly/famedlysdk!347
2020-06-15 12:40:23 +00:00
Niklas Zender 4e6b1174a6 Update CODEOWNERS 2020-06-15 12:34:28 +00:00
Christian Pauly 8db8972c2f Merge branch 'soru/fix-key-sharing' into 'master'
fix key request sending

See merge request famedly/famedlysdk!345
2020-06-12 12:32:43 +00:00
Sorunome 1a98634fd6 fix key request sending 2020-06-12 12:32:42 +00:00
Christian Pauly a61efa0384 Merge branch 'soru/fix-state-attack' into 'master'
Fix state attack

See merge request famedly/famedlysdk!343
2020-06-10 14:17:57 +00:00
Sorunome f485ca29d8 Fix state attack 2020-06-10 14:17:57 +00:00
Christian Pauly 7ee7afb7be Merge branch 'soru/hotfix-decryption' into 'master'
Hotfix decryption can request session

See merge request famedly/famedlysdk!344
2020-06-10 14:17:40 +00:00
Sorunome 485d88b896
Hotfix decryption can request session 2020-06-10 12:11:10 +02:00
Sorunome d660749a56 Merge branch 'ChristianPauly-master-patch-74314' into 'master'
Hotfix OpenIdCredentials

See merge request famedly/famedlysdk!342
2020-06-10 09:12:56 +00:00
Christian Pauly 5487b62360 Hotfix OpenIdCredentials 2020-06-10 09:12:55 +00:00
Christian Pauly d53003c0bd Merge branch 'soru/decrypt-more-events' into 'master'
Allow requesting and updating of session keys with lower index and lower forwarded chain

Closes #76

See merge request famedly/famedlysdk!341
2020-06-10 08:55:43 +00:00
Sorunome 7ddb6be30e
Allow requesting and updating of session keys with lower index and lower forwarded chain 2020-06-10 10:44:22 +02:00
Sorunome 9b00b9b158 Merge branch 'ChristianPauly-master-patch-69853' into 'master'
Hotfix setPushers

See merge request famedly/famedlysdk!340
2020-06-10 06:41:40 +00:00
Christian Pauly cf430cc546 Hotfix setPushers 2020-06-10 06:36:16 +00:00
Sorunome b8c58faaab Merge branch 'soru/modularize-e2ee' into 'master'
split encryption stuff to other library

See merge request famedly/famedlysdk!333
2020-06-09 16:13:23 +00:00
Sorunome cf56e81850 Merge branch 'ChristianPauly-master-patch-33412' into 'master'
Fix request openID

See merge request famedly/famedlysdk!339
2020-06-09 16:11:28 +00:00
Christian Pauly 0e33634e1a Fix request openID 2020-06-09 16:05:41 +00:00