Commit graph

612 commits

Author SHA1 Message Date
Marcel 29c677e5ba Merge branch 'contactlist-enhance-requestbyroom' into 'master'
[ContactList] Fallback with old loadContacts

See merge request famedly/famedlysdk!55
2019-07-26 14:07:29 +00:00
Christian dd5814cd58 [ContactList] Fallback with old loadContacts 2019-07-26 14:07:29 +00:00
Marcel 20a189ecd8 Merge branch 'contactlist-enhance-requestbyroom' into 'master'
[Contactlist] Better contact handling

See merge request famedly/famedlysdk!54
2019-07-26 13:09:53 +00:00
Christian Pauly 01d6b511ca [Tests] Fix tests 2019-07-26 15:05:46 +02:00
Christian Pauly a97e96bf72 [Store] Include invite 2019-07-26 14:57:56 +02:00
Christian Pauly ffd4eb508e [Store] Fix query 2019-07-26 14:57:12 +02:00
Christian Pauly fa88a5b2d4 [Store] Better directchat query 2019-07-26 14:55:17 +02:00
Christian Pauly d334968219 [Connection] Reenable lazy loading 2019-07-26 14:46:50 +02:00
Christian Pauly 8664954f27 [ContactList] Define contact list by discoveryRoom 2019-07-26 14:46:23 +02:00
Christian Pauly c95f4acecd [ContactList] Add functions 2019-07-26 14:00:12 +02:00
Christian a2abb87a79 Merge branch 'room-fix-name-requests' into 'master'
[Room] Fix change name requests

See merge request famedly/famedlysdk!52
2019-07-26 11:37:51 +00:00
Christian Pauly a48f1519b6 [Room] Fix changename requests 2019-07-26 13:32:18 +02:00
Marcel 670110e661 Merge branch 'store-fix-db-migration' into 'master'
[Store] fix db migration

See merge request famedly/famedlysdk!51
2019-07-26 10:34:12 +00:00
Marcel cc467bd6b1 Merge branch 'room-fix-correct-state-requests' into 'master'
[Room] Fix state requests

See merge request famedly/famedlysdk!50
2019-07-26 10:33:44 +00:00
Christian Pauly 98d22aaedd [Store] Back to prev db version 2019-07-26 11:06:33 +02:00
Christian Pauly 582065bf3d [Store] Fix debug 2019-07-26 11:05:35 +02:00
Christian Pauly 3441fb4964 [Store] Switch db version for testing 2019-07-26 11:02:50 +02:00
Christian Pauly 9d5296d4e0 [Store] Wait for table creation 2019-07-26 11:00:39 +02:00
Christian Pauly e1f83d8e83 [Store] Change DB version for testing 2019-07-26 10:57:44 +02:00
Christian Pauly d10a064dfe [Store] Better debugs 2019-07-26 10:56:27 +02:00
Christian Pauly e798e39433 [Room] Fix state requests 2019-07-26 10:05:08 +02:00
Phillipp Kurtz 9118311844 Merge branch 'store-fix-save-error-events' into 'master'
[Store] Fix storing of error events

See merge request famedly/famedlysdk!49
2019-07-25 08:42:12 +00:00
Christian 4668566ec0 [Store] Fix storing of error events 2019-07-25 08:42:11 +00:00
Marcel 036e50b1d1 Merge branch 'tests-enhance-coverage' into 'master'
[Tests] Add more tests

See merge request famedly/famedlysdk!48
2019-07-24 08:55:21 +00:00
Christian Pauly de55c201fc [Event] Make delete function async 2019-07-24 10:48:13 +02:00
Christian Pauly 4e3c1b271b [Sdk] Add Pusherrequests to sdk lib 2019-07-24 10:37:04 +02:00
Christian Pauly 02d9d33ba8 [Tests] Fix Client text 2019-07-24 10:20:05 +02:00
Christian Pauly b827bc7714 [Event] Add more tests 2019-07-24 10:13:02 +02:00
Christian Pauly f4252f2fc3 [Client] Add more tests 2019-07-24 09:59:29 +02:00
Christian d088e053ed Merge branch 'roomlist-fix-add-onevent' into 'master'
[RoomList] Fix environment pass

See merge request famedly/famedlysdk!47
2019-07-23 19:37:59 +00:00
Christian Pauly ef166a6ca1 [RoomList] Fix environment pass 2019-07-23 16:14:11 +02:00
Marcel a3079977bb Merge branch 'roomlist-fix-add-onevent' into 'master'
[RoomList] Add room on event update

See merge request famedly/famedlysdk!46
2019-07-23 13:32:53 +00:00
Christian Pauly a43f5048db [RoomList] Set hasName to false 2019-07-23 15:10:38 +02:00
Christian Pauly a38d43b167 [Room] hasName false by default 2019-07-23 15:07:31 +02:00
Christian Pauly 48746641ba [Room] Dynamic name generation 2019-07-23 15:03:16 +02:00
Christian Pauly ee883a8e84 [RoomList] Fix empty room 2019-07-23 14:50:09 +02:00
Christian Pauly 3e8b54d9f0 [RoomList] Add room on event update 2019-07-23 14:42:33 +02:00
Phillipp Kurtz 01a322d438 Merge branch 'store-fix-query' into 'master'
[Store] Fix db query

See merge request famedly/famedlysdk!45
2019-07-23 09:20:52 +00:00
Christian b7d8b53b46 [Store] Fix db query 2019-07-23 09:20:52 +00:00
Phillipp Kurtz f1c78b6406 Merge branch 'event-enhance-eventtypes' into 'master'
[Sending] Refactoring

See merge request famedly/famedlysdk!44
2019-07-23 09:09:13 +00:00
Christian cfb757df0f [Sending] Refactoring 2019-07-23 09:09:13 +00:00
Phillipp Kurtz b2ae29d65d Merge branch 'event-enhance-eventtypes' into 'master'
[Events] Add more EventTypes and tests

See merge request famedly/famedlysdk!43
2019-07-22 13:50:29 +00:00
Christian Pauly df7adbe5b6 [Events] Add more EventTypes and tests 2019-07-22 11:54:06 +02:00
Marcel ed6f502a83 Merge branch 'store-enhance-loadcontacts-exceptroomid' into 'master'
[Store] Add exceptRoomID to loadContacts

See merge request famedly/famedlysdk!42
2019-07-21 06:10:00 +00:00
Marcel 6380994f96 Merge branch 'ChristianPauly-master-patch-25369' into 'master'
[CI] Disable allow_failure for analyzer

See merge request famedly/famedlysdk!40
2019-07-21 06:09:18 +00:00
Christian d5759fd785 [CI] Disable allow_failure for analyzer 2019-07-21 06:09:17 +00:00
Christian Pauly 255eea6a4c [Store] Add exceptRoomID to loadContacts 2019-07-21 07:16:09 +02:00
Christian ce37f4b0cc Merge branch 'contributing-enhance-documentation' into 'master'
[contributing] Enhance the documentation.

See merge request famedly/famedlysdk!41
2019-07-20 08:30:58 +00:00
Christian 8beb13f311 [contributing] Enhance the documentation. 2019-07-20 08:30:58 +00:00
Marcel 0316795a49 Merge branch 'fix-classes-non-nullable' into 'master'
[Classes] Non nullable id and mxcurl

See merge request famedly/famedlysdk!39
2019-07-19 17:22:59 +00:00