David Baker
|
40e4ae9759
|
Remove temporary vector stuff as the sister PR makes it obsolete.
|
2015-12-01 18:34:01 +00:00 |
|
David Baker
|
6978436b07
|
Update component index
|
2015-12-01 18:33:46 +00:00 |
|
David Baker
|
95e71a531e
|
Merge branch 'develop' into kegan/vector-references
Update having merged skindexing PR
|
2015-12-01 18:31:13 +00:00 |
|
David Baker
|
4446f1d781
|
Merge branch 'develop' into kegan/vector-references
|
2015-12-01 18:21:44 +00:00 |
|
David Baker
|
d2c6e2195e
|
Merge pull request #447 from vector-im/skindex-nextgen
Update skindexing for new world order
|
2015-12-01 18:12:47 +00:00 |
|
David Baker
|
83c3c43c27
|
Merge pull request #41 from matrix-org/skindex-nextgen
Update skindexing for new world order
|
2015-12-01 18:11:49 +00:00 |
|
David Baker
|
a63bf7cb35
|
Merge branch 'develop' into skindex-nextgen
|
2015-12-01 18:10:57 +00:00 |
|
David Baker
|
d7a00a5a86
|
Merge branch 'develop' into skindex-nextgen
|
2015-12-01 18:10:04 +00:00 |
|
David Baker
|
7ff5e42f3e
|
Run the CSS through webpack so we can pull in CSS files from modules with require rather than symlinking into the node_module directory which is breaking people on different npm versions.
|
2015-12-01 18:05:43 +00:00 |
|
Matthew Hodgson
|
2c12b9128b
|
highlight binged rooms more clearly
|
2015-12-01 16:57:49 +00:00 |
|
Kegan Dougal
|
e21d435d84
|
Remove debug logging
|
2015-12-01 16:57:40 +00:00 |
|
Kegan Dougal
|
bb289a4145
|
Add CustomServerDialog class
|
2015-12-01 16:49:15 +00:00 |
|
Kegan Dougal
|
a2b28b826c
|
Add CustomServerDialog for vector
|
2015-12-01 16:48:51 +00:00 |
|
Kegan Dougal
|
673b01267a
|
Use LoginHeader everywhere
|
2015-12-01 16:29:58 +00:00 |
|
Kegan Dougal
|
05a6121934
|
Add default LoginHeader
|
2015-12-01 16:27:48 +00:00 |
|
Kegan Dougal
|
8d31f72f83
|
Add VectorLoginHeader
|
2015-12-01 16:27:23 +00:00 |
|
Kegan Dougal
|
e304a1925d
|
Add VectorLoginFooter with vector references
|
2015-12-01 16:12:38 +00:00 |
|
Kegan Dougal
|
52f3d7f18b
|
Add generic LoginFooter. Remove vector reference
|
2015-12-01 16:12:13 +00:00 |
|
Kegsay
|
8b103da3d3
|
Merge pull request #43 from matrix-org/kegan/vector-components
Move remaining Vector-only components
|
2015-12-01 15:59:01 +00:00 |
|
Kegsay
|
819b80d30f
|
Merge pull request #450 from vector-im/kegan/vector-components
Move remaining Vector-only components to src/components
|
2015-12-01 15:58:55 +00:00 |
|
David Baker
|
c281fe785a
|
Merge branch 'develop' into skindex-nextgen
|
2015-12-01 15:53:11 +00:00 |
|
David Baker
|
77b99de46b
|
Update component index
|
2015-12-01 15:52:32 +00:00 |
|
David Baker
|
5e2a4fa537
|
Merge branch 'develop' into skindex-nextgen
|
2015-12-01 15:48:05 +00:00 |
|
Kegan Dougal
|
8083e7f118
|
Move vector-only components to src/components.
|
2015-12-01 15:45:38 +00:00 |
|
Kegan Dougal
|
636be0c003
|
Update getComponent paths
|
2015-12-01 15:45:11 +00:00 |
|
David Baker
|
5098c7d16f
|
Merge branch 'develop' into skindex-nextgen
|
2015-12-01 15:44:45 +00:00 |
|
Kegan Dougal
|
726c893663
|
Merge branch 'develop' into kegan/vector-components
|
2015-12-01 15:39:15 +00:00 |
|
Kegan Dougal
|
e07c03a7bb
|
Merge branch 'develop' into kegan/vector-components
|
2015-12-01 15:39:02 +00:00 |
|
Kegan Dougal
|
d5819d54db
|
Fix typos
|
2015-12-01 15:36:40 +00:00 |
|
Kegsay
|
e7f6e09def
|
Merge pull request #448 from vector-im/kegan/controller-merging4
Phase 4 controller merging
|
2015-12-01 15:34:25 +00:00 |
|
Matthew Hodgson
|
4fe2cc54d6
|
Merge pull request #42 from matrix-org/kegan/controller-merging4
Phase 4 controller merging
|
2015-12-01 15:15:39 +00:00 |
|
Kegan Dougal
|
fe16b221f8
|
s/vector.im/matrix.org/
|
2015-12-01 13:48:53 +00:00 |
|
Matthew Hodgson
|
075d2b508d
|
fix highlights on markdown
|
2015-12-01 13:13:51 +00:00 |
|
Kegan Dougal
|
e55e2bdd0d
|
Remove unused class
|
2015-12-01 11:22:19 +00:00 |
|
Kegan Dougal
|
2a025201b1
|
Move remaining vector molecules to be components in vector (for now)
|
2015-12-01 11:19:54 +00:00 |
|
Kegan Dougal
|
784c1b63dc
|
Move remaining vector molecules to components
|
2015-12-01 11:19:25 +00:00 |
|
Matthew Hodgson
|
f89dcacf07
|
fix bottomleftmenu layout a bit
|
2015-12-01 11:11:32 +00:00 |
|
Matthew Hodgson
|
99f47b8601
|
match design spacing correctly
|
2015-12-01 11:07:12 +00:00 |
|
Matthew Hodgson
|
1896ab67d1
|
fix room avatar offset
|
2015-12-01 11:05:11 +00:00 |
|
Matthew Hodgson
|
2bc3b665d2
|
Merge pull request #445 from vector-im/matthew/new-font
switch to Open Sans
|
2015-12-01 10:59:05 +00:00 |
|
David Baker
|
7f27ffd7bd
|
Fix typos & variable shadowing from PR comments
|
2015-12-01 10:26:08 +00:00 |
|
David Baker
|
1de5d68e95
|
Un-commit accidentally committed file upload stuff
|
2015-12-01 10:25:35 +00:00 |
|
David Baker
|
1df03aa82a
|
Remove unintentional logging
|
2015-12-01 10:20:21 +00:00 |
|
Kegan Dougal
|
1e694da460
|
Move MatrixChat and login components to react SDK.
Removed Modulator as it is no longer necessary in this form. ConferenceHandler
is injected in src/vector/index.js
|
2015-11-30 18:11:04 +00:00 |
|
Kegan Dougal
|
8f5f71ec80
|
Move MatrixChat to react-sdk. Move all login stuff to react SDK.
Removed Modulator stuff.
|
2015-11-30 18:10:09 +00:00 |
|
David Baker
|
021056cfd1
|
Move copyright header
|
2015-11-30 18:00:54 +00:00 |
|
David Baker
|
4f8895f160
|
Copyright header on component index
|
2015-11-30 18:00:19 +00:00 |
|
David Baker
|
6a4038daeb
|
Add 'replaces' tag to mark that the RoomDNDView is a RoomTile
|
2015-11-30 17:56:55 +00:00 |
|
David Baker
|
cadfbcbed3
|
Merge branch 'develop' into skindex-nextgen
|
2015-11-30 17:56:40 +00:00 |
|
David Baker
|
ae8c5bdcb0
|
better comment & regenerated index
|
2015-11-30 17:56:01 +00:00 |
|