711272a7c9
Merge pull request #18 from matrix-org/vector-merge
...
Vector merge
2015-10-02 18:50:52 +01:00
2d3b87d56d
Don't set empty mime types on metadata.
2015-10-02 18:37:15 +01:00
2bce4e4d62
Merge c62d97ca04 from vector-im
...
The hack is *evil*. Not dirty.
2015-10-02 14:37:34 +01:00
54048ee37c
Update Readme
2015-10-01 16:02:21 +01:00
7de136a930
Port over new logic for filtering actions: makes the end call button appear & disappear approriately
2015-10-01 10:19:18 +01:00
5004a3a5b3
Make end call button work for conf calls
2015-10-01 09:42:58 +01:00
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
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
9fb5702c2f
make MatrixClientPeg an actual global too otherwise things go very wierd
2015-09-28 17:46:49 +01:00
8af6c2275b
Make it easier to override default avatar urls
2015-09-28 17:06:13 +01:00
3792d5494a
Dispatcher should be a global too
2015-09-28 14:48:50 +01:00
3be50e327d
Manually merge memberlist fix from vector master
2015-09-28 11:32:00 +01:00
4472f63b5f
We need js sdk 0.2.1 for getRoomIdForAlias
2015-09-25 17:49:35 +01:00
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
bc2eca16f9
Unused guff
2015-09-25 16:25:20 +01:00
fe369858b7
Unused variables & redundant stuff
2015-09-25 15:17:46 +01:00
56530d80d7
Add link to guthub issue about webpack's loader path silliness
2015-09-25 13:53:58 +01:00
d172aaf41f
Add -loader packages as deps
...
Even though we don't use webpack directly, webpack needs the loaders
to be in the dependency package's node_modules directory, so this
lets packages that depend on us use webpack.
2015-09-25 13:39:21 +01:00
5af43dc6a9
Remove unused action dispatch
2015-09-23 09:39:49 +01:00
96627d4477
Port membertile fix
2015-09-22 16:51:16 +01:00
3838569625
Port memberlist branch fixes
2015-09-22 16:37:39 +01:00
b32658cfd0
Load fewer events when switching to a room: they take surprisingly long to render.
2015-09-22 15:18:16 +01:00
980ce7fdae
Remainder of the controllers from vector
2015-09-21 17:23:51 +01:00
49c5f7cb95
Use same protocol as client was loaded over for recaptcha to prevent JS origin errors.
2015-09-21 16:53:50 +01:00
1b82d92fa1
Port registration fixes
2015-09-21 16:38:12 +01:00
65498600de
port login fixes
2015-09-21 16:36:17 +01:00
28c4a648be
Port roomlist fixes
2015-09-21 16:31:31 +01:00
e2c9afb278
port create room
2015-09-21 16:28:39 +01:00
29d2ed7191
Merge userselector changes
2015-09-21 16:17:29 +01:00
82aa603596
Merge in resend support
2015-09-21 16:14:19 +01:00
a8eb93bd6f
Member list
2015-09-18 18:39:16 +01:00
31ee667102
Room header
2015-09-18 14:34:36 +01:00
b9538a077c
Missed files from last commit
2015-09-18 13:54:20 +01:00
343de6245f
Port ServerConfig changes
2015-09-18 13:33:51 +01:00
08b5888d03
More porting: make sending messages work again!
2015-09-18 10:44:57 +01:00
abeed92501
Partial porting over of vector controller logic to react sdk.
2015-09-17 18:23:38 +01:00
6eb18f0268
Fix reskindex
2015-09-17 18:21:35 +01:00
d938ba70d3
Port over room leaving
2015-09-17 12:10:01 +01:00
88aaf82c88
Backport: linkify emotes
2015-09-16 16:23:35 +01:00
f3b30477ce
Backport: add other presets into room presets
2015-09-16 16:10:39 +01:00
a4cbbf0d92
Backport Notifier improvements from Vector, including TextForEvent
2015-09-16 14:48:49 +01:00
25ab56106a
Backport labels & placeholders for Editable text from Vector
2015-09-16 14:18:25 +01:00
6cca5f4c05
backport fixes from vector
2015-09-16 13:48:24 +01:00
aba4c1e9af
We don't use catw here anymore
2015-09-15 14:46:41 +01:00
2d0c8ac9ff
Working skin stuff, minus css
2015-09-15 13:34:36 +01:00
f3b9f8c799
WIP reworking of skinning and app integration process
2015-09-11 15:42:11 +01:00
9b73d6ed6d
react-tools is dead. Long live Babel.
2015-09-10 15:28:30 +01:00
a06e1f23ea
Spurious react-loader require
2015-09-10 15:08:26 +01:00
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
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