Matthew Hodgson
67d3368e1e
fix up some of the modals
2015-07-21 17:02:06 -07:00
Matthew Hodgson
ceb214f192
skin dialogs correctly
2015-07-21 16:48:55 -07:00
Matthew Hodgson
aaa96f1ac1
vicious rewrite of the CSS to support the notifications toolbar, removing all height: 100%'s and letting the flexbox stuff calculate auto-height instead. may have slowed down the rendering, especially when the toolbar is visible
2015-07-21 15:03:05 -07:00
David Baker
e03809b224
Merge pull request #16 from matrix-org/markjh/end-to-end
...
Add basic support for end-to-end crypto using olm.
2015-07-21 13:21:43 -07:00
Matthew Hodgson
8dc73cb6cc
finally fix dave's MemberInfo visibility bug, hopefully
2015-07-21 11:03:01 -07:00
Kegan Dougal
2698405e2f
Add MatrixToolbar CSS. Make the toolbar part of RoomView and don't cover the UI (shift it instead)
2015-07-21 16:17:50 +01:00
David Baker
71f5d1f6cb
Use bind to take variable value rather than reference: make room directory able to join rooms
2015-07-21 08:05:58 -07:00
David Baker
4679e005bf
Merge pull request #14 from matrix-org/erikj/room_editing
...
Room Settings.
2015-07-21 07:38:10 -07:00
Erik Johnston
c5d84562ba
Move logic from view to controller
2015-07-21 15:24:10 +01:00
Erik Johnston
16846c36fd
Handle default named rooms when editing room names
2015-07-21 14:48:07 +01:00
Kegan Dougal
2fe56fd86d
Re-add the notifications button.
2015-07-21 14:45:32 +01:00
Erik Johnston
b8e1927e82
Use getDefaultProps instead of setting porps
2015-07-21 14:14:15 +01:00
Erik Johnston
d81260c92a
Use getDefaultProps instead of setting porps
2015-07-21 14:13:59 +01:00
Mark Haines
726ee7b50b
Hook up the encrypt button when creating rooms
2015-07-21 12:03:15 +01:00
Erik Johnston
085e07c5b1
Display error on fail
2015-07-21 11:26:08 +01:00
Erik Johnston
0e9074b0de
Remove console.logs
2015-07-21 11:22:11 +01:00
Erik Johnston
2bec7ec981
Add spinner while uploading state
2015-07-21 11:02:36 +01:00
Erik Johnston
0b1b6057d6
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-21 10:39:46 +01:00
Matthew Hodgson
12c824323d
rename DirectoryMenu as BottomLeftMenu and implement a really really really basic RoomDirectory
2015-07-20 20:11:33 -07:00
Matthew Hodgson
fe71f69f0a
rename EditableText's placeHolder parameter to be 'label' to avoid colliding with the HTML5 placeholder parameter
2015-07-20 20:11:33 -07:00
Matthew Hodgson
dcecdc8260
lipstick for hangup button and typing notifs
2015-07-20 12:09:24 -07:00
Erik Johnston
813cf0481e
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-20 18:18:04 +01:00
Kegan Dougal
5d59a5b297
Change opacity of member list entries when their presence changes.
...
This is done by attaching a single room listener at the member list level and
then forceUpdate()ing the individual tiles as presence changes come in from
the JS SDK. This is more efficient than having hundreds of listeners attached
directly to the JS SDK (if we were to add a listener per tile).
2015-07-20 17:42:19 +01:00
Erik Johnston
3a7ebf73eb
Wire up changing of power levels
2015-07-20 17:31:40 +01:00
Erik Johnston
1b6ca2b0ee
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-20 16:31:02 +01:00
Erik Johnston
eae0972820
Add files. Add power levels to room settings
2015-07-20 16:28:23 +01:00
Kegan Dougal
6fe842e130
Add ErrorDialog class. Use it for VoIP/command errors.
2015-07-20 16:26:53 +01:00
Matthew Hodgson
bb06484732
fix up MemberInfo behaviour
2015-07-20 08:24:53 -07:00
Erik Johnston
04f17c963c
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-20 16:03:35 +01:00
Erik Johnston
0039ccf203
Add ability to edit room settings
2015-07-20 15:07:51 +01:00
Kegan Dougal
f2bd802bdc
Wire up invite button on the member list.
2015-07-20 15:07:19 +01:00
David Baker
29b4f59982
Basically working upload progress bar.
2015-07-19 22:55:17 -07:00
David Baker
b82d932a51
Logout button
2015-07-19 22:55:17 -07:00
David Baker
e1f3c80f19
Display who's typing
2015-07-19 16:38:56 +01:00
Matthew Hodgson
00d2d82a14
new style badges, hr, notices
2015-07-18 01:21:56 +01:00
Matthew Hodgson
b685e784f1
oops, unbreak selectedRoom. sorry dave
2015-07-18 00:48:17 +01:00
Matthew Hodgson
10cdf46c2c
s/that/self/g
2015-07-17 21:59:48 +01:00
Matthew Hodgson
d4541f54a3
fix up memberlist a bit more
2015-07-17 21:29:54 +01:00
David Baker
6a76d8ace8
Update room header when room name changes
2015-07-17 13:48:24 +01:00
David Baker
37108ac56c
Make notifications sensible again and have information once and only once.
2015-07-17 11:57:26 +01:00
David Baker
1b03aa8119
Display nick changes and factor out getting text for events into a common place.
2015-07-17 11:57:26 +01:00
Erik Johnston
789e70f2d6
Remove old atoms
2015-07-16 18:07:28 +01:00
David Baker
03733e6a0f
Merge pull request #9 from matrix-org/create_room
...
Wire in create room.
2015-07-16 17:37:48 +01:00
Erik Johnston
68d60aadd1
Make Presets stateless
2015-07-16 17:24:33 +01:00
Erik Johnston
aa1b763518
Make CreateRoom remember what the values of its fields were. Remove some fairly pointless atoms
2015-07-16 17:20:03 +01:00
Kegan Dougal
6b81022e28
Move position of incoming call buttons.
2015-07-16 16:32:21 +01:00
Erik Johnston
47f4c0dfff
Use Loader
2015-07-16 16:20:00 +01:00
Erik Johnston
cd26d1323f
Wire together checkboxes and presets and use new /createRoom api
2015-07-16 15:55:46 +01:00
Erik Johnston
c708976635
Wire up CreateRoom to UI.
2015-07-16 13:49:34 +01:00
David Baker
a6f857e9d8
Merge pull request #6 from matrix-org/voip
...
VoIP addition
2015-07-16 12:31:36 +01:00
