Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move everything not explicitly riot (or status) branded into matrix-react-sdk #6500

Merged
merged 22 commits into from
Apr 18, 2018
Merged

move everything not explicitly riot (or status) branded into matrix-react-sdk #6500

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3ecbfae
move everything not explicitly riot (or status) branded into matrix-r…
ara4n Apr 11, 2018
e899fec
move themes to res to match sdk
ara4n Apr 12, 2018
8757c8c
move notif UTs to sdk
ara4n Apr 12, 2018
41d6995
fix braindead typo
ara4n Apr 12, 2018
f569fdd
make VectorHomePage override HomePage
ara4n Apr 12, 2018
534155f
point to new CSS locations
ara4n Apr 12, 2018
be34c84
fix theme paths
ara4n Apr 12, 2018
3d20a64
export enum via method for convenience from matrix-react-sdk
ara4n Apr 13, 2018
aefb782
move conference handler to matrix-react-sdk
ara4n Apr 13, 2018
d693125
move rageshake to sdk
ara4n Apr 13, 2018
a46b718
copy resources from their new locations
ara4n Apr 13, 2018
b8d4866
run gen-i18n to refresh translations now most are moved to react-sdk
ara4n Apr 15, 2018
ce36dec
run prune-i18n to bring translations inline now most are moved to rea…
ara4n Apr 15, 2018
0243ec0
switch karma image loc
ara4n Apr 15, 2018
7c1eafd
merge develop
ara4n Apr 15, 2018
8684fae
kill theming 404s when UTing
ara4n Apr 15, 2018
5c34115
fix theming during tests correctly
ara4n Apr 15, 2018
c8b26a1
fix tests
ara4n Apr 15, 2018
7ee5343
convert VectorHomePage into ES6 and have it nicely override HomePage
ara4n Apr 18, 2018
df3fb83
move deps to sdk for stuff now in the sdk
ara4n Apr 18, 2018
e046a72
flesh out status todo comment
ara4n Apr 18, 2018
104a415
PR feedback; fix staticness and add ;s
ara4n Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/components/structures/VectorHomePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ import sanitizeHtml from 'sanitize-html';
import sdk from 'matrix-react-sdk/lib';

module.exports = React.createClass({
displayName: 'HomePage',
displayName: 'VectorHomePage',
statics: {
replaces: 'HomePage',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it needs a comment.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i forgot about this. I need to turn HomePage into a ES6 class and then have VectorHomePage inherit from it (whilst also replaceing it)

},

propTypes: {
// URL base of the team server. Optional.
Expand Down