Skip to content

Commit 0b7f17e

Browse files
committed
Merge branch 'master' of https://github.com/popcodeorg/popcode into add-title-to-classroom-export
2 parents 67f38bc + 051985e commit 0b7f17e

4 files changed

Lines changed: 11 additions & 19 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ for all the sordid details.
220220
* [Alessia Bellisario](http://aless.co/)
221221
* [Roan Kattouw](https://github.com/catrope)
222222
* [Harpreet Singh](https://github.com/harry1064)
223+
* [Limon Monte](https://limonte.github.io/)
223224
* [Katie Conneally](http://www.katieconneally.com/) created the name Popcode
224225
* Logo design, "Pop" concept, and branding elements by the team at
225226
[Red Peak](http://redpeakgroup.com): Andrew Haug, Aya Kawabata, Jieun Lee,

package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,11 @@
135135
{
136136
"name": "Harpreet Singh",
137137
"url": "https://github.com/harry1064"
138+
},
139+
{
140+
"name": "Limon Monte",
141+
"url": "https://limonte.github.io/",
142+
"email": "limon.monte@gmail.com"
138143
}
139144
],
140145
"keywords": "code editor education learning",
@@ -197,7 +202,7 @@
197202
"slowparse": "^1.1.4",
198203
"strip-markdown": "^3.0.0",
199204
"stylelint": "^8.0.0",
200-
"sweetalert": "^2.0.8",
205+
"sweetalert2": "^7.8.6",
201206
"uuid": "^3.1.0",
202207
"void-elements": "^3.1.0",
203208
"whatwg-fetch": "^2.0.3"

src/previewSupport/overrideAlert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import swal from 'sweetalert';
1+
import swal from 'sweetalert2';
22

33
export default function overrideAlert() {
44
Object.defineProperties(window, { // eslint-disable-line prefer-reflect

yarn.lock

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3253,10 +3253,6 @@ es6-map@^0.1.3:
32533253
es6-symbol "~3.1.1"
32543254
event-emitter "~0.3.5"
32553255

3256-
es6-object-assign@^1.1.0:
3257-
version "1.1.0"
3258-
resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
3259-
32603256
es6-set@^0.1.4, es6-set@~0.1.5:
32613257
version "0.1.5"
32623258
resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
@@ -6368,10 +6364,6 @@ no-case@^2.2.0:
63686364
dependencies:
63696365
lower-case "^1.1.1"
63706366

6371-
node-bin-setup@^1.0.0:
6372-
version "1.0.6"
6373-
resolved "https://registry.yarnpkg.com/node-bin-setup/-/node-bin-setup-1.0.6.tgz#4b5c9bb937ece702d7069b36ca78af4684677528"
6374-
63756367
node-fetch@1.6.3:
63766368
version "1.6.3"
63776369
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
@@ -6480,9 +6472,6 @@ node-static@^0.7.9:
64806472
mime "^1.2.9"
64816473
optimist ">=0.3.4"
64826474

6483-
node@^9.4.0:
6484-
version "9.4.0"
6485-
64866475
nopt@3.0.x:
64876476
version "3.0.6"
64886477
resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -9316,12 +9305,9 @@ svgo@^1.0.1:
93169305
unquote "^1.1.0"
93179306
util.promisify "~1.0.0"
93189307

9319-
sweetalert@^2.0.8:
9320-
version "2.0.8"
9321-
resolved "https://registry.yarnpkg.com/sweetalert/-/sweetalert-2.0.8.tgz#b3ee2adc4dad548d4ae998994f5ac802dc753b86"
9322-
dependencies:
9323-
es6-object-assign "^1.1.0"
9324-
promise-polyfill "^6.0.2"
9308+
sweetalert2@^7.8.6:
9309+
version "7.8.6"
9310+
resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-7.8.6.tgz#85326eb68d6965f9ebc41ad4dfdd0945734d02ec"
93259311

93269312
symbol-observable@^1.0.3:
93279313
version "1.0.4"

0 commit comments

Comments
 (0)