d755903fdb
typo
2017-07-11 14:10:18 +01:00
8ac26dd19f
Give HomePage an unmounted guard
...
Also add missing return in error-handling path
2017-07-11 14:08:16 +01:00
bbb9dd9228
Fix broken riot.im link on homepage
...
For want of a quote the something something
Also add noopeners
2017-06-12 17:33:02 +01:00
d8f7262eac
Merge branch 'develop' into t3chguy/random_fix_1
2017-06-08 15:58:49 +01:00
da69d03b1d
i18n powered by [matrix] sanely
2017-06-08 13:50:53 +01:00
cabbd16dd3
fix colour & hyperlink for home page header
2017-06-08 12:06:52 +01:00
090a7c5761
Remove '/' from homepage URL
...
As we are not always at the root of the web server.
2017-06-07 11:20:41 +01:00
feaff9d99d
Fix tests for new-guest-access
...
This time the test wasn't being flaky, but it does inspect a lot of the internal of RoomView, which has had some modifications recently. I've updated the test to reflect this and it passes locally.
Also, fix a bug in HomePage with an undeclared "error" which should be "err".
Let's see what Travis thinks of this!
2017-06-05 20:16:44 +01:00
884322f82c
remove unused imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:57:42 +01:00
a8f0ed60cf
Merge branch 'new-guest-access' into matthew/i18n-welcome
2017-06-01 11:16:50 +01:00
623f995934
fix untested stuff with iframe homepages
2017-06-01 11:13:04 +01:00
a21c77f4dd
make it work
2017-06-01 00:07:47 +01:00
17e80d7757
i18n welcome
2017-05-31 11:02:59 +01:00
1e1a43c78f
support iframes for RTS urls
2017-05-30 21:52:43 +01:00
1f4f86b5f8
rework tom's welcome page to fit in slightly better with riot's UI/UX
...
* moves login button to top-left
* switches from iframe to a request() to load the welcome page to inherit CSS (probably breaks RTS :/)
* namespace CSS
* change the layout a bit.
2017-05-30 03:58:45 +01:00
8f083a5fdd
Welcome page + too much bootstrap stuff for now
2017-05-26 17:23:34 +00:00
41e7706bc6
Allow team server config to be missing
...
, default to welcome page if either the teamToken or teamServerURL is undefined.
2017-05-25 14:35:59 +01:00
e253f86c63
Improve teamToken prop doc on homePage
2017-05-25 10:23:26 +01:00
efb6316ba0
Implement default welcome page and allow custom URL /w config
...
counterpart to https://github.com/matrix-org/matrix-react-sdk/pull/922
2017-05-24 17:58:03 +01:00
d490bd8638
Use home.html rather than welcome.html
2017-02-07 11:35:17 +00:00
8d4f81ff67
Remove redundant inline style
2017-02-07 11:34:49 +00:00
648204b6f9
Use import
2017-02-07 11:34:34 +00:00
3f49f020cf
Copyright
2017-02-07 11:19:01 +00:00
6a9e5deb7b
Remove commented code
2017-02-02 14:00:21 +00:00
f2e62ff439
Use RTS URL passed through
2017-02-02 11:58:20 +00:00
4a34bee2dc
Use localStorage `mx_team_token` to decide welcome page
2017-02-02 11:12:43 +00:00
40609d7da3
then->done
2017-02-01 11:39:23 +00:00
3f640139d2
quick and dirty support for custom welcome pages, with an example for geektime techfest
2016-11-13 14:10:33 +00:00
Richard van der Hoff