Kegan Dougal
|
78f2f7cfd0
|
Add in voip mute video/audio code. Needs dev js-sdk
|
2015-10-20 09:55:00 +01:00 |
|
David Baker
|
6baf405a05
|
Remove the 'resending' state which was duplicating a property of the event itself for no obvious reason. Remove onResend whose purpose was mostly to manage that state (and really should have been 'onResendClicked'). Listen for action to see when a message is resent.
|
2015-10-15 14:09:19 +01:00 |
|
David Baker
|
02a2e06d52
|
unused code
|
2015-10-13 16:03:24 +01:00 |
|
David Baker
|
9e596ebb75
|
Merge pull request #19 from stevenhammerton/sh-cas-auth
Add support for CAS login
|
2015-10-13 14:25:39 +01:00 |
|
David Baker
|
f7d3d4f9a9
|
Remove console.log
|
2015-10-13 11:44:45 +01:00 |
|
David Baker
|
d12ca92ea7
|
Avoid double updating: setting the state will cause a re-render so forcing an update is redundant. Also bump js sdk dep to newest to match vector.
|
2015-10-13 11:12:06 +01:00 |
|
Steven Hammerton
|
fc333067c2
|
Rename required var to match convention
|
2015-10-12 17:38:04 +01:00 |
|
David Baker
|
030124a59a
|
Make state.members always defined
|
2015-10-12 16:25:49 +01:00 |
|
Steven Hammerton
|
4e0d930014
|
Pull down some CAS stuff from vector into controller and logic class
|
2015-10-12 10:20:03 +01:00 |
|
Matthew Hodgson
|
f6d577d0c6
|
track RHS collapse state
|
2015-10-11 16:07:01 +01:00 |
|
Matthew Hodgson
|
8228a7d485
|
track whether the LHS is collapsed. (shouldn't this be vector specific too?)
|
2015-10-11 13:49:44 +01:00 |
|
Matthew Hodgson
|
c5e3891a5a
|
shrink default roomavatar size to 36x36. surely this is vector specific...
|
2015-10-11 02:08:39 +01:00 |
|
Steven Hammerton
|
3f67d8541f
|
Add support for CAS login
|
2015-10-10 18:54:19 +01:00 |
|
David Baker
|
05d19121d8
|
Slightly change memberlist api to shift the sorting into the right place (in the skin).
|
2015-10-09 17:24:48 +01:00 |
|
David Baker
|
e158eec94d
|
Unset matrix client first otherwise login sets it, the it gets unset and you can't log in again.
|
2015-10-09 13:48:17 +01:00 |
|
David Baker
|
53a7f4b3a8
|
Set state to ready only if the SDK is synced.
|
2015-10-09 12:05:40 +01:00 |
|
David Baker
|
0791cac572
|
Add method to Modal to create dialog with instantiated React elements as well as Classes.
|
2015-10-09 11:54:46 +01:00 |
|
David Baker
|
05f7a3b4d1
|
Remove now redundant displayname stuff from UserSettings now it's in ChangeDisplayName
|
2015-10-07 18:44:32 +01:00 |
|
David Baker
|
79e468217a
|
Add button for user settings and a change display name widget
|
2015-10-07 18:19:29 +01:00 |
|
David Baker
|
27ca7b48f7
|
Just do all dispatches async: setting the flag obviously does not work for more than 2 nested dispatches.
|
2015-10-05 18:43:22 +01:00 |
|
David Baker
|
b8dd2452db
|
Display correct message for when an invited but not joined user is kicked.
|
2015-10-05 16:44:50 +01:00 |
|
David Baker
|
a1892ee963
|
Improve url / screen handling
Including taking you to the room you asked for originally after login
|
2015-10-05 15:31:08 +01:00 |
|
David Baker
|
2d3b87d56d
|
Don't set empty mime types on metadata.
|
2015-10-02 18:37:15 +01:00 |
|
David Baker
|
2bce4e4d62
|
Merge c62d97ca04 from vector-im
The hack is *evil*. Not dirty.
|
2015-10-02 14:37:34 +01:00 |
|
David Baker
|
7de136a930
|
Port over new logic for filtering actions: makes the end call button appear & disappear approriately
|
2015-10-01 10:19:18 +01:00 |
|
David Baker
|
5004a3a5b3
|
Make end call button work for conf calls
|
2015-10-01 09:42:58 +01:00 |
|
David Baker
|
cb89d3760a
|
Hacks to make sure we don't end up with multiple split-brain CallHandlers when npm linked.
|
2015-09-30 18:21:25 +01:00 |
|
David Baker
|
b68665ead5
|
Add support for the basic notion of conference calls and an experimental concept of modules to provide the actual functionality. Rejig Skinner to be simpler.
|
2015-09-30 16:50:46 +01:00 |
|
David Baker
|
9fb5702c2f
|
make MatrixClientPeg an actual global too otherwise things go very wierd
|
2015-09-28 17:46:49 +01:00 |
|
David Baker
|
8af6c2275b
|
Make it easier to override default avatar urls
|
2015-09-28 17:06:13 +01:00 |
|
David Baker
|
3792d5494a
|
Dispatcher should be a global too
|
2015-09-28 14:48:50 +01:00 |
|
David Baker
|
3be50e327d
|
Manually merge memberlist fix from vector master
|
2015-09-28 11:32:00 +01:00 |
|
David Baker
|
6348c2cf99
|
Change how viewing a room alias works to make way for jumping into a room once you've logged in.
|
2015-09-25 17:22:42 +01:00 |
|
David Baker
|
bc2eca16f9
|
Unused guff
|
2015-09-25 16:25:20 +01:00 |
|
David Baker
|
fe369858b7
|
Unused variables & redundant stuff
|
2015-09-25 15:17:46 +01:00 |
|
David Baker
|
5af43dc6a9
|
Remove unused action dispatch
|
2015-09-23 09:39:49 +01:00 |
|
David Baker
|
96627d4477
|
Port membertile fix
|
2015-09-22 16:51:16 +01:00 |
|
David Baker
|
3838569625
|
Port memberlist branch fixes
|
2015-09-22 16:37:39 +01:00 |
|
David Baker
|
b32658cfd0
|
Load fewer events when switching to a room: they take surprisingly long to render.
|
2015-09-22 15:18:16 +01:00 |
|
David Baker
|
980ce7fdae
|
Remainder of the controllers from vector
|
2015-09-21 17:23:51 +01:00 |
|
David Baker
|
49c5f7cb95
|
Use same protocol as client was loaded over for recaptcha to prevent JS origin errors.
|
2015-09-21 16:53:50 +01:00 |
|
David Baker
|
1b82d92fa1
|
Port registration fixes
|
2015-09-21 16:38:12 +01:00 |
|
David Baker
|
65498600de
|
port login fixes
|
2015-09-21 16:36:17 +01:00 |
|
David Baker
|
28c4a648be
|
Port roomlist fixes
|
2015-09-21 16:31:31 +01:00 |
|
David Baker
|
e2c9afb278
|
port create room
|
2015-09-21 16:28:39 +01:00 |
|
David Baker
|
29d2ed7191
|
Merge userselector changes
|
2015-09-21 16:17:29 +01:00 |
|
David Baker
|
82aa603596
|
Merge in resend support
|
2015-09-21 16:14:19 +01:00 |
|
David Baker
|
a8eb93bd6f
|
Member list
|
2015-09-18 18:39:16 +01:00 |
|
David Baker
|
31ee667102
|
Room header
|
2015-09-18 14:34:36 +01:00 |
|
David Baker
|
b9538a077c
|
Missed files from last commit
|
2015-09-18 13:54:20 +01:00 |
|
David Baker
|
343de6245f
|
Port ServerConfig changes
|
2015-09-18 13:33:51 +01:00 |
|
David Baker
|
08b5888d03
|
More porting: make sending messages work again!
|
2015-09-18 10:44:57 +01:00 |
|
David Baker
|
abeed92501
|
Partial porting over of vector controller logic to react sdk.
|
2015-09-17 18:23:38 +01:00 |
|
David Baker
|
d938ba70d3
|
Port over room leaving
|
2015-09-17 12:10:01 +01:00 |
|
David Baker
|
88aaf82c88
|
Backport: linkify emotes
|
2015-09-16 16:23:35 +01:00 |
|
David Baker
|
f3b30477ce
|
Backport: add other presets into room presets
|
2015-09-16 16:10:39 +01:00 |
|
David Baker
|
a4cbbf0d92
|
Backport Notifier improvements from Vector, including TextForEvent
|
2015-09-16 14:48:49 +01:00 |
|
David Baker
|
25ab56106a
|
Backport labels & placeholders for Editable text from Vector
|
2015-09-16 14:18:25 +01:00 |
|
David Baker
|
6cca5f4c05
|
backport fixes from vector
|
2015-09-16 13:48:24 +01:00 |
|
David Baker
|
2d0c8ac9ff
|
Working skin stuff, minus css
|
2015-09-15 13:34:36 +01:00 |
|
David Baker
|
f3b9f8c799
|
WIP reworking of skinning and app integration process
|
2015-09-11 15:42:11 +01:00 |
|
David Baker
|
a06e1f23ea
|
Spurious react-loader require
|
2015-09-10 15:08:26 +01:00 |
|
David Baker
|
635041470f
|
There is no MatrixChat in the sdk anymore (well, only a controller). Advertise the Component Broker instead.
|
2015-09-10 15:07:34 +01:00 |
|
David Baker
|
a124e53a9a
|
Component broker loading files never really worked very well anyway, and now it can't work because they're all defined elsewhere.
|
2015-09-10 15:06:42 +01:00 |
|
David Baker
|
8fbce5fce8
|
de-tab
|
2015-09-08 16:17:06 +01:00 |
|
Mark Haines
|
b66488a783
|
Fix syntax
|
2015-07-20 13:48:40 +01:00 |
|
Mark Haines
|
3f5c220993
|
Move all the calls to createClient inside the MatrixClientPeg
|
2015-07-20 13:19:47 +01:00 |
|
David Baker
|
e6260987cc
|
some s/then/done/
|
2015-07-16 16:53:08 +01:00 |
|
David Baker
|
9b6060a363
|
Decouple login view & controller
|
2015-07-16 16:49:40 +01:00 |
|
David Baker
|
64042c9de8
|
Handle localstorage exceptions.
|
2015-07-16 16:12:54 +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 |
|
David Baker
|
df790c1b54
|
Refactor view/controller logic between files, fix syntax & silly bugs.
|
2015-07-16 12:44:04 +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 |
|
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 |
|
Erik Johnston
|
5cd92229eb
|
Add an editable text atom
|
2015-07-15 13:55:43 +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 |
|
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
|
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 |
|
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
|
53b0ba56db
|
add license header
|
2015-07-03 11:24:04 +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 |
|
Matthew Hodgson
|
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 |
|
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
|
e77e9b7704
|
Add displayNames so they're not all just 'exports' in the react debugger
|
2015-06-19 16:21: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 |
|
David Baker
|
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 |
|
David Baker
|
b31794cda5
|
Focus the text box at appropriate times
|
2015-06-18 15:03:57 +01:00 |
|
David Baker
|
90f6764cbf
|
Fix cleaning unread state on room select & ignore our own messages
|
2015-06-18 14:40:55 +01:00 |
|
David Baker
|
7c405f673a
|
Highlight rooms with unread messages
|
2015-06-18 14:35:17 +01:00 |
|
David Baker
|
a63299aae0
|
Message scrolling
|
2015-06-18 11:23:35 +01:00 |
|
David Baker
|
ed58a59f82
|
Switch everything over to use the component broker.
|
2015-06-17 16:43:29 +01:00 |
|
David Baker
|
b35461f5c0
|
Unused require
|
2015-06-16 18:35:37 +01:00 |
|
David Baker
|
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 |
|
David Baker
|
acaff68748
|
Oops, commit the emote tile.
|
2015-06-16 18:18:34 +01:00 |
|
David Baker
|
3a16c8a764
|
The most important feature
|
2015-06-16 15:29:13 +01:00 |
|
David Baker
|
e2348c50d5
|
Fix logout
|
2015-06-16 14:37:15 +01:00 |
|
David Baker
|
1dbc54e172
|
Oops, put key in the right place
|
2015-06-16 14:31:35 +01:00 |
|
David Baker
|
2bd5b0fdad
|
Just be a little less ugly
|
2015-06-16 14:27:13 +01:00 |
|
David Baker
|
f25bf58d6d
|
Use JS-SDK recommended way of getting sender name.
|
2015-06-16 14:19:46 +01:00 |
|
David Baker
|
672258f604
|
Start rendering messages with something more than the json
|
2015-06-16 11:58:03 +01:00 |
|
David Baker
|
88e9ab02f9
|
Yay, message sending.
|
2015-06-16 11:08:27 +01:00 |
|
David Baker
|
b2843b09bc
|
Rest of commit adding messagecomposer, and put li's in ul.
|
2015-06-16 10:41:05 +01:00 |
|
David Baker
|
a0c5fb4a8b
|
Add not-working-yet text box, plus a bit more css
|
2015-06-15 18:35:28 +01:00 |
|
David Baker
|
2a15b3a98c
|
css tweaking
|
2015-06-15 15:50:24 +01:00 |
|
David Baker
|
52286b2316
|
Prevent default otherwise the form will submit and reload the page
|
2015-06-15 11:00:39 +01:00 |
|
David Baker
|
4bb570c545
|
messages arrive!
|
2015-06-12 18:17:54 +01:00 |
|
David Baker
|
0b0e6adce3
|
Make room changing work
|
2015-06-12 18:01:38 +01:00 |
|
David Baker
|
125fa78bc6
|
Something starting to resemble a Matrix Client
|
2015-06-12 17:34:17 +01:00 |
|
David Baker
|
2f6a123118
|
more Matrixy naming
|
2015-06-12 15:01:36 +01:00 |
|
David Baker
|
971a7c1133
|
Display the room list
|
2015-06-12 14:59:33 +01:00 |
|
David Baker
|
5f970edac5
|
strip out cruft
|
2015-06-12 13:49:23 +01:00 |
|
David Baker
|
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 |
|
David Baker
|
e28fde7ae1
|
Save creds to localstorage
|
2015-06-12 13:12:39 +01:00 |
|
David Baker
|
add78c6e92
|
Oops: the file modifications for making it log in.
|
2015-06-11 18:25:29 +01:00 |
|
David Baker
|
f487b9ba04
|
Make it log in
|
2015-06-11 18:23:02 +01:00 |
|
David Baker
|
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 |
|
David Baker
|
c42733ec95
|
Basic structure of a react SDK and start of an implementation.
|
2015-06-09 17:40:42 +01:00 |