Vector merge #18
dbkr
merged
51 commits into
master
from
vector-merge
Ignore all module caches and make the built js the default include root
e1a6ede1
Remove stuff that's going into the base skin
6cc88e4e
Component broker loading files never really worked very well anyway, …
a124e53a
There is no MatrixChat in the sdk anymore (well, only a controller). …
63504147
Spurious react-loader require
a06e1f23
react-tools is dead. Long live Babel.
9b73d6ed
WIP reworking of skinning and app integration process
f3b9f8c7
Working skin stuff, minus css
2d0c8ac9
We don't use catw here anymore
aba4c1e9
backport fixes from vector
6cca5f4c
Backport labels & placeholders for Editable text from Vector
25ab5610
Backport Notifier improvements from Vector, including TextForEvent
a4cbbf0d
Backport: add other presets into room presets
f3b30477
Backport: linkify emotes
88aaf82c
Port over room leaving
d938ba70
Fix reskindex
6eb18f02
Partial porting over of vector controller logic to react sdk.
abeed925
More porting: make sending messages work again!
08b5888d
Port ServerConfig changes
343de624
Missed files from last commit
b9538a07
Room header
31ee6671
Member list
a8eb93bd
Merge in resend support
82aa6035
Merge userselector changes
29d2ed71
port create room
e2c9afb2
Port roomlist fixes
28c4a648
port login fixes
65498600
Port registration fixes
1b82d92f
Use same protocol as client was loaded over for recaptcha to prevent …
49c5f7cb
Remainder of the controllers from vector
980ce7fd
Load fewer events when switching to a room: they take surprisingly lo…
b32658cf
Port memberlist branch fixes
38385696
Port membertile fix
96627d44
Remove unused action dispatch
5af43dc6
Add -loader packages as deps
d172aaf4
Add link to guthub issue about webpack's loader path silliness
56530d80
Unused variables & redundant stuff
fe369858
Unused guff
bc2eca16
Change how viewing a room alias works to make way for jumping into a …
6348c2cf
We need js sdk 0.2.1 for getRoomIdForAlias
4472f63b
Manually merge memberlist fix from vector master
3be50e32
Dispatcher should be a global too
3792d549
Make it easier to override default avatar urls
8af6c227
make MatrixClientPeg an actual global too otherwise things go very wierd
9fb5702c
Add support for the basic notion of conference calls and an experimen…
b68665ea
Hacks to make sure we don't end up with multiple split-brain CallHand…
cb89d376
Make end call button work for conf calls
5004a3a5
Port over new logic for filtering actions: makes the end call button …
7de136a9
Update Readme
54048ee3
Merge c62d97ca04efdfc59b8299319a3b8e4ea13ff6a3 from vector-im
2bce4e4d
Don't set empty mime types on metadata.
2d3b87d5
Login to write a write a comment.
Login via GitHub