Commit graph

258 commits

Author SHA1 Message Date
Kegan Dougal
08c16e0d7a Hook up presence/last active up (live updating; no ticker for last active). 2015-07-20 11:37:48 +01:00
Kegan Dougal
87dd9e8bb4 Unbreak stuff 2015-07-20 10:38:44 +01:00
Erik Johnston
46764c3614 Don't set room name if it hasn't changed 2015-07-20 10:23:07 +01:00
David Baker
0fa7f6cb63 .click() was what I was looking for... 2015-07-19 22:55:17 -07:00
David Baker
29b4f59982 Basically working upload progress bar. 2015-07-19 22:55:17 -07:00
David Baker
a477c8be4c Mostly wire up the send file button, except I can't figure out the js magic to make a file input open the prompt. 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
337e6b329f Don't lose username & password on login failure 2015-07-19 18:00:46 -04:00
David Baker
e1f3c80f19 Display who's typing 2015-07-19 16:38:56 +01:00
David Baker
5aa913f201 Fix label in register screen 2015-07-19 10:56:12 +01:00
David Baker
85748c09cf Linkify emote tiles 2015-07-19 10:43:16 +01:00
Matthew Hodgson
58907e5842 absolute path thinko 2015-07-19 03:39:13 +01:00
Matthew Hodgson
202c155788 absolute path thinko 2015-07-19 03:37:39 +01:00
Matthew Hodgson
2d25414b57 fix up registration page too 2015-07-19 03:30:41 +01:00
Matthew Hodgson
d239070adb implement login 2015-07-19 03:19:37 +01:00
Matthew Hodgson
1e1f7492d8 basic skin of incomingCallBox 2015-07-19 01:58:04 +01:00
Matthew Hodgson
981bcbe74f disambiguate z-index for remote video 2015-07-18 23:29:38 +01:00
Matthew Hodgson
27d19f2ec8 include the code used to gen these gfx 2015-07-18 19:11:39 +01:00
Matthew Hodgson
ea8737d957 POWER 2015-07-18 19:06:58 +01:00
Matthew Hodgson
db94a93fde hide events with no text equiv 2015-07-18 19:06:26 +01:00
Matthew Hodgson
fc5f9bb70c highlight should imply bold 2015-07-18 19:06:06 +01:00
Matthew Hodgson
5b83974edd try to hide ugly scrollbars on win & lin 2015-07-18 19:05:49 +01:00
Matthew Hodgson
aa4f9abd5c basic VoIP lipstick 2015-07-18 02:04:58 +01:00
Matthew Hodgson
97981058f0 tweak badge 2015-07-18 01:22:25 +01:00
Matthew Hodgson
00d2d82a14 new style badges, hr, notices 2015-07-18 01:21:56 +01:00
Matthew Hodgson
4ded74765a encore du lipstick 2015-07-18 00:48:22 +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
0d34728190 border for bottom left 2015-07-17 21:59:41 +01:00
Matthew Hodgson
15edb9a80b fix up memberlist a bit more 2015-07-17 21:30:25 +01:00
Matthew Hodgson
706abe654a fix up memberlist a bit more 2015-07-17 21:30:12 +01:00
Matthew Hodgson
d4541f54a3 fix up memberlist a bit more 2015-07-17 21:29:54 +01:00
Matthew Hodgson
6280adc6e7 new assets 2015-07-17 21:19:43 +01:00
Matthew Hodgson
6394978326 degray 2015-07-17 20:23:11 +01:00
Matthew Hodgson
d09ddc48e0 lay out topic updates correctly 2015-07-17 20:09:56 +01:00
Matthew Hodgson
48063608c7 nudge css 2015-07-17 20:09:43 +01:00
Matthew Hodgson
aa70dd7b67 alt tags for avatars; improve header spacing; improve roomview margin 2015-07-17 19:09:27 +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
b60a3b61bb handle huge room & topic names more sanely 2015-07-17 18:42:20 +01:00
David Baker
214ef4b4ce Tidy up profile picture setting & fix notification bug 2015-07-17 17:13:51 +01:00
Matthew Hodgson
88167358bb fix text input on FF 2015-07-17 17:08:39 +01:00
Matthew Hodgson
7bef6245f7 'ended the call' kinda handles both cancelled and 'hung up' 2015-07-17 17:08:38 +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
Matthew Hodgson
328d5004d8 it's spelt 'hung up' 2015-07-17 16:15:23 +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
Matthew Hodgson
891ba40114 basic date separator support 2015-07-17 00:12:54 +01:00
Matthew Hodgson
1a95148dae basic date separator support 2015-07-17 00:12:53 +01:00
Matthew Hodgson
a2ca5f2847 improve badges and room tile layout 2015-07-17 00:12:53 +01:00
Matthew Hodgson
28dcfb2f12 make it work on ff 2015-07-17 00:12:53 +01:00
David Baker
8ccce4d702 Make new login style work 2015-07-16 21:46:39 +01:00
David Baker
cfbef0177e Fix custom server or registration & do some of new login UI 2015-07-16 19:30:27 +01:00
David Baker
8feeb93215 Merge pull request #10 from matrix-org/editable_room_name
Make room name editable
2015-07-16 19:29:49 +01:00
Erik Johnston
789e70f2d6 Remove old atoms 2015-07-16 18:07:28 +01:00
Erik Johnston
ce3dab3c5b Make room name editable 2015-07-16 17:42:33 +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
Kegan Dougal
59ca26ee93 Use target not sender when displaying member text. 2015-07-16 17:37:35 +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
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
47f4c0dfff Use Loader 2015-07-16 16:20:00 +01:00
Erik Johnston
95968bf619 Make server_name magix in RoomAlias optional 2015-07-16 16:14:55 +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
1677a3bf3a text change 2015-07-16 15:16:26 +01:00
David Baker
dac94d2293 mplement custom registration screen 2015-07-16 15:16:26 +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
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
7ffd97b5dc Implement call FSM. All works. 2015-07-16 11:05:09 +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
David Baker
139b92fcd6 Merge branch 'master' into vector 2015-07-16 10:33:53 +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
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
4756427e61 First cut working regisatration 2015-07-15 19:25:36 +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
c69606df44 oops 2015-07-15 04:29:30 +01:00
Matthew Hodgson
8db6c17220 fix header 2015-07-15 04:26:25 +01:00
Matthew Hodgson
b739e7be9e fix avatar spacing 2015-07-15 04:21:32 +01:00
Matthew Hodgson
ce38d4ea12 moar graphics 2015-07-15 04:16:51 +01:00
Matthew Hodgson
9b384e52b5 implement latest skin 2015-07-15 04:16:38 +01:00
Matthew Hodgson
c0bd574997 improve padding on membership list 2015-07-15 00:36:54 +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
4f7dcdf566 Naming conventions 2015-07-14 17:52:13 +01:00
Erik Johnston
c4764af9a2 Add phases to CreateRoom organism 2015-07-14 17:27:22 +01:00
Erik Johnston
a077abfb99 Remove console.log 2015-07-14 17:04:44 +01:00
Erik Johnston
a748c090fb Move all element specific code into skins/ 2015-07-14 16:59:11 +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
77e76972f0 avatars for joins & parts 2015-07-14 14:31:13 +01:00
Matthew Hodgson
dff9353339 tabs->spaces everywhere; sorry folks - \!blame sublime 2015-07-14 12:11:01 +01:00
Matthew Hodgson
6b0167375c badges and broken avatars 2015-07-14 02:13:00 +01:00
Matthew Hodgson
341fe868e4 group messages together from the same user 2015-07-14 00:25:51 +01:00
David Baker
a7e4a2847e Start of registration support. 2015-07-13 19:14:02 +01:00
Matthew Hodgson
10b3f250ec make it work in safari 2015-07-13 14:56:58 +01:00
Matthew Hodgson
18066d848a relative paths 2015-07-13 02:11:05 +01:00
Matthew Hodgson
06dfbbf821 fine tune header bar 2015-07-13 02:02:56 +01:00
Matthew Hodgson
20f1c075fc fix message tile layout a bit 2015-07-13 01:59:07 +01:00
Matthew Hodgson
bfe0cdcfd1 vector wireframes 2015-07-13 01:51:24 +01:00
Matthew Hodgson
98baa0cb0a improve css consistency 2015-07-12 16:36:43 +01:00
Matthew Hodgson
a1ab40064e fix CSS namespacing 2015-07-12 14:52:37 +01:00
David Baker
27d92fa98a Open files in new window too 2015-07-09 17:45:03 +01:00
David Baker
a00510c1ca Linkify URLs 2015-07-09 15:41:19 +01:00
David Baker
0daab63b4a Bad workaround for some join events having no sender 2015-07-09 11:31:58 +01:00
David Baker
b6319fcf50 Add webkit prefixed flex direction too. 2015-07-08 22:12:00 +01:00
David Baker
6a92fdc5e6 Fix file size display 2015-07-08 19:52:44 +01:00
David Baker
53e9d030b7 See uploaded files 2015-07-08 16:25:27 +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
bbe6c0bf1a let room tiles grow in size 2015-07-07 04:06:16 +01:00
Matthew Hodgson
954f837eab emotes start with *'s 2015-07-07 04:05:55 +01:00
Matthew Hodgson
ecd197df86 fudge room member tiles to look slightly better 2015-07-07 04:05:44 +01:00
Matthew Hodgson
a94f1664d8 merge in matthew-css 2015-07-07 03:44:41 +01:00
Matthew Hodgson
abea8af59b s/mx_MessageTileType/mx_messageTileType/ to fit dave's naming convention 2015-07-07 02:37:14 +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
Nolan Darilek
9153efd3de Add aria-live=polite to message list view. 2015-07-06 12:22:28 -05:00
David Baker
b4abe870cf Image displaying! 2015-07-06 18:09:19 +01:00
David Baker
dcb4b5f912 Add room membership messages 2015-07-06 16:04:09 +01:00
David Baker
7a8eae09ff More sender / sender display name fixes. 2015-07-03 18:29:46 +01:00