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
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
David Baker
aacc31b2ce
Registration works with recaptcha
2015-07-14 18:46:15 +01:00
Erik Johnston
bb06b752b4
Document CreateRoom phases
2015-07-14 17:40:49 +01:00
Erik Johnston
c4764af9a2
Add phases to CreateRoom organism
2015-07-14 17:27:22 +01:00
Erik Johnston
03b715b8bf
Add onRoomCreated callback to CreateRoom organism
2015-07-14 17:01:06 +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
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
David Baker
ed2cc33616
Linkify user IDs and room aliases (to nothing at the moment because we don't have anything to do with them)
2015-07-10 14:37:13 +01:00
David Baker
a00510c1ca
Linkify URLs
2015-07-09 15:41:19 +01:00
David Baker
12566c0c9c
Separate with space too
2015-07-08 19:57:58 +01:00
David Baker
6a92fdc5e6
Fix file size display
2015-07-08 19:52:44 +01:00
David Baker
03451d8c7d
Sort rooms for prev/next purposes
2015-07-08 19:47:58 +01:00
David Baker
bdfef5eedd
damn you javascript
2015-07-08 18:28:30 +01:00
David Baker
c14886a1ee
rename to mostRecentActivityFirst to disambiguate from sorting by when you joined a room, which this is not.
2015-07-08 18:21:57 +01:00
David Baker
d58fdef362
Order room list by most recent activity
2015-07-08 18:18:03 +01:00
David Baker
a591b66732
Don't barf if no info in m.file content
2015-07-08 16:50:49 +01:00
David Baker
5bed0b7275
typo
2015-07-08 16:32:03 +01:00
David Baker
53e9d030b7
See uploaded files
2015-07-08 16:25:27 +01:00
David Baker
36ecbfc87f
Upload files and images
2015-07-08 14:34:53 +01:00
David Baker
00dd1e180a
focus message composer when window gets focus
2015-07-07 13:30:38 +01:00
David Baker
9f37196eb7
Fix infinite scrolling
2015-07-07 11:00:02 +01:00
Matthew Hodgson
205ed54ec7
merge in matthew-css
2015-07-07 03:44:57 +01:00
David Baker
3e87e043d6
Fix docs
2015-07-06 18:29:24 +01: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
1c03eabadb
Not all events have a sender
2015-07-03 16:46:30 +01:00
David Baker
b8f9cb44b8
argh, javascript
2015-07-03 16:35:06 +01:00
David Baker
1baaf39c48
update notification button when permission granted
2015-07-03 16:29:41 +01:00
David Baker
196ee3f6d4
Only highlight room list for messages where we notify - this may want to be an option in the react client potentially.
2015-07-03 11:36:44 +01:00
David Baker
fd20e82123
Add desktop notifications, overridable in the same way as other components (although it's not a react component). Also extend the flux dispatcher a little to be less dumb about dispatching while something else is already dispatching.
2015-07-03 11:12:54 +01:00
David Baker
947f389e51
be more consistent with naming
2015-07-02 13:18:03 +01:00
David Baker
acfe05db9d
Use new push actions method on client
2015-07-01 14:11:23 +01:00
David Baker
898737d806
or is not and
2015-06-29 16:50:26 +01:00
David Baker
46646cbd87
Highlight room tiles on bing
2015-06-29 16:48:13 +01:00
David Baker
57ba816919
Highlight messages using new push rules support in js sdk
2015-06-29 16:24:02 +01:00
David Baker
9aa9a60333
Some checks to see whether stuff is still mounted when adding things.
2015-06-25 17:52:40 +01:00
David Baker
30a9436485
Room List should ignore paginated events
2015-06-25 17:44:27 +01:00
David Baker
dd0d6159ce
Make alt+up/down change rooms
2015-06-25 17:41:55 +01:00
David Baker
fae629ea65
Use the pagination token to see when we've reached the room's birth
2015-06-25 15:58:51 +01:00
David Baker
5d44de9e08
Load limited number of room members when we first switch to a room, loading the rest a little later: makes switchign to large rooms much more responsive.
2015-06-25 14:57:35 +01:00
David Baker
209e052025
Limit the number of messages we load into a chat room when we switch to it (or more accurately, switch back to it).
2015-06-25 14:36:24 +01:00
David Baker
2355d5e6b5
Fix the permagrey local-echo bug
2015-06-24 18:15:34 +01:00
David Baker
c54bed02c1
Argh, javascript
2015-06-24 14:09:38 +01:00
David Baker
a54a7f80aa
Apparently Object.keys is kinda slow
2015-06-24 14:01:59 +01:00
David Baker
52f6fa89a1
Only show joined and invited members
2015-06-24 13:48:39 +01:00
David Baker
8f1258b6cc
Infinite scrolling
2015-06-24 13:28:44 +01:00
David Baker
0c26206b88
Copyright headers (and use strict, while we're at it).
2015-06-23 16:41:25 +01:00
David Baker
a022a4b9a6
Reshuffle to put "HTML" (JSX) and CSS together as a theme with logic elsewhere.
2015-06-23 14:40:50 +01:00
David Baker
cc4fa6140c
Fix joining
2015-06-23 11:36:19 +01:00
David Baker
d10b1457ba
obey room name changes
2015-06-22 15:56:16 +01:00
David Baker
c425886a45
handle room invites
2015-06-22 14:48:58 +01:00
David Baker
2ba4ad04d1
Little fixes on member list
2015-06-22 13:15:14 +01:00
David Baker
0424ef07b3
Add member list (that doesn't really update much yet)
2015-06-22 11:42:09 +01:00
David Baker
41014af471
Display new rooms as they arrive
2015-06-19 16:12:22 +01:00
David Baker
1270bc3c62
m.notice
2015-06-19 14:01:17 +01:00
David Baker
2abea931ca
Split out render methods into 'views' leaving UI logic in 'controllers'. Hopefully should make it easier to skin / customise.
2015-06-19 12:53:48 +01:00