0067f49d52feat: close registration with ROCKET_REGISTRATION_DISABLED=true
timokoesters
2020-06-06 19:02:31 +02:00
c85d363d71feat: user interactive authentication
timokoesters
2020-06-06 18:44:50 +02:00
88d091fca1Merge pull request 'Allow client to load history on newly joined rooms' (#111) from gnieto/conduit:fix/issue-39-history-load into master
Timo Kösters
2020-06-07 11:21:53 +02:00
c655870d23Merge pull request 'Small fixes' (#98) from fix into master
Timo Kösters
2020-06-04 12:05:54 +02:00
168f2281fdimprovement: bundle typing events and only send on changes
timokoesters
2020-06-04 11:17:36 +02:00
8328eeb5acMake sytest not fail
timokoesters
2020-06-03 14:16:56 +02:00
1c85b0fd05remove tests in favor of sytests
timokoesters
2020-06-03 21:29:02 +02:00
b192fddf2ffix: show device display names
timokoesters
2020-06-03 20:55:11 +02:00
325e373684refactor: small changes
timokoesters
2020-06-03 16:24:00 +02:00
19c9e4b916fix: room version 6
timokoesters
2020-06-02 19:32:18 +02:00
77318af563Merge pull request 'Implement devices API (#20)' (#97) from fix into master
Timo Kösters
2020-06-03 14:12:01 +02:00
0883c44659Implement devices API (#20)
gnieto
2020-06-03 13:41:30 +02:00
ed9b544aceImplement devices API (#20)
gnieto
2020-06-03 13:41:30 +02:00
720d48bd67Merge pull request 'get_state_events_for_key_route returns the content of the requested event instead of the all event.' (#95) from jbbouille/conduit:fix-get_state_events_for_key_route-returning-all-event into master
Timo Kösters
2020-06-03 10:27:13 +02:00
1222289c75get_state_events_for_key_route return the content of the requested event instead of the all event.
Jean-Baptiste Petit
2020-06-03 09:30:34 +02:00
0a1c4f3649Merge pull request 'Black list temporaly some room creation tests.' (#50) from jbbouille/conduit:blacklist_some_creation_room_tests into master
Timo Kösters
2020-06-02 14:44:51 +02:00
75e75c3b2fBlack list temporaly some room creation tests.
Jean-Baptiste Petit
2020-06-02 13:57:41 +02:00
4c2c0e2458Merge pull request 'Better notifications and fix redactions' (#44) from notification into master
Timo Kösters
2020-06-01 22:25:24 +02:00
5a47c75427fix: make redactions permanent
timokoesters
2020-06-01 20:58:49 +02:00
b519bc6962fix: only show notifications for messages
timokoesters
2020-05-31 19:40:01 +02:00
3aa0c8ed25Merge pull request 'Room visibility, aliases and redaction' (#40) from alias into master
Timo Kösters
2020-05-31 10:23:04 +02:00
4e507ef706feat: room visibility and aliases
timokoesters
2020-05-25 23:24:13 +02:00
9c26e22ad7improvement: load aliases from database
timokoesters
2020-05-24 08:30:57 +02:00
16538a6c16Update 'README.md'
Timo Kösters
2020-05-29 10:04:19 +02:00
55842a0e57Update 'README.md'
Timo Kösters
2020-05-29 09:54:30 +02:00
25ebde5af8Merge pull request 'fix: /register lowercases user ids' (#28) from lowercase into master
Timo Kösters
2020-05-27 08:26:32 +02:00
ca77c79222fix: /register lowercases user ids
timokoesters
2020-05-27 07:09:23 +02:00
dd80a8591dMerge pull request 'Get device_id from body instead of auth data' (#27) from gnieto/conduit:fix/create-device into master
Timo Kösters
2020-05-27 07:03:21 +02:00
4b3b562347Get device_id from body instead of auth data
Guillem Nieto
2020-05-26 21:06:54 +02:00
d0e5a39d1dMerge pull request 'Move create room test into blacklist - fixes#23' (#26) from jbbouille/conduit:remove_create_public_room_test into master
Timo Kösters
2020-05-26 16:57:11 +02:00
43ed80c6c2Move create room test into blacklist - fixes#23
Jean-Baptiste Petit
2020-05-26 16:01:38 +02:00
58683585ccimprovement: show more info in public rooms list
timokoesters
2020-05-25 20:10:46 +02:00
63c62a4afaUpdate 'README.md'
Timo Kösters
2020-05-25 17:36:54 +02:00
1096c2847bMerge pull request 'Access control' (#22) from control into master
Timo Kösters
2020-05-25 16:59:40 +02:00
b6c0e9bfb2feat: access control
timokoesters
2020-05-24 18:25:52 +02:00