wmwragg
67c623d410
Rename the action to make it clearer what it is doing
2016-09-05 10:29:03 +01:00
Kegsay
6e2fd85760
Merge pull request #437 from matrix-org/kegan/starter-links
...
Implement starter link support
2016-09-05 09:10:39 +01:00
Kegan Dougal
56ac0004e5
Use href='#' hack to make link text look like a link
2016-09-05 09:10:15 +01:00
Richard van der Hoff
922fb448c5
Merge pull request #442 from matrix-org/rav/e2e_devices
...
Convert MemberDeviceInfo to ES6 class
2016-09-05 00:53:47 +01:00
Richard van der Hoff
fc40bdcbfc
Make MemberInfo to use client.getStoredDevicesForUser
...
It's more powerful than listDeviceKeys, and isn't deprecated.
2016-09-05 00:08:16 +01:00
Richard van der Hoff
a316c652b7
Convert MemberDeviceInfo to ES6 class
2016-09-04 21:49:06 +01:00
wmwragg
f9ab2fa957
When zoomed in, the sticky headers should correctly position themselves
2016-09-04 08:01:04 +01:00
wmwragg
721baf8d42
Tolltip tweak to not require the passing in of the parent
2016-09-04 07:42:09 +01:00
Richard van der Hoff
941dcc7e87
Merge pull request #439 from matrix-org/rav/enable_megolm_encryption
...
Make the 'encrypt this room' knob be megolm
2016-09-03 18:50:28 +01:00
Richard van der Hoff
bc8e7724e8
Make the 'encrypt this room' knob be megolm
2016-09-03 18:42:54 +01:00
wmwragg
03e74f48f8
Positioned Tooltip better
2016-09-03 13:44:44 +01:00
Matthew Hodgson
fdfd6ecfd9
let users join confs as voice or video
2016-09-03 13:27:46 +01:00
wmwragg
405dcf76eb
Further tweaks to the tooltip to better handle its position, and simplify it's use
2016-09-03 12:44:55 +01:00
wmwragg
bffefd9261
Tweak of the RoomTooltip to use DOM element for the parent rather than a React component
2016-09-02 18:41:44 +01:00
Matthew Hodgson
dbd17ea953
improve e2e warning a bit
2016-09-02 17:37:16 +01:00
Matthew Hodgson
b5f9c2a5ac
Merge branch 'master' into develop
2016-09-02 17:17:24 +01:00
Matthew Hodgson
14227b5718
0.6.5-r3
2016-09-02 17:17:01 +01:00
Matthew Hodgson
714060ec8f
Prepare changelog for v0.6.5-r3
2016-09-02 17:17:00 +01:00
Matthew Hodgson
d5062f1ff7
gah, revert debug
2016-09-02 17:15:21 +01:00
Matthew Hodgson
fd664e893f
Merge branch 'master' into develop
2016-09-02 17:14:24 +01:00
Matthew Hodgson
c2ca261085
0.6.5-r2
2016-09-02 17:13:59 +01:00
Matthew Hodgson
6de2e8bda5
update changelog
2016-09-02 17:13:52 +01:00
Richard van der Hoff
fd0ed4a406
Show something when we see a no-op join event
...
As a very quick hack to work around
https://github.com/vector-im/vector-web/issues/2020 , don't supress no-op joins
2016-09-02 16:59:42 +01:00
Matthew Hodgson
8e9c04e1aa
Merge pull request #438 from matrix-org/rav/matrix_dev_hack
...
Show something when we see a no-op join event
2016-09-02 16:58:29 +01:00
Richard van der Hoff
f5fe4b2433
Show something when we see a no-op join event
...
As a very quick hack to work around
https://github.com/vector-im/vector-web/issues/2020 , don't supress no-op joins
2016-09-02 16:54:27 +01:00
Kegan Dougal
45ada1887d
Implement starter link support
...
This involves modal dialogs because browsers are *terrible*.
2016-09-02 16:36:43 +01:00
Kegan Dougal
6ec7e5df28
Move scalar auth stuff to ScalarAuthClient from RoomSettings
2016-09-02 16:03:24 +01:00
wmwragg
4c05edb71b
Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari
2016-09-02 15:47:40 +01:00
Matthew Hodgson
f9d8829ba2
let you join confs either as voice or video
2016-09-02 15:38:28 +01:00
Richard van der Hoff
d3bc2b7df7
Merge pull request #436 from matrix-org/rav/handle_broken_olm
...
Handle broken OlmAccounts
2016-09-02 11:58:40 +01:00
Richard van der Hoff
f3a1c58fa9
Handle broken OlmAccounts
...
olm 1.0.0 made broken OlmAccounts, which we may be unable to restore with olm
1.1.0. Add some words to that effect, and make sure we clear the localstorage.
2016-09-02 11:28:04 +01:00
Richard van der Hoff
584c7ed56d
Merge branch 'rav/show_session_load_errors' into develop
2016-09-02 11:03:39 +01:00
Richard van der Hoff
b4521bc44c
review feedback
2016-09-01 22:45:09 +01:00
Matthew Hodgson
1a4e236a50
Merge branch 'master' into develop
2016-09-01 22:18:32 +01:00
Matthew Hodgson
b9d98f918e
0.6.5-r1
2016-09-01 22:18:11 +01:00
Matthew Hodgson
57ba49d896
Prepare changelog for v0.6.5-r1
2016-09-01 22:18:10 +01:00
Matthew Hodgson
1586e5bd6f
fix guest access; broken since Aug 18
2016-09-01 22:16:55 +01:00
Matthew Hodgson
1bc26cb6c5
fix guest access; broken since Aug 18
2016-09-01 16:58:37 +01:00
wmwragg
e7d4ef74d0
Placeholder for one to one chat dialog and functionality
2016-09-01 16:45:24 +01:00
Matthew Hodgson
031daf7b3c
Merge pull request #434 from matrix-org/matthew/uninterrupted-audio
...
use a top-level audio tag for playing all VoIP audio.
2016-09-01 16:12:37 +01:00
Matthew Hodgson
f0d5f42921
whine loudly if remoteAudio element is missing
2016-09-01 13:58:26 +01:00
Richard van der Hoff
ba341c11fb
Show session restore errors on the login screen
...
If we are unable to load the matrix session on startup, don't just get stuck at
a spinner; instead, show the error on the login screen.
2016-09-01 11:08:40 +01:00
Matthew Hodgson
4829ac0c4d
comment
2016-09-01 11:07:46 +01:00
Matthew Hodgson
a23d8e313d
show ongoing audio call in LeftPanel
2016-09-01 00:13:32 +01:00
Matthew Hodgson
6c4ad49b78
use a top-level audio tag for playing all VoIP audio.\n\nfixes https://github.com/vector-im/vector-web/issues/1271 and https://github.com/vector-im/vector-web/issues/621
2016-08-31 21:50:46 +01:00
Matthew Hodgson
dae250b3a3
Merge pull request #433 from matrix-org/matthew/audio-promises
...
use promises to mediate access to HTMLAudioElements
2016-08-31 21:00:36 +01:00
Matthew Hodgson
35fff74477
oops, typo
2016-08-31 17:25:41 +01:00
Matthew Hodgson
516369fb07
use promises to mediate access to HTMLAudioElements
2016-08-31 16:38:37 +01:00
Matthew Hodgson
5543c126e6
fix tests
2016-08-30 15:22:52 +01:00
Matthew Hodgson
3b2faa4cf9
pin to dev
2016-08-30 13:54:35 +01:00
