Kegan Dougal
42c9766203
s/did/will/
2015-07-16 14:39:15 +01:00
Kegan Dougal
6fbb7d7da4
Implement nick completion (tab-complete).
...
Including SHIFT+TAB to go backwards and the 'blink' css (which may need to be
factored out of the view). Mostly ported from Angular.
2015-07-16 14:25:57 +01:00
David Baker
cf38b8a5bb
Merge branch 'master' into vector
2015-07-16 14:19:50 +01:00
David Baker
a6df6ca29b
Don't forget form values on error
2015-07-16 14:19:13 +01:00
David Baker
7aa4d50560
Handle registration errors.
2015-07-16 14:08:52 +01:00
Erik Johnston
c708976635
Wire up CreateRoom to UI.
2015-07-16 13:49:34 +01:00
Kegan Dougal
0a3a3dac1a
Display call logs in the UI.
...
Display placed/incoming calls, answers and hangups.
2015-07-16 13:30:14 +01:00
Kegan Dougal
c4379e4827
Remove 'status' from payload; unused.
2015-07-16 12:57:59 +01:00
David Baker
41f659db4c
Merge branch 'master' into vector
2015-07-16 12:44:42 +01:00
David Baker
df790c1b54
Refactor view/controller logic between files, fix syntax & silly bugs.
2015-07-16 12:44:04 +01:00
David Baker
a6f857e9d8
Merge pull request #6 from matrix-org/voip
...
VoIP addition
2015-07-16 12:31:36 +01:00
Kegan Dougal
5f3721f471
Tidying up
2015-07-16 11:54:53 +01:00
Kegan Dougal
c056bdf104
Only allow calls to be placed if there are 2 joined members.
2015-07-16 11:34:39 +01:00
Kegan Dougal
50f9d34211
Only display video elements in video calls.
2015-07-16 11:30:34 +01:00
Kegan Dougal
eedd437ca7
Minimal CSS bodge so the video actually dies when the call ends.
2015-07-16 11:21:43 +01:00
Kegan Dougal
7ffd97b5dc
Implement call FSM. All works.
2015-07-16 11:05:09 +01:00
David Baker
73a1c2b581
Merge pull request #5 from matrix-org/user_settings
...
User settings
2015-07-16 10:56:28 +01:00
Erik Johnston
5d9db52b32
I just couldn't help myself
2015-07-16 10:53:51 +01:00
Erik Johnston
f17a9b14c2
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into user_settings
2015-07-16 10:46:40 +01:00
Erik Johnston
3555f35737
Check to make sure passwords aren't blank
2015-07-16 10:43:16 +01:00
Erik Johnston
ca593b8544
Remove commented out code
2015-07-16 10:39:58 +01:00
Erik Johnston
5d99abf18c
Correctly pull in client version from package.json
2015-07-16 10:38:00 +01:00
David Baker
139b92fcd6
Merge branch 'master' into vector
2015-07-16 10:33:53 +01:00
Kegan Dougal
ecd1f09095
Glue in video elements.
2015-07-16 10:26:41 +01:00
Erik Johnston
02045858f7
Wire up change password
2015-07-16 10:23:31 +01:00
David Baker
e2757b3587
Merge pull request #4 from matrix-org/registration
...
Registration
2015-07-16 09:58:53 +01:00
David Baker
931a4f29c8
Argh, accidentally committed again
2015-07-16 09:57:14 +01:00
Erik Johnston
edc3302d89
Fix broken RoomView CSS due to name clashes and splitting an element in
...
two.
2015-07-16 09:43:05 +01:00
Erik Johnston
bc93aeb50e
Flesh out the user_settings page
2015-07-16 09:37:58 +01:00
Erik Johnston
1b4358624f
Add a basic modal dialog implementation
2015-07-16 09:37:14 +01:00
David Baker
77114e0081
Improve registration so the container page can pick what URL it's going to route through to registration.
2015-07-15 20:33:12 +01:00
David Baker
23d9cee299
didn't mean to commit that
2015-07-15 19:30:10 +01:00
David Baker
4756427e61
First cut working regisatration
2015-07-15 19:25:36 +01:00
Kegan Dougal
4f132c418f
Fix a couple state bugs.
2015-07-15 17:48:26 +01:00
Kegan Dougal
14a4da54f8
Wire up hangup/answer buttons.
2015-07-15 17:36:47 +01:00
Kegan Dougal
37c9c8fbb4
Add CallHandler singleton and add CallView.
...
CallView is the container for either VideoViews or WaveformViews. All UI
elements listen for 'call_state' payloads and then call
CallHandler.getCall(roomId) to extract the current MatrixCall for that room.
We can't do this via stateful dispatches because dispatching does not preserve
ordering empirically (probably due to setTimeout).
2015-07-15 16:52:23 +01:00
Kegan Dougal
6316f1b195
Add call handling logic. Outbound voice calls work!
2015-07-15 15:36:45 +01:00
Erik Johnston
2b81f46030
Add placeHolder prop for EditableText
2015-07-15 15:04:39 +01:00
Erik Johnston
dfd54f3b95
Basic structure of user settings
2015-07-15 15:04:24 +01:00
Kegan Dougal
7e30c0f47b
Add CallHandler to handle call logic and make VideoViews/WaveformViews.
2015-07-15 14:57:52 +01:00
Kegan Dougal
28cebab9a3
Add voip subdirectory.
2015-07-15 14:35:04 +01:00
Kegan Dougal
7cbb43fddb
Merge branch 'vector' into voip
...
Conflicts:
src/ComponentBroker.js
2015-07-15 14:21:58 +01:00
Kegan Dougal
78bea916e1
Dispatch events when calls are made/received.
2015-07-15 14:06:44 +01:00
Erik Johnston
844a883ad8
Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector
2015-07-15 13:59:24 +01:00
David Baker
fe98d6ec69
Merge pull request #3 from matrix-org/editable_text
...
Add an editable text atom
2015-07-15 13:58:26 +01:00
Erik Johnston
5cd92229eb
Add an editable text atom
2015-07-15 13:55:43 +01:00
Kegan Dougal
f94a061fda
Add onClick listeners. Add getters for refs.
2015-07-15 13:34:11 +01:00
Kegan Dougal
aba103b8e0
Add VideoFeed atom and VideoView organism.
2015-07-15 13:09:15 +01:00
Erik Johnston
2fc08aeb12
Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector
2015-07-15 10:36:47 +01:00
David Baker
e0fae13b76
Merge pull request #2 from matrix-org/create_room
...
CreateRoom organism
2015-07-15 10:24:44 +01:00
