David Baker
df39c3a281
Changes from PR feedback
2015-10-02 16:44:35 +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
2247d951d6
Add config file for default hs/is urls
2015-10-02 11:48:52 +01:00
David Baker
c687f32f39
Port over custom vector roomlist controller with mini callview
2015-10-01 10:46:42 +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
3845a989f6
Get conf calling working, apart from the end call button showing in the right room.
2015-09-30 18:22:15 +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
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
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
fd6e7663cb
Fix notifications
2015-09-28 17:52:34 +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
7d540572fd
Update for new default avatar API.
2015-09-28 17:06:39 +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
c3f32b74e4
Some missed '/' / '.' replacemement
2015-09-28 14:48:07 +01:00
David Baker
588dbf5693
reskindex
2015-09-28 11:34:11 +01:00
David Baker
91c0df4450
Merge branch 'master' into reactsdk-unfork
2015-09-28 11:32:40 +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
f778f6adf9
Remove unused stuff
2015-09-25 15:33:38 +01:00
David Baker
fe369858b7
Unused variables & redundant stuff
2015-09-25 15:17:46 +01:00
David Baker
409697b35b
Oops, these were just at the wrong scope
2015-09-25 11:46:06 +01:00
David Baker
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
Matthew Hodgson
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
David Baker
5af43dc6a9
Remove unused action dispatch
2015-09-23 09:39:49 +01:00
David Baker
b11abae8e8
More fixing up of paths, requires etc
2015-09-22 19:09:23 +01:00
David Baker
7e72ee891a
More fixing up of vector skin
2015-09-22 18:49:04 +01:00
David Baker
40594fc5fa
Fix up controller requires
2015-09-22 18:17:19 +01:00
David Baker
148dbc23ed
Rename base skin to vector
2015-09-22 18:05:55 +01:00
David Baker
682392d02a
Move skins dir to src
2015-09-22 18:05:31 +01:00
David Baker
09b81f46b0
Remove controllers that all come from react-sdk
2015-09-22 17:20:22 +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
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
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
Matthew Hodgson
ef3603cd1a
oops, rogue debugging stmt
2015-09-22 01:25:58 +02:00
Matthew Hodgson
61c94d63e7
make the new userlist UI actually work
2015-09-22 01:16:45 +02:00
Matthew Hodgson
260e22186b
WIP at turning MemberInfo into a ContextualMenu
2015-09-21 19:23:04 +02:00
Matthew Hodgson
048260bb1b
WIP at turning MemberInfo into a ContextualMenu
2015-09-21 19:22:29 +02: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
