c0938f270e
Unused code
2015-10-13 16:03:07 +01:00
47c1bb35db
Un-break member hovering
2015-10-13 15:17:20 +01:00
7598be684c
Merge pull request #198 from stevenhammerton/sh-cas-auth
...
Add support for CAS auth
2015-10-13 14:26:03 +01:00
1dd707775a
Use new js-sdk modified time to avoid unnecessary member tile updates. Also avoid double-updating since we were setting state and then forcing an update which is redundant.
2015-10-13 11:10:43 +01:00
293ee1bbcb
Fix typo in comment and remove console.log leftover from debugging
2015-10-12 17:41:56 +01:00
b5357d3298
Remove whitespace
2015-10-12 10:28:39 +01:00
c561647460
Add missing comma
2015-10-12 10:27:45 +01:00
f5039ac9af
Use node querystring module to parse query string like name value pairs from fragment
2015-10-12 10:27:21 +01:00
353af6c647
Move CasLogin logic to controller class and logic object in react-sdk
2015-10-12 10:27:16 +01:00
17c81c1101
icons
2015-10-11 22:51:00 +01:00
50ebce69b7
make file upload look slightly less crap
2015-10-11 18:42:54 +01:00
191d56673b
fix message spacing on Safari caused by switching back to <li/>s...
2015-10-11 18:21:36 +01:00
5d962e1feb
improve horizontal flexing of timeline
2015-10-11 18:04:01 +01:00
201caed773
fix rubberband bounce on OSX and iOS
2015-10-11 17:50:24 +01:00
9be98058b7
fix horizontal overscroll
2015-10-11 17:50:16 +01:00
ba0ae5ba59
various cosmetic fixes based on design feedback
2015-10-11 17:28:36 +01:00
9a8a9a4ce4
track RHS collapse state, and implement a basic responsive design
2015-10-11 16:09:46 +01:00
b05f3343e2
tooltipize BottomLeftMenu too for consistency
2015-10-11 15:00:43 +01:00
ae506b5b1f
fix cursor for unhide LHS button
2015-10-11 13:56:25 +01:00
93de2307c1
improve collapsed LHS implementation - split the tooltip into its own component; position it with javascript as overflow-y + position absolute = clipping hell; preserve the collapse state between MatrixChat re-renders; fix positioning of the 'show' button; switch to dispatcher for show/hide LHS; remove errant scrollbars
2015-10-11 13:54:38 +01:00
8bdb5c0745
implement right panel collapsing more correctly too
2015-10-11 02:25:26 +01:00
47ed8971e3
implement collapsible leftpanel at last
2015-10-11 02:09:14 +01:00
a8d51cdf58
Add support for CAS auth
2015-10-10 18:52:44 +01:00
93f266a4fa
Update to new memberlist api and hopefully sort out presence (list wasn't being re-sorted at the right time)
...
Hopefully fix #11
2015-10-09 17:26:28 +01:00
aed1fe9bf1
Merge branch 'master' into develop
2015-10-09 16:40:27 +01:00
7296cbfd5b
Spellig
2015-10-09 16:38:37 +01:00
023034ce4f
Check for existence of content.size. Fixes #201 .
2015-10-09 16:28:51 +01:00
c68ef38399
Use ChangeDisplayNname / ChangeAvatar widgets to prompt for display name & avatar at signup.
...
Fixes #7 .
2015-10-09 11:56:16 +01:00
ccc5f30c9b
Get the vector 'ongoing conference' bar back (vector now needs a custom RoomView for this: it would be nice it it didn't)
2015-10-08 15:22:16 +01:00
c22442f6d1
Add ChangeDisplayName component and use it
2015-10-07 18:44:07 +01:00
fca65a8cdb
Show invited members separately.
...
May not be the final look.
Fixes #6
2015-10-06 15:09:42 +01:00
807e947146
Add spinner for inviting. Fixes #13 .
2015-10-06 14:12:45 +01:00
85636ccdad
Show end call button in states other than connected and ringback: it's perfectly valid to want to end the call at other times.
...
Fixes #9
2015-10-05 16:29:07 +01:00
490e56bfbb
Improved url / hash change handling
2015-10-05 15:32:34 +01:00
df39c3a281
Changes from PR feedback
2015-10-02 16:44:35 +01:00
2247d951d6
Add config file for default hs/is urls
2015-10-02 11:48:52 +01:00
c687f32f39
Port over custom vector roomlist controller with mini callview
2015-10-01 10:46:42 +01:00
3845a989f6
Get conf calling working, apart from the end call button showing in the right room.
2015-09-30 18:22:15 +01:00
94a6f856d1
Use the new interface for providing conf call functionality. Doesn't shoe it in the right room yet.
2015-09-30 16:52:45 +01:00
fd6e7663cb
Fix notifications
2015-09-28 17:52:34 +01:00
7d540572fd
Update for new default avatar API.
2015-09-28 17:06:39 +01:00
c3f32b74e4
Some missed '/' / '.' replacemement
2015-09-28 14:48:07 +01:00
588dbf5693
reskindex
2015-09-28 11:34:11 +01:00
91c0df4450
Merge branch 'master' into reactsdk-unfork
2015-09-28 11:32:40 +01:00
f778f6adf9
Remove unused stuff
2015-09-25 15:33:38 +01:00
409697b35b
Oops, these were just at the wrong scope
2015-09-25 11:46:06 +01:00
f020f4397c
Switch to webpack
...
Webapck actually supports loading input source maps and generally seems a lot
more solid then browserify (even if their website has an annoying animated
logo).
2015-09-25 11:43:28 +01:00
5fe41e28d7
make presence work better on the memberlist. kludges around lack of syjs-28. is about as good as angular was now.
2015-09-24 01:58:21 +02:00
b11abae8e8
More fixing up of paths, requires etc
2015-09-22 19:09:23 +01:00
7e72ee891a
More fixing up of vector skin
2015-09-22 18:49:04 +01:00
40594fc5fa
Fix up controller requires
2015-09-22 18:17:19 +01:00
148dbc23ed
Rename base skin to vector
2015-09-22 18:05:55 +01:00
682392d02a
Move skins dir to src
2015-09-22 18:05:31 +01:00
09b81f46b0
Remove controllers that all come from react-sdk
2015-09-22 17:20:22 +01:00
616b4fe0f1
Merge pull request #175 from vector-im/matthew/userlist
...
Reskin the userlist as per the design
2015-09-22 15:27:21 +01:00
ef3603cd1a
oops, rogue debugging stmt
2015-09-22 01:25:58 +02:00
61c94d63e7
make the new userlist UI actually work
2015-09-22 01:16:45 +02:00
260e22186b
WIP at turning MemberInfo into a ContextualMenu
2015-09-21 19:23:04 +02:00
048260bb1b
WIP at turning MemberInfo into a ContextualMenu
2015-09-21 19:22:29 +02:00
81db1b2360
Merge pull request #160 from vector-im/conferencing
...
Add conferencing support
2015-09-18 10:03:02 +01:00
240d5502fe
Add a FIXME explaining the situation around alternative FS ASes
2015-09-17 11:47:42 +01:00
7a50166dc6
Move the 'thumbnail' video to the top-left of the screen
...
This was originally laid out at the MatrixChat level which could then be
CSSified, but Matthew suggests this looks a lot better being at the
RoomList level above recents. Move the rendering logic to RoomList.
2015-09-17 11:37:56 +01:00
01d3f2f119
implement /part, /j, and error rather than pass-through unrecognised commands
2015-09-16 01:09:32 +01:00
f89fbffe89
Auto-place a video call if the conf notification is clicked
2015-09-15 15:55:02 +01:00
2b65b4c2dc
Hide the local video when in a conf call
2015-09-15 15:49:33 +01:00
370310bf82
Use better variable names
2015-09-15 15:02:02 +01:00
f384aa7d9e
Add notification to group chat rooms with ongoing conf calls
...
This notification disappears when in the conf call / when the call is over.
CSS stolen from the desktop notification bar.
2015-09-15 14:18:17 +01:00
353269370f
Wire up the "room" CallView for conferencing
...
This also separates out concerns better - UI elements just need to poke
getCallForRoom rather than care if the thing they are displaying is a
true 1:1 for this room ID or actually a conf room.
2015-09-15 13:19:07 +01:00
7866979c79
Show/hide the Hangup button depending on the state of the conf call.
2015-09-15 13:04:09 +01:00
5e3698de64
Actually enforce 1 call semantics.
2015-09-15 11:43:51 +01:00
59986d8b72
Pass the call around different CallViews to keep media flowing
...
Previously, the CallView was attached to the RoomView, so you would get
a new CallView each time you changed the room and the one you changed
from would be destroyed. This would destroy media capture/playback as
the element was no longer in the DOM.
This is now fixed by having a "global" CallView which is attached at
the MatrixChat "page" level in the DOM hierarchy. This CallView isn't
scoped to a particular room; it will render any "active" call it can
find that *isn't the current room being displayed*. This has the side
effect of enforcing 1 call per app semantics as only the first active
call found is returned.
This fixes https://github.com/vector-im/vector-web/issues/31
This is unfinished (CSS for the global call view isn't done)
2015-09-15 11:05:53 +01:00
fc892b3580
Hide 1:1 conference rooms
2015-09-11 16:55:48 +01:00
e3b02a295c
Check conf user/rooms a bit more efficiently
2015-09-11 16:14:30 +01:00
77401e215e
First working outbound conference calling
...
This has a number of failings currently: 1) It needs to hide the 1:1 conference
room, 2) Swapping tabs on the outbound call mutes audio (this just seems to be
a vector bug since I can repro this on a normal 1:1 voip call), 3) Needs a big
plinth/etc to say the conf call is in progress.
2015-09-11 15:49:47 +01:00
737fc74756
Merge branch 'matthew/login' into matthew/userlist
2015-09-01 02:13:52 +03:00
ab068cc372
improve login, including checkbox fix for advanced options, rechecking when you change server, avoiding flickering when you change HS, better error/spinner layout, and trimming whitespace
2015-08-31 19:30:24 +01:00
e3798e1b85
WIP fixing up the member list - just needs CSS and testing
2015-08-15 03:06:21 +01:00
cb7f1aa916
ctrl-alt-num to change rooms
2015-08-14 16:30:19 +01:00
316a28838f
let's wrap when you go off the beginning
2015-08-14 15:51:57 +01:00
960a38fe43
Don't try loading -ve room indices
2015-08-14 15:44:21 +01:00
87feb6b076
Revert accidental commit
2015-08-14 15:37:41 +01:00
c5e33352b0
You can't just use React classes as normal static classes :(
2015-08-14 15:25:05 +01:00
9ed5ca3ccb
implement a pretty droptarget when uploading files
2015-08-14 13:20:39 +01:00
7bdf612ad5
argh 2
2015-08-14 11:25:54 +01:00
6d390ebd2f
Argh
2015-08-14 11:24:41 +01:00
e5099ce3b7
Don't clobber the ready state if the sdk isn't ready yet
2015-08-14 10:31:09 +01:00
a3879b507a
Fix default avatars
2015-08-14 10:30:47 +01:00
001d1c50ef
factor out MRoomMemberTile, MCallInviteTile, MCallAnswerTile and MCallHangupTile to just use EventAsTextTile and thus reduce duplication enormously
2015-08-14 00:28:37 +01:00
fec266f1c0
Move avatars into their own components so I can add functionality like custom default avatars and onerror sources without having to add it in 13 separate places. Add the aforementioned features.
2015-08-13 19:30:02 +01:00
b580fba7db
Rooms with notifs turned off should still go bold.
2015-08-13 16:43:59 +01:00
8bb836ad49
Assuming this was meant to be temporary
2015-08-12 18:26:43 +01:00
eb36a2b242
If we were loaded with a room alias, don't lose that alias when we try to load the corresponding room.
2015-08-12 17:06:45 +01:00
18be8530fe
put key='' on the right element
2015-08-12 01:45:04 +01:00
566c0437c0
provide a way to hide the notification nag toolbar
2015-08-12 00:42:04 +01:00
a20b4d2d2c
If we have a current room on load, we should display it!
2015-08-11 17:24:12 +01:00
be5aaeaad7
Don't try to fill space if we don't have a message wrapper
2015-08-11 17:20:31 +01:00
18c56a171e
Focus composer on alt-up/down
2015-08-11 14:43:52 +01:00
a45785fe1a
Fix blank page on login
2015-08-10 17:12:31 +01:00
19d350e876
Merge branch 'email_login'
2015-08-10 16:25:04 +01:00
7a1796870a
Handle old server that don't support login using email address
2015-08-10 16:22:33 +01:00
96cedc237e
Actually change to vector IS
2015-08-10 15:50:26 +01:00
6ab993f1a9
Change default IS to vector
2015-08-10 15:27:36 +01:00
efcc2061b8
Hopefully port over ndarilek's accessibility changes to Vector (albeit with list elements contained within RoomView)
2015-08-10 15:17:15 +01:00
711bf583ab
missed a file
2015-08-06 16:04:22 +01:00
2771907573
Support room aliases in url bar and show them for rooms that have them
2015-08-06 14:58:52 +01:00
cdbbf4bfef
Don't re-set savedParams, we did it earlier
2015-08-04 18:04:56 +01:00
5cffee7ce6
stop matrix client on logout please
2015-08-04 16:45:39 +01:00
9d8d4e4896
Support email login
2015-08-04 16:30:41 +01:00
259d9dc3a2
Handle THREEPID_IN_USE error
2015-08-04 14:49:01 +01:00
674f90f27f
If no Notifications, we essentially don't have permission (should fix on iOS)
2015-07-23 19:33:37 -07:00
6f62211465
Return to root URL on log out.
2015-07-22 21:40:13 -07:00
c2e92045d0
Don't announce that we've entered the null room on login if there are no rooms.
2015-07-22 21:37:46 -07:00
9847383ba6
Commit imageview files
2015-07-22 20:37:08 -07:00
772053713a
lightbox image viewing (that needs CSS)
2015-07-22 16:04:29 -07:00
51d2677525
Prompt if a user really wants to leave the room
2015-07-22 17:53:18 +01:00
fbb6775523
Implement unread message status when scrolled up.
2015-07-22 14:49:32 +01:00
8b0db49b8b
Bugfix: Accepting an invite no longer results in a stale membership list.
2015-07-22 14:10:06 +01:00
431c93fc29
Fix invites so they display in room list
2015-07-22 13:57:48 +01:00
0016c2ad83
Also change URL when going to next/prev room
2015-07-22 13:47:08 +01:00
ed1cb44deb
Show Loader while leaving
2015-07-22 13:39:36 +01:00
b9fd174f72
Merge branch 'master' of github.com:vector-im/vector-web into leave_room_button
2015-07-22 13:30:34 +01:00
d4147c1315
Don't allow blank messages to be sent.
2015-07-22 13:15:12 +01:00
7e42072952
Scroll to bottom when there are live call updates.
...
This keeps the latest messages visible when you place or receive a call.
2015-07-22 13:04:18 +01:00
6bfc566d9a
Switch to another room when we succesfully leave a room
2015-07-22 11:41:32 +01:00
5835ea0a97
Only display rooms you're currently joined to in recents
2015-07-22 11:33:46 +01:00
e80cf8a133
Bugfix: Scroll to the bottom more reliably on new incoming messages.
...
Added some padding to the calculation which means the scrollbar can
be scrolled up a bit and still get bumped down. Scroll a lot though
and it will not keep bumping you down (parity with Angular)
2015-07-22 11:12:45 +01:00
e1aca588b5
Clear local storage *before* creating the client, Otherwise we will blow away anything that the client tried to persist after it was created
2015-07-22 09:43:40 +01:00
2eba2280d8
Don't barf if we we can't get a given room ID
2015-07-21 20:34:55 -07:00
a2f5933417
make aux panel behave vaguely intelligently
2015-07-21 15:43:54 -07:00
9af09de7d4
Dispatch notifier_enabled when permission given if we don't already have it.
2015-07-21 15:35:30 -07:00
aaa96f1ac1
vicious rewrite of the CSS to support the notifications toolbar, removing all height: 100%'s and letting the flexbox stuff calculate auto-height instead. may have slowed down the rendering, especially when the toolbar is visible
2015-07-21 15:03:05 -07:00
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
6fc910a259
Don't try to set page_type if not logged in
2015-07-21 11:12:59 -07:00
959c0f0669
Order room members by lastActiveAgo
2015-07-21 11:05:54 -07:00
2160440ff1
Add and impl resend button. Update UI when failing to send messages.
2015-07-21 18:05:22 +01:00
f036a10a7d
Add missing src/encryption.js file
2015-07-21 17:00:57 +01:00
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
e0496305aa
Log when presence is set.
2015-07-21 16:23:21 +01:00
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
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
c5d84562ba
Move logic from view to controller
2015-07-21 15:24:10 +01:00
89f6459915
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-21 14:14:48 +01:00
b8e1927e82
Use getDefaultProps instead of setting porps
2015-07-21 14:14:15 +01:00
d81260c92a
Use getDefaultProps instead of setting porps
2015-07-21 14:13:59 +01:00
2454a71b38
Implement create/remove mod button.
2015-07-21 13:24:59 +01:00
726ee7b50b
Hook up the encrypt button when creating rooms
2015-07-21 12:03:15 +01:00
13f04f77dc
Tidy up power level logic. Add 'Moderator' label to members.
2015-07-21 11:43:18 +01:00
2e2cecdd4f
Implement kick/ban/[un]mute buttons on member list dialogs.
2015-07-21 11:26:02 +01:00
2bec7ec981
Add spinner while uploading state
2015-07-21 11:02:36 +01:00
0b1b6057d6
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-21 10:39:46 +01:00
12c824323d
rename DirectoryMenu as BottomLeftMenu and implement a really really really basic RoomDirectory
2015-07-20 20:11:33 -07:00
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
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
36b1280f0c
Bookmarkable room URLs
2015-07-20 12:20:35 -07:00
813cf0481e
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-20 18:18:04 +01:00
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
e9b2cd1364
Allow input history to go forwards again to the empty field
2015-07-20 10:05:53 -07:00
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
3a7ebf73eb
Wire up changing of power levels
2015-07-20 17:31:40 +01:00
9d110d58e5
Manage presence of the client (same semantics as angular)
2015-07-20 17:14:29 +01:00
bcab2f231a
Add error dialogs for invites and call timeouts.
2015-07-20 16:40:00 +01:00
1b6ca2b0ee
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-20 16:31:02 +01:00
eae0972820
Add files. Add power levels to room settings
2015-07-20 16:28:23 +01:00
6fe842e130
Add ErrorDialog class. Use it for VoIP/command errors.
2015-07-20 16:26:53 +01:00
04f17c963c
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-20 16:03:35 +01:00
0039ccf203
Add ability to edit room settings
2015-07-20 15:07:51 +01:00
f2bd802bdc
Wire up invite button on the member list.
2015-07-20 15:07:19 +01:00
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
d8494ff89b
Fix syntax
2015-07-20 14:01:52 +01:00
715db89204
Move all the calls to createClient inside the MatrixClientPeg
2015-07-20 14:01:52 +01:00
19ee75577e
Actually access state_key when getting target invite names...
2015-07-20 13:30:01 +01:00
0baa2141fc
Wire up Start Chat button.
2015-07-20 13:22:56 +01:00
08c16e0d7a
Hook up presence/last active up (live updating; no ticker for last active).
2015-07-20 11:37:48 +01:00
29b4f59982
Basically working upload progress bar.
2015-07-19 22:55:17 -07:00
b82d932a51
Logout button
2015-07-19 22:55:17 -07:00
2121ddc295
add a MemberInfo list overlay as a mini user-profile page
2015-07-20 01:51:58 +01:00
caa7f813eb
Bugfix sending of typing events
2015-07-19 17:29:41 +01:00
e8b944c0e1
Sooner or later I'll get used to this.
2015-07-19 16:43:45 +01:00
e1f3c80f19
Display who's typing
2015-07-19 16:38:56 +01:00
73c8eb7738
Send typing notifs
2015-07-19 15:29:16 +01:00
85748c09cf
Linkify emote tiles
2015-07-19 10:43:16 +01:00
1e1f7492d8
basic skin of incomingCallBox
2015-07-19 01:58:04 +01:00
919e1cf84f
unbreak voice calls
2015-07-19 00:36:23 +01:00
c83ff1c623
hide events with no text equiv
2015-07-18 19:06:36 +01:00
5a12a4a1a3
don't break the layout with unrecognised join events
2015-07-18 02:17:10 +01:00
10cdf46c2c
s/that/self/g
2015-07-17 21:59:48 +01:00
348aa3e5e1
fix up memberlist a bit more
2015-07-17 21:29:41 +01:00
5f367f7c75
missing event listener remove
2015-07-17 19:01:11 +01:00
5c7bef3107
Add topic changes to timeline by adding a tile that just uses TextForEvent
2015-07-17 18:49:48 +01:00
ddb426095e
/topic
2015-07-17 18:14:05 +01:00
214ef4b4ce
Tidy up profile picture setting & fix notification bug
2015-07-17 17:13:51 +01:00
812eb66ed5
Play ringback/busy/callend audio at the right times.
2015-07-17 17:05:11 +01:00
827e777079
Implement ringing audio. Add other audio tags.
2015-07-17 16:42:26 +01:00
ff567faeaa
Profile picture setting and notifdications thereof.
2015-07-17 16:41:46 +01:00
a730804943
there is no content.target - it's state_key. Also, warn if no target
2015-07-17 15:55:36 +01:00
1df8e65cdf
argh javascript
2015-07-17 14:42:36 +01:00
383a958abe
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into vector
2015-07-17 14:36:15 +01:00
9a79539978
missed removeventlistener
2015-07-17 14:35:33 +01:00
5c6b8a4cf9
Merge branch 'irc-style-commands' into vector
2015-07-17 14:26:58 +01:00
b6f9ca0f95
When accepting calls, go to the right room. Relink video elements when CallView loads.
2015-07-17 14:25:51 +01:00
6a76d8ace8
Update room header when room name changes
2015-07-17 13:48:24 +01:00
b53640f892
Just return nothing for unknown events
2015-07-17 12:23:24 +01:00
00c45e48a9
Merge branch 'vector' into irc-style-commands
2015-07-17 12:03:10 +01:00
37108ac56c
Make notifications sensible again and have information once and only once.
2015-07-17 11:57:26 +01:00
1b03aa8119
Display nick changes and factor out getting text for events into a common place.
2015-07-17 11:57:26 +01:00
2bb2295499
Implement /join
2015-07-17 11:48:40 +01:00
001372ec39
Fix nick changes
2015-07-17 11:13:05 +01:00
c8caf34777
Merge branch 'vector' into irc-style-commands
2015-07-17 09:17:58 +01:00
1a95148dae
basic date separator support
2015-07-17 00:12:53 +01:00
0f39ec580f
Slightly improve error messages
2015-07-16 22:06:00 +01:00
d08c47a328
Fix npe
2015-07-16 21:45:59 +01:00
cfbef0177e
Fix custom server or registration & do some of new login UI
2015-07-16 19:30:27 +01:00
1126769686
Merge branch 'vector' into irc-style-commands
2015-07-16 18:08:30 +01:00
df999fb2f8
Remove deleted atoms
2015-07-16 18:03:29 +01:00
91943d8a45
Merge branch 'vector' into irc-style-commands
2015-07-16 17:41:30 +01:00
9aa66c1d8b
Add SlashCommands to functionally process /commands.
2015-07-16 17:41:12 +01:00
03733e6a0f
Merge pull request #9 from matrix-org/create_room
...
Wire in create room.
2015-07-16 17:37:48 +01:00
98160c3947
Add ability to remove people from invite list
2015-07-16 17:30:10 +01:00
68d60aadd1
Make Presets stateless
2015-07-16 17:24:33 +01:00
aa1b763518
Make CreateRoom remember what the values of its fields were. Remove some fairly pointless atoms
2015-07-16 17:20:03 +01:00
75f8363be0
Merge branch 'master' into vector
2015-07-16 16:53:27 +01:00
e6260987cc
some s/then/done/
2015-07-16 16:53:08 +01:00
3a6423dd0a
Merge branch 'master' into vector
2015-07-16 16:52:19 +01:00
9b6060a363
Decouple login view & controller
2015-07-16 16:49:40 +01:00
6b81022e28
Move position of incoming call buttons.
2015-07-16 16:32:21 +01:00
ebedf0b907
Add comment about RoomAlias magic
2015-07-16 16:17:29 +01:00
95968bf619
Make server_name magix in RoomAlias optional
2015-07-16 16:14:55 +01:00
50edc619af
Merge branch 'master' into vector
2015-07-16 16:13:24 +01:00
64042c9de8
Handle localstorage exceptions.
2015-07-16 16:12:54 +01:00
ebe6072225
Make this a done so it doesn't swallow exceptions
2015-07-16 16:04:31 +01:00
cd26d1323f
Wire together checkboxes and presets and use new /createRoom api
2015-07-16 15:55:46 +01:00
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
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
dac94d2293
mplement custom registration screen
2015-07-16 15:16:26 +01:00
41bab56133
Merge pull request #7 from matrix-org/nick-completion
...
Implement nick completion (tab-complete).
2015-07-16 14:52:46 +01:00
42c9766203
s/did/will/
2015-07-16 14:39:15 +01:00
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
cf38b8a5bb
Merge branch 'master' into vector
2015-07-16 14:19:50 +01:00
a6df6ca29b
Don't forget form values on error
2015-07-16 14:19:13 +01:00
7aa4d50560
Handle registration errors.
2015-07-16 14:08:52 +01:00
c708976635
Wire up CreateRoom to UI.
2015-07-16 13:49:34 +01:00
0a3a3dac1a
Display call logs in the UI.
...
Display placed/incoming calls, answers and hangups.
2015-07-16 13:30:14 +01:00
c4379e4827
Remove 'status' from payload; unused.
2015-07-16 12:57:59 +01:00
41f659db4c
Merge branch 'master' into vector
2015-07-16 12:44:42 +01:00
df790c1b54
Refactor view/controller logic between files, fix syntax & silly bugs.
2015-07-16 12:44:04 +01:00
a6f857e9d8
Merge pull request #6 from matrix-org/voip
...
VoIP addition
2015-07-16 12:31:36 +01:00
5f3721f471
Tidying up
2015-07-16 11:54:53 +01:00
c056bdf104
Only allow calls to be placed if there are 2 joined members.
2015-07-16 11:34:39 +01:00
50f9d34211
Only display video elements in video calls.
2015-07-16 11:30:34 +01:00
eedd437ca7
Minimal CSS bodge so the video actually dies when the call ends.
2015-07-16 11:21:43 +01:00
7ffd97b5dc
Implement call FSM. All works.
2015-07-16 11:05:09 +01:00
f17a9b14c2
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into user_settings
2015-07-16 10:46:40 +01:00
ca593b8544
Remove commented out code
2015-07-16 10:39:58 +01:00
5d99abf18c
Correctly pull in client version from package.json
2015-07-16 10:38:00 +01:00
139b92fcd6
Merge branch 'master' into vector
2015-07-16 10:33:53 +01:00
ecd1f09095
Glue in video elements.
2015-07-16 10:26:41 +01:00
02045858f7
Wire up change password
2015-07-16 10:23:31 +01:00
e2757b3587
Merge pull request #4 from matrix-org/registration
...
Registration
2015-07-16 09:58:53 +01:00
931a4f29c8
Argh, accidentally committed again
2015-07-16 09:57:14 +01:00
bc93aeb50e
Flesh out the user_settings page
2015-07-16 09:37:58 +01:00
1b4358624f
Add a basic modal dialog implementation
2015-07-16 09:37:14 +01:00
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
23d9cee299
didn't mean to commit that
2015-07-15 19:30:10 +01:00
4756427e61
First cut working regisatration
2015-07-15 19:25:36 +01:00
4f132c418f
Fix a couple state bugs.
2015-07-15 17:48:26 +01:00
14a4da54f8
Wire up hangup/answer buttons.
2015-07-15 17:36:47 +01:00
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
6316f1b195
Add call handling logic. Outbound voice calls work!
2015-07-15 15:36:45 +01:00
2b81f46030
Add placeHolder prop for EditableText
2015-07-15 15:04:39 +01:00
dfd54f3b95
Basic structure of user settings
2015-07-15 15:04:24 +01:00
7e30c0f47b
Add CallHandler to handle call logic and make VideoViews/WaveformViews.
2015-07-15 14:57:52 +01:00
28cebab9a3
Add voip subdirectory.
2015-07-15 14:35:04 +01:00
7cbb43fddb
Merge branch 'vector' into voip
...
Conflicts:
src/ComponentBroker.js
2015-07-15 14:21:58 +01:00
78bea916e1
Dispatch events when calls are made/received.
2015-07-15 14:06:44 +01:00
844a883ad8
Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector
2015-07-15 13:59:24 +01:00
5cd92229eb
Add an editable text atom
2015-07-15 13:55:43 +01:00
f94a061fda
Add onClick listeners. Add getters for refs.
2015-07-15 13:34:11 +01:00
aba103b8e0
Add VideoFeed atom and VideoView organism.
2015-07-15 13:09:15 +01:00
2fc08aeb12
Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector
2015-07-15 10:36:47 +01:00
9b384e52b5
implement latest skin
2015-07-15 04:16:38 +01:00
03d048c06f
Get as far as requesting a token
2015-07-14 19:39:18 +01:00
aacc31b2ce
Registration works with recaptcha
2015-07-14 18:46:15 +01:00
bb06b752b4
Document CreateRoom phases
2015-07-14 17:40:49 +01:00
c4764af9a2
Add phases to CreateRoom organism
2015-07-14 17:27:22 +01:00
03b715b8bf
Add onRoomCreated callback to CreateRoom organism
2015-07-14 17:01:06 +01:00
a748c090fb
Move all element specific code into skins/
2015-07-14 16:59:11 +01:00
b53e710d20
Add invite selection to create room dialog
2015-07-14 16:53:49 +01:00
ed52cdf6df
Add basic CreateRoom organism. Supports setting room name and selecting preset
2015-07-14 15:17:49 +01:00
dff9353339
tabs->spaces everywhere; sorry folks - \!blame sublime
2015-07-14 12:11:01 +01:00
69d1844773
fix NPE for invites
2015-07-14 12:10:15 +01:00
6b0167375c
badges and broken avatars
2015-07-14 02:13:00 +01:00
341fe868e4
group messages together from the same user
2015-07-14 00:25:51 +01:00
a7e4a2847e
Start of registration support.
2015-07-13 19:14:02 +01:00
bfe0cdcfd1
vector wireframes
2015-07-13 01:51:24 +01:00
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
a00510c1ca
Linkify URLs
2015-07-09 15:41:19 +01:00
12566c0c9c
Separate with space too
2015-07-08 19:57:58 +01:00
6a92fdc5e6
Fix file size display
2015-07-08 19:52:44 +01:00
03451d8c7d
Sort rooms for prev/next purposes
2015-07-08 19:47:58 +01:00
bdfef5eedd
damn you javascript
2015-07-08 18:28:30 +01:00
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
d58fdef362
Order room list by most recent activity
2015-07-08 18:18:03 +01:00
a591b66732
Don't barf if no info in m.file content
2015-07-08 16:50:49 +01:00
5bed0b7275
typo
2015-07-08 16:32:03 +01:00
53e9d030b7
See uploaded files
2015-07-08 16:25:27 +01:00
36ecbfc87f
Upload files and images
2015-07-08 14:34:53 +01:00
00dd1e180a
focus message composer when window gets focus
2015-07-07 13:30:38 +01:00
9f37196eb7
Fix infinite scrolling
2015-07-07 11:00:02 +01:00
205ed54ec7
merge in matthew-css
2015-07-07 03:44:57 +01:00
3e87e043d6
Fix docs
2015-07-06 18:29:24 +01:00
b4abe870cf
Image displaying!
2015-07-06 18:09:19 +01:00
dcb4b5f912
Add room membership messages
2015-07-06 16:04:09 +01:00
6c35908949
Add example shwing how to customise, make customising work and document all the ways in which browserify will break and how to work around it being dumb.
2015-07-06 14:13:02 +01:00
1c03eabadb
Not all events have a sender
2015-07-03 16:46:30 +01:00
b8f9cb44b8
argh, javascript
2015-07-03 16:35:06 +01:00
1baaf39c48
update notification button when permission granted
2015-07-03 16:29:41 +01:00
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
53b0ba56db
add license header
2015-07-03 11:24:04 +01:00
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
947f389e51
be more consistent with naming
2015-07-02 13:18:03 +01:00
acfe05db9d
Use new push actions method on client
2015-07-01 14:11:23 +01:00
898737d806
or is not and
2015-06-29 16:50:26 +01:00
46646cbd87
Highlight room tiles on bing
2015-06-29 16:48:13 +01:00
57ba816919
Highlight messages using new push rules support in js sdk
2015-06-29 16:24:02 +01:00
9aa9a60333
Some checks to see whether stuff is still mounted when adding things.
2015-06-25 17:52:40 +01:00
30a9436485
Room List should ignore paginated events
2015-06-25 17:44:27 +01:00
dd0d6159ce
Make alt+up/down change rooms
2015-06-25 17:41:55 +01:00
fae629ea65
Use the pagination token to see when we've reached the room's birth
2015-06-25 15:58:51 +01:00
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
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
2355d5e6b5
Fix the permagrey local-echo bug
2015-06-24 18:15:34 +01:00
c54bed02c1
Argh, javascript
2015-06-24 14:09:38 +01:00
a54a7f80aa
Apparently Object.keys is kinda slow
2015-06-24 14:01:59 +01:00
52f6fa89a1
Only show joined and invited members
2015-06-24 13:48:39 +01:00
8f1258b6cc
Infinite scrolling
2015-06-24 13:28:44 +01:00
aaa38d95ba
s/themes/skins/g as we are always describing the whole UI layout here, whereas themes can sometimes just be small cosmetic tweaks (light-on-dark, dark-on-light etc)
2015-06-23 18:28:20 +01:00
0c26206b88
Copyright headers (and use strict, while we're at it).
2015-06-23 16:41:25 +01:00
a022a4b9a6
Reshuffle to put "HTML" (JSX) and CSS together as a theme with logic elsewhere.
2015-06-23 14:40:50 +01:00
cc4fa6140c
Fix joining
2015-06-23 11:36:19 +01:00
d10b1457ba
obey room name changes
2015-06-22 15:56:16 +01:00
c425886a45
handle room invites
2015-06-22 14:48:58 +01:00
2ba4ad04d1
Little fixes on member list
2015-06-22 13:15:14 +01:00
0424ef07b3
Add member list (that doesn't really update much yet)
2015-06-22 11:42:09 +01:00
e77e9b7704
Add displayNames so they're not all just 'exports' in the react debugger
2015-06-19 16:21:09 +01:00
41014af471
Display new rooms as they arrive
2015-06-19 16:12:22 +01:00
1270bc3c62
m.notice
2015-06-19 14:01:17 +01:00
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
847e816035
grey out sending messages (although they don't go black until you send another message currently: awaiting fix in js sdk).
2015-06-18 15:49:41 +01:00
b31794cda5
Focus the text box at appropriate times
2015-06-18 15:03:57 +01:00
90f6764cbf
Fix cleaning unread state on room select & ignore our own messages
2015-06-18 14:40:55 +01:00
7c405f673a
Highlight rooms with unread messages
2015-06-18 14:35:17 +01:00
a63299aae0
Message scrolling
2015-06-18 11:23:35 +01:00
ed58a59f82
Switch everything over to use the component broker.
2015-06-17 16:43:29 +01:00
b35461f5c0
Unused require
2015-06-16 18:35:37 +01:00
c9a546b73b
Load all components* through a central broker so we can overrride them with different ones
...
* only one place actually uses it currently
2015-06-16 18:18:55 +01:00
acaff68748
Oops, commit the emote tile.
2015-06-16 18:18:34 +01:00
3a16c8a764
The most important feature
2015-06-16 15:29:13 +01:00
e2348c50d5
Fix logout
2015-06-16 14:37:15 +01:00
1dbc54e172
Oops, put key in the right place
2015-06-16 14:31:35 +01:00
2bd5b0fdad
Just be a little less ugly
2015-06-16 14:27:13 +01:00
f25bf58d6d
Use JS-SDK recommended way of getting sender name.
2015-06-16 14:19:46 +01:00
672258f604
Start rendering messages with something more than the json
2015-06-16 11:58:03 +01:00
88e9ab02f9
Yay, message sending.
2015-06-16 11:08:27 +01:00
b2843b09bc
Rest of commit adding messagecomposer, and put li's in ul.
2015-06-16 10:41:05 +01:00
a0c5fb4a8b
Add not-working-yet text box, plus a bit more css
2015-06-15 18:35:28 +01:00
2a15b3a98c
css tweaking
2015-06-15 15:50:24 +01:00
52286b2316
Prevent default otherwise the form will submit and reload the page
2015-06-15 11:00:39 +01:00
4bb570c545
messages arrive!
2015-06-12 18:17:54 +01:00
0b0e6adce3
Make room changing work
2015-06-12 18:01:38 +01:00
125fa78bc6
Something starting to resemble a Matrix Client
2015-06-12 17:34:17 +01:00
2f6a123118
more Matrixy naming
2015-06-12 15:01:36 +01:00
971a7c1133
Display the room list
2015-06-12 14:59:33 +01:00
5f970edac5
strip out cruft
2015-06-12 13:49:23 +01:00
ffb0dc78b8
Fixes to login, and change to not use the dispatcher because it's just unnecessary here
2015-06-12 13:45:22 +01:00
e28fde7ae1
Save creds to localstorage
2015-06-12 13:12:39 +01:00
add78c6e92
Oops: the file modifications for making it log in.
2015-06-11 18:25:29 +01:00
f487b9ba04
Make it log in
2015-06-11 18:23:02 +01:00
eeb2dfd1fc
uglify at the end so we can also mangle names, and don't bother uglifying individual modules with -g as it doesn't seem to make any difference
2015-06-11 17:46:25 +01:00
c42733ec95
Basic structure of a react SDK and start of an implementation.
2015-06-09 17:40:42 +01:00
David Baker