wmwragg
721baf8d42
Tolltip tweak to not require the passing in of the parent
2016-09-04 07:42:09 +01:00
wmwragg
5417385c83
Tolltip thweak to not require the passing in of the parent
2016-09-04 07:41:48 +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
c2d8067523
Testing to see if having the header badges when collapsed is usable
2016-09-03 14:55:35 +01:00
wmwragg
52bd61a2f0
When collapsed a long hover on the header now shows the full tag name and room count
2016-09-03 14:48:10 +01:00
wmwragg
aee56a5bd1
z-index tweak for badge, so it does sit aboce the header
2016-09-03 14:47:36 +01:00
wmwragg
7f52fa74a4
Better comments, and syntax tweak
2016-09-03 14:14:11 +01:00
wmwragg
d1dd4bd3d8
Updated tooltip styling to be better inline with the design
2016-09-03 13:57:49 +01:00
wmwragg
03e74f48f8
Positioned Tooltip better
2016-09-03 13:44:44 +01:00
wmwragg
ab9f48cd47
Restyled tooltip to better match the design
2016-09-03 13:44:00 +01:00
Matthew Hodgson
c597f05e71
Merge branch 'develop' into matthew/notif-panel
2016-09-03 13:33:37 +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
80e6cd6d7c
Further tweaks to the tooltip to better handle its position, and simplify it's use
2016-09-03 12:44:09 +01:00
wmwragg
cb101b0a3b
Allow better updating if the tooltip is designed to stick around, rather than just appearing on hover
2016-09-02 18:50:47 +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
wmwragg
bf4e3364b4
Tweak of the RoomTooltip to use DOM element for the parent rather than a React component
2016-09-02 18:41:27 +01:00
Matthew Hodgson
dbd17ea953
improve e2e warning a bit
2016-09-02 17:37:16 +01:00
Matthew Hodgson
0494dff545
Merge branch 'master' into develop
2016-09-02 17:23:02 +01:00
Remi Rampin
d5865421bd
Open commits in new window/tab from changelog
2016-09-02 12:22:51 -04:00
Remi Rampin
8578203073
Open HTML commit page for changelog entries
2016-09-02 12:22:15 -04:00
Matthew Hodgson
e63e6e7016
0.7.5-r3
2016-09-02 17:21:30 +01:00
Matthew Hodgson
dec62ab92c
bump react-sdk
2016-09-02 17:20:23 +01:00
Matthew Hodgson
67d38bfab8
Prepare changelog for v0.7.5-r3
2016-09-02 17:20:08 +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
wmwragg
d2e2c726eb
Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari
2016-09-02 15:45:43 +01:00
Matthew Hodgson
00d53e4824
css for conf join
2016-09-02 15:38:40 +01:00
Matthew Hodgson
f9d8829ba2
let you join confs either as voice or video
2016-09-02 15:38:28 +01:00
Matthew Hodgson
4ce80a0837
fix dialog css
2016-09-02 14:39:44 +01:00
Richard van der Hoff
9aa59fa358
Merge pull request #2069 from vector-im/rav/update_olm
...
Bump to olm 1.1.0
2016-09-02 12:02:27 +01:00
Richard van der Hoff
6c8a492637
Bump to olm 1.1.0
...
Olm 1.0.0 made broken OlmAccounts.
2016-09-02 12:01:27 +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
9709a38250
merge master
2016-09-01 22:38:40 +01:00
Matthew Hodgson
06ca94c1e6
0.7.5-r2
2016-09-01 22:29:36 +01:00
