dbd17ea953
improve e2e warning a bit
2016-09-02 17:37:16 +01:00
b5f9c2a5ac
Merge branch 'master' into develop
2016-09-02 17:17:24 +01:00
14227b5718
0.6.5-r3
2016-09-02 17:17:01 +01:00
714060ec8f
Prepare changelog for v0.6.5-r3
2016-09-02 17:17:00 +01:00
d5062f1ff7
gah, revert debug
2016-09-02 17:15:21 +01:00
fd664e893f
Merge branch 'master' into develop
2016-09-02 17:14:24 +01:00
c2ca261085
0.6.5-r2
2016-09-02 17:13:59 +01:00
6de2e8bda5
update changelog
2016-09-02 17:13:52 +01:00
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
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
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
45ada1887d
Implement starter link support
...
This involves modal dialogs because browsers are *terrible*.
2016-09-02 16:36:43 +01:00
6ec7e5df28
Move scalar auth stuff to ScalarAuthClient from RoomSettings
2016-09-02 16:03:24 +01:00
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
f9d8829ba2
let you join confs either as voice or video
2016-09-02 15:38:28 +01:00
d3bc2b7df7
Merge pull request #436 from matrix-org/rav/handle_broken_olm
...
Handle broken OlmAccounts
2016-09-02 11:58:40 +01:00
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
584c7ed56d
Merge branch 'rav/show_session_load_errors' into develop
2016-09-02 11:03:39 +01:00
b4521bc44c
review feedback
2016-09-01 22:45:09 +01:00
1a4e236a50
Merge branch 'master' into develop
2016-09-01 22:18:32 +01:00
b9d98f918e
0.6.5-r1
2016-09-01 22:18:11 +01:00
57ba49d896
Prepare changelog for v0.6.5-r1
2016-09-01 22:18:10 +01:00
1586e5bd6f
fix guest access; broken since Aug 18
2016-09-01 22:16:55 +01:00
1bc26cb6c5
fix guest access; broken since Aug 18
2016-09-01 16:58:37 +01:00
e7d4ef74d0
Placeholder for one to one chat dialog and functionality
2016-09-01 16:45:24 +01:00
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
f0d5f42921
whine loudly if remoteAudio element is missing
2016-09-01 13:58:26 +01:00
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
4829ac0c4d
comment
2016-09-01 11:07:46 +01:00
a23d8e313d
show ongoing audio call in LeftPanel
2016-09-01 00:13:32 +01:00
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
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
35fff74477
oops, typo
2016-08-31 17:25:41 +01:00
516369fb07
use promises to mediate access to HTMLAudioElements
2016-08-31 16:38:37 +01:00
5543c126e6
fix tests
2016-08-30 15:22:52 +01:00
3b2faa4cf9
pin to dev
2016-08-30 13:54:35 +01:00
7a2b7b5b66
Merge pull request #432 from matrix-org/wmwragg/direct-chat-sublist
...
Wmwragg/direct chat sublist
2016-08-30 12:56:31 +01:00
c30ff57c62
Better comments
2016-08-30 12:29:25 +01:00
8061a2f279
Fixed historical scetion not scrolling up when clicked if not hidden and stuck
2016-08-30 11:55:51 +01:00
769e7d3b2e
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-30 11:19:54 +01:00
83c4fd4b2f
Code clean up, and better comments
2016-08-30 10:45:17 +01:00
2b1ed707c4
Better comments, and correct bottom header sticky calc to allow clicking
2016-08-28 19:18:41 +01:00
90cfb06ba3
0.6.5
2016-08-28 16:55:04 +01:00
4e169f8e00
Prepare changelog for v0.6.5
2016-08-28 16:55:04 +01:00
3dd337b553
dep on 0.5.6 of matrix-js-sdk
2016-08-28 16:51:51 +01:00
123d9b56c8
calculating the scrollAreaHeight correctly taking into account the different scroll methods available on macOSX, i.e. System Preferences>General>Show Scroll Bars
2016-08-28 16:25:20 +01:00
5e105e1be6
make /user URLs work
2016-08-28 14:04:11 +01:00
8f7d3394e6
Always setup stickies, even if we aren't going to use them so that the following map can fire
2016-08-28 12:02:20 +01:00
cd07907392
Merge pull request #431 from aviraldg/fix-emojione-sizing
...
fix emojione sizing
2016-08-28 11:55:14 +01:00
7631539584
Fixed incorrect init calculation of originalPosition attribute
2016-08-28 11:39:47 +01:00
Matthew Hodgson