David Baker
61f951a33e
Merge pull request #190 from vector-im/reactsdk-unfork
...
New vector using react-sdk
2015-10-05 10:31:39 +01:00
David Baker
53c8b9bcf7
no single quotes because windows
2015-10-05 10:20:02 +01:00
David Baker
ad313d7711
Merge branch 'vector-merge'
2015-10-02 18:55:53 +01:00
David Baker
55f656f150
0.0.2
2015-10-02 18:55:09 +01:00
David Baker
711272a7c9
Merge pull request #18 from matrix-org/vector-merge
...
Vector merge
2015-10-02 18:50:52 +01:00
David Baker
2d3b87d56d
Don't set empty mime types on metadata.
2015-10-02 18:37:15 +01:00
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
050c6cf72f
Dummy merge branch 'master' into reactsdk-unfork
...
(affected file no longer in this repo)
2015-10-02 14:36:07 +01:00
David Baker
2247d951d6
Add config file for default hs/is urls
2015-10-02 11:48:52 +01:00
David Baker
7b9cd7c232
Update readme
2015-10-01 16:02:44 +01:00
David Baker
54048ee37c
Update Readme
2015-10-01 16:02:21 +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
Matthew Hodgson
c62d97ca04
better XXXs
2015-09-29 12:57:54 +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
4472f63b5f
We need js sdk 0.2.1 for getRoomIdForAlias
2015-09-25 17:49:35 +01:00
David Baker
3ecf19df49
Disable caching on the local http server as commented
2015-09-25 17:38:51 +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
56530d80d7
Add link to guthub issue about webpack's loader path silliness
2015-09-25 13:53:58 +01:00
David Baker
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
David Baker
796f424a3f
Didn't need these in the end
2015-09-25 11:51:35 +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
Matthew Hodgson
a5a6a35122
don't blindly and inconsistently kill scrollbars
2015-09-24 00:19:40 +02:00
David Baker
bfa4cda2c6
build is no longer used
2015-09-23 10:14:38 +01:00
David Baker
c21dd853f9
Update package.json for renamed skin
2015-09-23 09:48:18 +01:00
David Baker
5af43dc6a9
Remove unused action dispatch
2015-09-23 09:39:49 +01:00
Matthew Hodgson
1901fdf889
oops, bogus commit
2015-09-22 22:57:27 +02: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
dd4cfb25f8
Replace symlinks
2015-09-22 18:06:43 +01:00