Commit graph

3150 commits

Author SHA1 Message Date
wmwragg
391fe0ab77 Basic address list created, and UX tweaks for interaction 2016-09-06 15:24:23 +01:00
wmwragg
ddf1e4841a Selecting users with arrow keys added 2016-09-06 13:07:06 +01:00
wmwragg
1fe85f37fd Correct AddressTile and ChatInviteDialog styling, and performance tweak to searching 2016-09-06 11:34:38 +01:00
Luke Barnard
cb4df84d49 Missing curly bracket 2016-09-06 10:36:44 +01:00
Luke Barnard
fa3387b326 Code review
- use an empty state key
- swap switch for if
- s/not in view/not visible/
2016-09-06 10:29:38 +01:00
David Baker
80dd927275 Merge pull request #445 from matrix-org/dbkr/fix_hide_conference_rooms
Fix: conference rooms were no longer hidden
2016-09-05 18:39:15 +01:00
David Baker
04889a89ec Only count rooms we're in as DM rooms 2016-09-05 18:35:32 +01:00
Richard van der Hoff
83296512fd Merge pull request #444 from matrix-org/dbkr/fix_conf_error
Fix error dialog on conf call error
2016-09-05 17:47:30 +01:00
David Baker
50ef695740 Fix: conference rooms were no longer hidden 2016-09-05 17:42:22 +01:00
wmwragg
5ed680e5ce Picking the top of the queryList not _userList, as the queryList is the query filtered _userList 2016-09-05 17:34:20 +01:00
wmwragg
3dd84e2b8a Initial AddressTile added 2016-09-05 17:28:08 +01:00
David Baker
d782d5bbc7 Fix error dialog on conf call error 2016-09-05 17:03:10 +01:00
Luke Barnard
310e6602ca Fix ref to dispatcher 2016-09-05 15:24:05 +01:00
Luke Barnard
efccdab0ad Better error message for room not viewed 2016-09-05 15:16:22 +01:00
Luke Barnard
1c29c95990 Only current room works with postMessage 2016-09-05 15:13:48 +01:00
Luke Barnard
54f21c9acc Expose join rules of a room 2016-09-05 14:58:16 +01:00
wmwragg
d9c6448a0f Adding better deafults and ErrorDialog message 2016-09-05 14:29:21 +01:00
wmwragg
3d66dff0aa Basic ChatInviteDialog functionality - Creates new room, and tries to invite the address typed into the text box, and reports errors, if any 2016-09-05 14:16:21 +01:00
wmwragg
9c0f51fb82 Merge branch 'develop' into wmwragg/one-to-one-chat 2016-09-05 12:06:31 +01:00
wmwragg
ca443e01d8 Initial commit of the new ChatInviteDialog 2016-09-05 12:03:16 +01:00
Richard van der Hoff
31e09e6137 Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user
Make MemberInfo to use client.getStoredDevicesForUser
2016-09-05 10:38:24 +01:00
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