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
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
David Baker
139b92fcd6
Merge branch 'master' into vector
2015-07-16 10:33:53 +01:00
David Baker
e2757b3587
Merge pull request #4 from matrix-org/registration
...
Registration
2015-07-16 09:58:53 +01:00
Erik Johnston
bc93aeb50e
Flesh out the user_settings page
2015-07-16 09:37:58 +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
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
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
Matthew Hodgson
9a51cace34
fix bad membership list horizontal scrolling
2015-07-15 00:31:47 +01:00
David Baker
aacc31b2ce
Registration works with recaptcha
2015-07-14 18:46:15 +01:00
Erik Johnston
c4764af9a2
Add phases to CreateRoom organism
2015-07-14 17:27:22 +01:00
Erik Johnston
b53e710d20
Add invite selection to create room dialog
2015-07-14 16:53:49 +01:00
Erik Johnston
ed52cdf6df
Add basic CreateRoom organism. Supports setting room name and selecting preset
2015-07-14 15:17:49 +01:00
Matthew Hodgson
bfe0cdcfd1
vector wireframes
2015-07-13 01:51:24 +01:00
David Baker
9f37196eb7
Fix infinite scrolling
2015-07-07 11:00:02 +01:00
Matthew Hodgson
ba8751bb75
slightly unbreak infinite scroll
2015-07-07 04:18:07 +01:00
Matthew Hodgson
a94f1664d8
merge in matthew-css
2015-07-07 03:44:41 +01:00
Matthew Hodgson
ffac30083e
rejig css:
...
* sans-serif font
* use display: table for the message list so that everything lines up nicely
* switch to flexbox layout rather than position absolutes to avoid assuming a full screen UI and improve maintainability (and better match atomify)
* neutralise the colouring and styling of highlighted rooms in the recents list
* switch from ul + li's to a series of divs in some places where the li's are achieving nothing but adding more complexity to the DOM
* add mx_MessageTileType as a generic css base class for all message tiles
2015-07-07 02:10:10 +01:00