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
David Baker
6fc910a259
Don't try to set page_type if not logged in
2015-07-21 11:12:59 -07:00
David Baker
959c0f0669
Order room members by lastActiveAgo
2015-07-21 11:05:54 -07:00
Kegan Dougal
2160440ff1
Add and impl resend button. Update UI when failing to send messages.
2015-07-21 18:05:22 +01:00
Mark Haines
f036a10a7d
Add missing src/encryption.js file
2015-07-21 17:00:57 +01:00
Mark Haines
6bb6eafdc0
Hook up slash commands to enable and disable encryption for a room so that we can experiment with encryption while we wait for the rest of the UI to exist
2015-07-21 16:46:17 +01:00
Kegan Dougal
e0496305aa
Log when presence is set.
2015-07-21 16:23:21 +01: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
Kegan Dougal
c1de5e9e95
Factor out logic from EnableNotificationsButton(!) and reuse MatrixToolbar.
...
Added notification logic to Notifier; dispatch notifier_enabled when toggled
so the toolbar can be shown/hidden and the button text can be kept in sync.
Add MatrixToolbar back into MatrixChat for notification nagging.
2015-07-21 16:17:50 +01:00
Erik Johnston
c5d84562ba
Move logic from view to controller
2015-07-21 15:24:10 +01:00
Erik Johnston
89f6459915
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-21 14:14:48 +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
Kegan Dougal
2454a71b38
Implement create/remove mod button.
2015-07-21 13:24:59 +01:00
Mark Haines
726ee7b50b
Hook up the encrypt button when creating rooms
2015-07-21 12:03:15 +01:00
Kegan Dougal
13f04f77dc
Tidy up power level logic. Add 'Moderator' label to members.
2015-07-21 11:43:18 +01:00
Kegan Dougal
2e2cecdd4f
Implement kick/ban/[un]mute buttons on member list dialogs.
2015-07-21 11:26:02 +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
David Baker
e0673eee29
Don't go & load the first room if we've already been told to load a different one.
2015-07-20 14:09:41 -07:00
David Baker
36b1280f0c
Bookmarkable room URLs
2015-07-20 12:20:35 -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
David Baker
0a3cddbd89
Merge pull request #13 from matrix-org/markjh/vector-cleanup-client-peg
...
Markjh/vector cleanup client peg
2015-07-20 10:12:16 -07:00
David Baker
e9b2cd1364
Allow input history to go forwards again to the empty field
2015-07-20 10:05:53 -07: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
Kegan Dougal
9d110d58e5
Manage presence of the client (same semantics as angular)
2015-07-20 17:14:29 +01:00
Kegan Dougal
bcab2f231a
Add error dialogs for invites and call timeouts.
2015-07-20 16:40:00 +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
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
Mark Haines
28022534f7
Fix the client-peg clean up to match the changes vector has made to the sdk
2015-07-20 14:28:02 +01:00
Mark Haines
d8494ff89b
Fix syntax
2015-07-20 14:01:52 +01:00
Mark Haines
715db89204
Move all the calls to createClient inside the MatrixClientPeg
2015-07-20 14:01:52 +01:00
Kegan Dougal
19ee75577e
Actually access state_key when getting target invite names...
2015-07-20 13:30:01 +01:00
Kegan Dougal
0baa2141fc
Wire up Start Chat button.
2015-07-20 13:22:56 +01:00
Kegan Dougal
08c16e0d7a
Hook up presence/last active up (live updating; no ticker for last active).
2015-07-20 11:37:48 +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
Matthew Hodgson
2121ddc295
add a MemberInfo list overlay as a mini user-profile page
2015-07-20 01:51:58 +01:00
David Baker
caa7f813eb
Bugfix sending of typing events
2015-07-19 17:29:41 +01:00
David Baker
e8b944c0e1
Sooner or later I'll get used to this.
2015-07-19 16:43:45 +01:00
David Baker
e1f3c80f19
Display who's typing
2015-07-19 16:38:56 +01:00
David Baker
73c8eb7738
Send typing notifs
2015-07-19 15:29:16 +01:00
David Baker
85748c09cf
Linkify emote tiles
2015-07-19 10:43:16 +01:00
Matthew Hodgson
1e1f7492d8
basic skin of incomingCallBox
2015-07-19 01:58:04 +01:00
Matthew Hodgson
919e1cf84f
unbreak voice calls
2015-07-19 00:36:23 +01:00
Matthew Hodgson
c83ff1c623
hide events with no text equiv
2015-07-18 19:06:36 +01:00
Matthew Hodgson
5a12a4a1a3
don't break the layout with unrecognised join events
2015-07-18 02:17:10 +01:00
Matthew Hodgson
10cdf46c2c
s/that/self/g
2015-07-17 21:59:48 +01:00
Matthew Hodgson
348aa3e5e1
fix up memberlist a bit more
2015-07-17 21:29:41 +01:00
David Baker
5f367f7c75
missing event listener remove
2015-07-17 19:01:11 +01:00
David Baker
5c7bef3107
Add topic changes to timeline by adding a tile that just uses TextForEvent
2015-07-17 18:49:48 +01:00
Matthew Hodgson
ddb426095e
/topic
2015-07-17 18:14:05 +01:00
David Baker
214ef4b4ce
Tidy up profile picture setting & fix notification bug
2015-07-17 17:13:51 +01:00
Kegan Dougal
812eb66ed5
Play ringback/busy/callend audio at the right times.
2015-07-17 17:05:11 +01:00
Kegan Dougal
827e777079
Implement ringing audio. Add other audio tags.
2015-07-17 16:42:26 +01:00
David Baker
ff567faeaa
Profile picture setting and notifdications thereof.
2015-07-17 16:41:46 +01:00
David Baker
a730804943
there is no content.target - it's state_key. Also, warn if no target
2015-07-17 15:55:36 +01:00
David Baker
1df8e65cdf
argh javascript
2015-07-17 14:42:36 +01:00
David Baker
383a958abe
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into vector
2015-07-17 14:36:15 +01:00
David Baker
9a79539978
missed removeventlistener
2015-07-17 14:35:33 +01:00
Kegan Dougal
5c6b8a4cf9
Merge branch 'irc-style-commands' into vector
2015-07-17 14:26:58 +01:00
Kegan Dougal
b6f9ca0f95
When accepting calls, go to the right room. Relink video elements when CallView loads.
2015-07-17 14:25:51 +01:00
David Baker
6a76d8ace8
Update room header when room name changes
2015-07-17 13:48:24 +01:00
David Baker
b53640f892
Just return nothing for unknown events
2015-07-17 12:23:24 +01:00
David Baker
00c45e48a9
Merge branch 'vector' into irc-style-commands
2015-07-17 12:03:10 +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
Kegan Dougal
2bb2295499
Implement /join
2015-07-17 11:48:40 +01:00
Kegan Dougal
001372ec39
Fix nick changes
2015-07-17 11:13:05 +01:00
Kegan Dougal
c8caf34777
Merge branch 'vector' into irc-style-commands
2015-07-17 09:17:58 +01:00
Matthew Hodgson
1a95148dae
basic date separator support
2015-07-17 00:12:53 +01:00
David Baker
0f39ec580f
Slightly improve error messages
2015-07-16 22:06:00 +01:00
David Baker
d08c47a328
Fix npe
2015-07-16 21:45:59 +01:00
David Baker
cfbef0177e
Fix custom server or registration & do some of new login UI
2015-07-16 19:30:27 +01:00
Kegan Dougal
1126769686
Merge branch 'vector' into irc-style-commands
2015-07-16 18:08:30 +01:00
Erik Johnston
df999fb2f8
Remove deleted atoms
2015-07-16 18:03:29 +01:00
Kegan Dougal
91943d8a45
Merge branch 'vector' into irc-style-commands
2015-07-16 17:41:30 +01:00
Kegan Dougal
9aa66c1d8b
Add SlashCommands to functionally process /commands.
2015-07-16 17:41:12 +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
98160c3947
Add ability to remove people from invite list
2015-07-16 17:30:10 +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
David Baker
75f8363be0
Merge branch 'master' into vector
2015-07-16 16:53:27 +01:00
David Baker
e6260987cc
some s/then/done/
2015-07-16 16:53:08 +01:00
David Baker
3a6423dd0a
Merge branch 'master' into vector
2015-07-16 16:52:19 +01:00
David Baker
9b6060a363
Decouple login view & controller
2015-07-16 16:49:40 +01:00
Kegan Dougal
6b81022e28
Move position of incoming call buttons.
2015-07-16 16:32:21 +01:00
Erik Johnston
ebedf0b907
Add comment about RoomAlias magic
2015-07-16 16:17:29 +01:00
Erik Johnston
95968bf619
Make server_name magix in RoomAlias optional
2015-07-16 16:14:55 +01:00
David Baker
50edc619af
Merge branch 'master' into vector
2015-07-16 16:13:24 +01:00
David Baker
64042c9de8
Handle localstorage exceptions.
2015-07-16 16:12:54 +01:00
David Baker
ebe6072225
Make this a done so it doesn't swallow exceptions
2015-07-16 16:04:31 +01:00
Erik Johnston
cd26d1323f
Wire together checkboxes and presets and use new /createRoom api
2015-07-16 15:55:46 +01:00
David Baker
155dd74a6f
Merge pull request #8 from matrix-org/message-history-arrow-keys
...
Implement sent message history (up/down keys).
2015-07-16 15:41:57 +01:00
Kegan Dougal
b043889169
Implement sent message history (up/down keys).
...
This includes preserving and restoring partially entered text per room. This
is mostly ported straight from Angular.
2015-07-16 15:22:46 +01:00
David Baker
dac94d2293
mplement custom registration screen
2015-07-16 15:16:26 +01:00
David Baker
41bab56133
Merge pull request #7 from matrix-org/nick-completion
...
Implement nick completion (tab-complete).
2015-07-16 14:52:46 +01:00
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
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
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
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
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
Matthew Hodgson
9b384e52b5
implement latest skin
2015-07-15 04:16:38 +01:00
David Baker
03d048c06f
Get as far as requesting a token
2015-07-14 19:39:18 +01:00
