63695 Commits

Author SHA1 Message Date
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 v0.7.5-r2 2016-09-01 22:29:36 +01:00
Matthew Hodgson 67255e3f84 Prepare changelog for v0.7.5-r2 2016-09-01 22:29:36 +01:00
Matthew Hodgson a20962ac14 bump to react-sdk v0.6.5-r1 2016-09-01 22:28:39 +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 b4cf86a362 fix padding-top for unread msgs 2016-09-01 17:00:52 +01:00
Matthew Hodgson 1bc26cb6c5 fix guest access; broken since Aug 18 2016-09-01 16:58:37 +01:00
wmwragg bf8d7050cc New People icon in place of Directory icon, and placeholder functionality 2016-09-01 16:46:51 +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 49e5fa41ad fix overscroll on view source 2016-09-01 16:06:50 +01:00
Matthew Hodgson e069d808f8 Merge pull request #2056 from jansol/develop
Improve readability of the changelog dialog
2016-09-01 15:16:46 +01:00
Matthew Hodgson f0d5f42921 whine loudly if remoteAudio element is missing 2016-09-01 13:58:26 +01:00
Jan Solanti e85674711c Improve readability of the changelog dialog 2016-09-01 15:13:09 +03: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 7a89328ccb file upload when on call 2016-09-01 00:38:37 +01:00
Matthew Hodgson e77e6c2af0 fix typing notif layout 2016-09-01 00:35:07 +01:00
Matthew Hodgson ad26631874 fix icon layout 2016-09-01 00:33:45 +01:00
Matthew Hodgson cc75eb8b0e fix statusbar height and behaviour during voip calls 2016-09-01 00:14:51 +01:00
Matthew Hodgson 735da3c15e show ongoing audio call in LeftPanel CSS 2016-09-01 00:14:32 +01:00
Matthew Hodgson 56dfdbeb6b call noisy notifs... noisy 2016-09-01 00:14:01 +01:00
Matthew Hodgson eaf47ea05c show ongoing audio call in LeftPanel 2016-09-01 00:13:49 +01:00
Matthew Hodgson a23d8e313d show ongoing audio call in LeftPanel 2016-09-01 00:13:32 +01:00