Skip to content

Commit ffd4877

Browse files
authored
Merge branch 'development' into event-catd
2 parents f934c7f + de79590 commit ffd4877

File tree

3 files changed

+29
-23
lines changed

3 files changed

+29
-23
lines changed

app/templates/public/index.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="ui hidden divider"></div>
77
{{/if}}
88
{{#if (and this.model.event.isOneclickSignupEnabled this.model.tickets)}}
9-
<h2>{{t 'Registration'}}</h2>
9+
<h2 id="tickets">{{t 'Registration'}}</h2>
1010
{{!-- template-lint-disable style-concatenation --}}
1111
{{#each (sort-by 'position' this.model.tickets) as |ticket| }}
1212
{{#if (includes ticket.type 'Registration')}}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
"ember-export-application-global": "^2.0.1",
111111
"ember-fetch": "8.1.1",
112112
"ember-fullcalendar": "^1.8.0",
113-
"ember-h-captcha": "^2.2.1",
113+
"ember-h-captcha": "^2.2.2",
114114
"ember-href-to": "4.1.0",
115115
"ember-infinity": "^2.2.1",
116116
"ember-l10n": "^4.3.1",
@@ -136,7 +136,7 @@
136136
"ember-truth-helpers": "^3.0.0",
137137
"ember-uuid": "^2.1.0",
138138
"eslint": "^7.32.0",
139-
"eslint-plugin-ember": "^10.5.5",
139+
"eslint-plugin-ember": "^10.5.6",
140140
"eslint-plugin-ember-suave": "^2.0.1",
141141
"eslint-plugin-node": "^11.1.0",
142142
"fastboot-app-server": "^3.0.0",
@@ -160,9 +160,9 @@
160160
"style-loader": "^2.0.0",
161161
"tinyColorPicker": "https://github.com/PitPik/tinyColorPicker#1.1.1",
162162
"torii": "^0.10.1",
163-
"typescript": "^4.4.3",
163+
"typescript": "^4.4.4",
164164
"url-parse": "^1.5.3",
165-
"webpack-bundle-analyzer": "^4.4.2",
165+
"webpack-bundle-analyzer": "^4.5.0",
166166
"wysihtml": "^0.5.5",
167167
"xgettext-template": "^4.1.1"
168168
},

yarn.lock

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5518,6 +5518,11 @@ commander@^6.2.0:
55185518
resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
55195519
integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==
55205520

5521+
commander@^7.2.0:
5522+
version "7.2.0"
5523+
resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
5524+
integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
5525+
55215526
common-tags@^1.4.0, common-tags@^1.8.0:
55225527
version "1.8.0"
55235528
resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
@@ -7563,12 +7568,12 @@ [email protected], "ember-getowner-polyfill@^1.1.0 || ^2.0.0", ember
75637568
ember-cli-version-checker "^2.1.0"
75647569
ember-factory-for-polyfill "^1.3.1"
75657570

7566-
ember-h-captcha@^2.2.1:
7567-
version "2.2.1"
7568-
resolved "https://registry.yarnpkg.com/ember-h-captcha/-/ember-h-captcha-2.2.1.tgz#a80e99c1419731585456dd595755bc34a73a2b56"
7569-
integrity sha512-YMA09CVmlQ9UlPNtCFg8Fd+0bBcIHItHJuSj2FLbbvfkn6zvesQtnr/msicVaK3BB0snsnZE0j/v+pS7VkDypQ==
7571+
ember-h-captcha@^2.2.2:
7572+
version "2.2.2"
7573+
resolved "https://registry.yarnpkg.com/ember-h-captcha/-/ember-h-captcha-2.2.2.tgz#39a070ad869045104ea3d61eff089d9cbb671c5b"
7574+
integrity sha512-6I8UgS/1L7/6d/vbv+yVs8AbBStScayr7hHe1PO76vbmHHDy4JAaGUjTqh4F7w36UqfLvfjEzt+ouenEoXY/PQ==
75707575
dependencies:
7571-
"@ember/render-modifiers" "^1.0.2"
7576+
"@ember/render-modifiers" "^2.0.0"
75727577
ember-cli-babel "^7.26.6"
75737578
ember-cli-htmlbars "^5.7.1"
75747579
tracked-toolbox "^1.2.3"
@@ -8436,15 +8441,16 @@ eslint-plugin-ember-suave@^2.0.1:
84368441
eslint-plugin-import "^2.17.2"
84378442
requireindex "~1.2.0"
84388443

8439-
eslint-plugin-ember@^10.5.5:
8440-
version "10.5.5"
8441-
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-10.5.5.tgz#fbd292f24ea9ea4d32979d42039dbb878b6cf545"
8442-
integrity sha512-yuNiGyOT2pRaGcifJo9H5RU5XlHiVUXvNuAlLBXrTQyZtsOYFBsXgEhMCCq4BVV/0Q79SqXG+03ceB1YtoJHEQ==
8444+
eslint-plugin-ember@^10.5.6:
8445+
version "10.5.6"
8446+
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-10.5.6.tgz#2f44fc4bfd8b9bfc80d3956c29cd9cc0380fca42"
8447+
integrity sha512-07R1wxKQ8otuD6k0dEOvahztgsFt2tnGV1V8Uj0d2SX0KsGGrpAIQRiEmlaQ1nd0DpgpszbhOBvsMLV4F/CtIQ==
84438448
dependencies:
84448449
"@ember-data/rfc395-data" "^0.0.4"
84458450
css-tree "^1.0.0-alpha.39"
84468451
ember-rfc176-data "^0.3.15"
84478452
eslint-utils "^3.0.0"
8453+
estraverse "^5.2.0"
84488454
lodash.kebabcase "^4.1.1"
84498455
requireindex "^1.2.0"
84508456
snake-case "^3.0.3"
@@ -16025,10 +16031,10 @@ typescript-memoize@^1.0.0-alpha.3:
1602516031
dependencies:
1602616032
core-js "2.4.1"
1602716033

16028-
typescript@^4.4.3:
16029-
version "4.4.3"
16030-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
16031-
integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==
16034+
typescript@^4.4.4:
16035+
version "4.4.4"
16036+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c"
16037+
integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==
1603216038

1603316039
ua-parser-js@^0.7.14, ua-parser-js@^0.7.28:
1603416040
version "0.7.28"
@@ -16422,15 +16428,15 @@ webidl-conversions@^6.1.0:
1642216428
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
1642316429
integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
1642416430

16425-
webpack-bundle-analyzer@^4.4.2:
16426-
version "4.4.2"
16427-
resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz#39898cf6200178240910d629705f0f3493f7d666"
16428-
integrity sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ==
16431+
webpack-bundle-analyzer@^4.5.0:
16432+
version "4.5.0"
16433+
resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5"
16434+
integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==
1642916435
dependencies:
1643016436
acorn "^8.0.4"
1643116437
acorn-walk "^8.0.0"
1643216438
chalk "^4.1.0"
16433-
commander "^6.2.0"
16439+
commander "^7.2.0"
1643416440
gzip-size "^6.0.0"
1643516441
lodash "^4.17.20"
1643616442
opener "^1.5.2"

0 commit comments

Comments
 (0)