Skip to content

Commit 2d61cf0

Browse files
authored
Merge branch 'development' into resetController-at-explore
2 parents 44cb0c7 + c394039 commit 2d61cf0

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

app/templates/events/view/index.hbs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
<div class="eight wide column">
1919
<Events::View::Overview::GeneralInfo @data={{this.model}} />
2020
<Events::View::Overview::EventTickets @data={{this.model}} />
21-
<Events::View::Overview::SpeakerSession @data={{this.model}} />
21+
{{#if this.model.event.isSessionsSpeakersEnabled}}
22+
<Events::View::Overview::SpeakerSession @data={{this.model}} />
23+
{{/if}}
2224
<Events::View::Overview::ManageRoles @data={{this.model}} @showLink={{true}} />
2325
</div>
2426
</div>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"broccoli-persistent-filter": "^3.1.2",
5959
"croppie": "^2.6.5",
6060
"css-loader": "^5.0.1",
61-
"dompurify": "^2.2.3",
61+
"dompurify": "^2.2.4",
6262
"ember-ajax": "5.0.0",
6363
"ember-auto-import": "^1.9.0",
6464
"ember-classic-decorator": "^2.0.0",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6120,10 +6120,10 @@ [email protected]:
61206120
dependencies:
61216121
domelementtype "1"
61226122

6123-
dompurify@^2.2.3:
6124-
version "2.2.3"
6125-
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.3.tgz#ec653ba521b39f397c2ca045769438d593ea8a9f"
6126-
integrity sha512-8Hv7Q0FuwD9rWoB6qI2eZsfKbGXfoUVuGHHrE15vgk4ReOKwOkSgbqb2OMFtc0d5besOEkoLkcyuV10zQ2X5gw==
6123+
dompurify@^2.2.4:
6124+
version "2.2.4"
6125+
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.4.tgz#a98cd182b729bdd8715c3eb7a8bf8eafb2ff7410"
6126+
integrity sha512-jE21SelIgWrGKoXGfGPA524Zt1IJFBnktwfFMHDlEYRx5FZOdc+4eEH9mkA6PuhExrq3HVpJnY8hMYUzAMl0OA==
61276127

61286128
61296129
version "1.4.3"

0 commit comments

Comments
 (0)