gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into release-v1.0.0

This commit is contained in:
J. Ryan Stinnett 2019-02-14 16:58:21 +00:00
parent 4872992ba2 b3f2857c20
commit bf12815473
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/welcome.html
View File

@ -166,6 +166,11 @@ h1::after {
<div class="mx_ButtonLabel">_t("Create Account")</div> <div class="mx_ButtonLabel">_t("Create Account")</div>
</a> </a>
</div> </div>
<!-- The comments below are meant to be used by Ansible as a quick way
to strip out the marked content when desired.
See https://github.com/vector-im/riot-web/issues/8622.
TODO: Convert to config option if possible. -->
<!-- BEGIN Ansible: Remove these lines when guest access is disabled -->
<div class="mx_ButtonRow"> <div class="mx_ButtonRow">
<div> <div>
<div class="mx_ButtonWrapperText">_t("Need help?")</div> <div class="mx_ButtonWrapperText">_t("Need help?")</div>
@ -180,5 +185,6 @@ h1::after {
</a> </a>
</div> </div>
</div> </div>
<!-- END Ansible: Remove these lines when guest access is disabled -->
</div> </div>
</div> </div>

3
test/app-tests/loading.js
View File

@ -149,6 +149,9 @@ describe('loading:', function() {
const config = Object.assign({ const config = Object.assign({
default_hs_url: DEFAULT_HS_URL, default_hs_url: DEFAULT_HS_URL,
default_is_url: DEFAULT_IS_URL, default_is_url: DEFAULT_IS_URL,
embeddedPages: {
homeUrl: 'data:text/html;charset=utf-8;base64,PGh0bWw+PC9odG1sPg==',
},
}, opts.config || {}); }, opts.config || {});
PlatformPeg.set(new WebPlatform()); PlatformPeg.set(new WebPlatform());