Commit graph

5364 commits

Author SHA1 Message Date
picklesrus
d01b3c8b31 Add 250 student question.
Change formttedhtmlmessage -> formattedmessage
2020-03-05 09:15:44 -05:00
picklesrus
4404f2bbf4 Initial commit for educator FAQ updates. 2020-03-04 18:14:32 -05:00
Ray Schamp
720e2bacba
Merge pull request #3730 from rschamp/hotfix/conference-delay-spacing
[Develop] Split out message about conference registration delay
2020-03-03 11:12:07 -05:00
Paul Kaplan
1a063ec527
Merge pull request #3727 from LLK/hotfix/reduce-report-vis
[Develop] Reduce report prominence
2020-03-03 09:38:24 -05:00
rschamp
f596089d0a Split out message about conference registration delay 2020-03-03 09:31:24 -05:00
Paul Kaplan
e43cb7ab4e Reorder and de-red report action on project page 2020-03-03 08:56:25 -05:00
Ray Schamp
3c977365ed
Merge pull request #3724 from LLK/hotfix/conference-2020-03-02
[Develop] Update conference page to open registration
2020-03-02 16:41:58 -05:00
Ray Schamp
5a47ed9631
Merge pull request #3723 from LLK/hotfix/conference-2020-03-02
[Master] Update conference page to open registration
2020-03-02 16:41:34 -05:00
rschamp
3d87f6feed Make updates in response to COVID-19 2020-03-02 15:53:23 -05:00
rschamp
375e525372 Fix dates, be less paranoid about l10n ids
The strings will get updated, even if the id persists.
2020-03-02 11:26:34 -05:00
rschamp
3c3b29708d Address various copy-paste errors
Nice catch @adroitwhiz :)
2020-03-02 10:16:47 -05:00
rschamp
0e83287b37 Update conference page to open registration 2020-02-29 11:02:09 -05:00
DD Liu
2f62c92348
Merge pull request #3720 from fsih/updateGui
pull in revert scratch render
2020-02-28 14:18:52 -05:00
DD Liu
a88f16c08f pull in revert 2020-02-28 14:18:05 -05:00
DD Liu
67d91ed820
Merge pull request #3716 from fsih/updateGui
Update gui to bring in changes to pen line drawing
2020-02-27 16:54:15 -05:00
DD Liu
3361ba0134 update gui 2020-02-27 16:53:09 -05:00
chrisgarrity
28078edf1a
Merge pull request #3714 from LLK/release/2020-02-27
[Develop] Release/2020-02-27
2020-02-27 15:51:12 -05:00
chrisgarrity
891a02621e
Merge pull request #3713 from LLK/release/2020-02-27
[Master] Release/2020-02-27
2020-02-27 14:59:09 -05:00
chrisgarrity
784c013aaf
Merge pull request #3715 from LLK/develop
update gui in release
2020-02-26 18:42:51 -05:00
chrisgarrity
414e71c772
Merge pull request #3711 from chrisgarrity/update-gui
update gui version
2020-02-26 18:41:29 -05:00
chrisgarrity
e5ee9487ae
Merge pull request #3712 from LLK/develop
Update release branch from develop
2020-02-26 18:28:52 -05:00
Chris Garrity
12a29c8cc0 update gui version
use latest version of gui and the latest l10n.
2020-02-26 17:45:20 -05:00
Benjamin Wheeler
078be031e1
Merge pull request #3676 from benjiwheeler/cleanspeak-use-api
use api instead of scratchr2 to validate usernames
2020-02-25 17:42:13 -05:00
Eric Rosenbaum
ec1b0d1b19
Merge pull request #3704 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200220193453
Update scratch-gui to the latest version 🚀
2020-02-20 15:36:53 -05:00
greenkeeper[bot]
3e7afedb90
chore(package): update lockfile package-lock.json 2020-02-20 20:10:45 +00:00
greenkeeper[bot]
fd4a891e2c
chore(package): update scratch-gui to version 0.1.0-prerelease.20200220193453 2020-02-20 20:10:40 +00:00
Eric Rosenbaum
d6716e4ce1
Merge pull request #3700 from ericrosenbaum/update-gui
update gui
2020-02-19 21:03:03 -05:00
Eric Rosenbaum
71ad0c76e9 update gui 2020-02-19 20:58:42 -05:00
Eric Rosenbaum
4c218c70a6
Merge pull request #3697 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200214190329
update gui
2020-02-18 17:20:38 -05:00
greenkeeper[bot]
2f0dd00ae9
chore(package): update lockfile package-lock.json 2020-02-14 20:00:38 +00:00
greenkeeper[bot]
6c201d9767
chore(package): update scratch-gui to version 0.1.0-prerelease.20200214190329
Closes #3694
2020-02-14 20:00:32 +00:00
DD Liu
50c451ad8d
Merge pull request #3692 from LLK/release/2020-02-13
[Develop] Release 2020-02-13
2020-02-13 15:11:23 -05:00
DD Liu
178b6353fb
Merge pull request #3691 from LLK/release/2020-02-13
[Master] Release 2020-02-13
2020-02-13 15:08:55 -05:00
Karishma Chadha
12e2ae8132
Merge pull request #3693 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200213175628
Update scratch-gui to the latest version 🚀
2020-02-13 13:14:16 -05:00
greenkeeper[bot]
b604e86d53
chore(package): update lockfile package-lock.json 2020-02-13 18:09:26 +00:00
greenkeeper[bot]
97ba63ebda
chore(package): update scratch-gui to version 0.1.0-prerelease.20200213175628 2020-02-13 18:09:22 +00:00
Karishma Chadha
a8c1439e51
Merge pull request #3690 from LLK/develop
Pull in latest changes for release
2020-02-12 18:48:32 -05:00
Karishma Chadha
4bc08122bf
Merge pull request #3689 from kchadha/update-scratch-gui
Update to the latest scratch-gui
2020-02-12 18:42:45 -05:00
Karishma Chadha
ce64a1dd39 Update to the latest scratch-gui 2020-02-12 18:41:34 -05:00
DD Liu
9f783502bc
Merge pull request #3688 from fsih/updateGui
Update gui to bring in paint centering fade update
2020-02-12 14:03:23 -05:00
DD Liu
eb7d420eb6 Update gui to bring in paint centering fade update 2020-02-12 14:02:47 -05:00
DD Liu
f6b81aa485
Merge pull request #3686 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200210182220
Greenkeeper/scratch gui 0.1.0 prerelease.20200210182220
2020-02-10 14:57:11 -05:00
greenkeeper[bot]
f3f4610d81
chore(package): update lockfile package-lock.json 2020-02-10 18:43:36 +00:00
greenkeeper[bot]
c76cd5dabd
chore(package): update scratch-gui to version 0.1.0-prerelease.20200210182220
Closes #3685
2020-02-10 18:43:30 +00:00
DD Liu
d5428d3297
Merge pull request #3683 from fsih/updateGui
Bring in round gradient strokes in 2.0 projects for compatibility
2020-02-07 14:23:28 -05:00
DD Liu
4ca58dc89a Bring in round 2.0 gradient strokes 2020-02-07 14:22:19 -05:00
DD Liu
918ebce015
Merge pull request #3680 from LLK/release/2020-02-05
[DEVELOP] Release/2020-02-05
2020-02-06 14:19:17 -05:00
DD Liu
2caafe32bf
Merge pull request #3681 from LLK/release/2020-02-05
[MASTER] Release/2020-02-05
2020-02-06 14:18:52 -05:00
DD Liu
8a82213538 Update gui 2020-02-06 13:42:43 -05:00
DD Liu
2ad79fdc19
Merge pull request #3682 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200206002626
Update scratch-gui to the latest version 🚀
2020-02-05 19:56:11 -05:00