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
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
2f0df6d37e
Merge branch 'master' into reactsdk-unfork
2015-09-22 15:28:50 +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
a545007a19
Merge branch 'master' into reactsdk-unfork
2015-09-21 18:08:58 +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
Matthew Hodgson
56c5f6f46e
clarify deployment
2015-09-19 20:17:45 +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