Commit graph

4142 commits

Author SHA1 Message Date
Paul Kaplan
6f303b5216
Merge pull request #2810 from LLK/develop
Merge develop to release branch for 02/28/2019
2019-02-28 09:23:17 -05:00
Paul Kaplan
0c8441a12f
Merge branch 'release/02-28-2019' into develop 2019-02-28 09:23:03 -05:00
Paul Kaplan
87a066e9ac
Merge pull request #2809 from LLK/paulkaplan-patch-5
Bump GUI
2019-02-28 09:20:56 -05:00
Paul Kaplan
6e568ceae9
Bump GUI 2019-02-28 09:20:25 -05:00
Benjamin Wheeler
600205b7b7
Merge pull request #2795 from benjiwheeler/regional-conferences
Add 2019 Regional conferences page
2019-02-28 06:59:10 -05:00
Eric Rosenbaum
fb09d904f9 URL is /vernier 2019-02-27 21:13:46 -05:00
Ben Wheeler
7cbf6764e2 updated route alias for conferences 2019-02-27 17:00:58 -05:00
Ben Wheeler
42844a8927 made more conferences 2019 related strings translatable 2019-02-27 16:58:13 -05:00
Ben Wheeler
b2b3dfa037 updated 2019 conference text per further changes 2019-02-26 16:54:22 -05:00
seotts
2020759204 updated mod job description 2019-02-26 14:04:56 -05:00
jakel181
4de5cb27b6
Update moderator.jsx 2019-02-26 07:56:54 -05:00
apple502j
5e34e41a21
Add SiP texts 2019-02-26 18:24:57 +09:00
apple502j
cf4cf875b2
Add SiP Link 2019-02-26 18:23:33 +09:00
Ben Wheeler
6668e6d840 updated text and icons per feedback from scratch foundation 2019-02-25 17:22:30 -05:00
Ben Wheeler
42f2486e1c improved 2019 conference responsiveness, improved calendar icon 2019-02-25 13:49:08 -05:00
Ben Wheeler
3e02b59866 improve responsive layouts of 2019 conferences page 2019-02-25 11:47:10 -05:00
Ben Wheeler
f33b96d6bf new title image for conference page, new calendar icon 2019-02-20 18:13:07 -05:00
Ben Wheeler
5b20f743f2 added envelope, calendar icons 2019-02-20 17:55:32 -05:00
Ben Wheeler
c29518bd6b adjusted 2019 conferences title size 2019-02-20 17:16:30 -05:00
Ben Wheeler
1db06c7034 added new 2019 conferences background 2019-02-20 17:15:58 -05:00
Ben Wheeler
7ef7a40b8e compressed svgs 2019-02-20 17:14:30 -05:00
Ben Wheeler
1483f6d86c revised conference layout and css per feedback 2019-02-20 16:41:52 -05:00
Paul Kaplan
4c6dcb6d53
Merge pull request #2799 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190220184137
chore(package): update scratch-gui to version 0.1.0-prerelease.201902…
2019-02-20 14:41:47 -05:00
greenkeeper[bot]
90c9136400 chore(package): update scratch-gui to version 0.1.0-prerelease.20190220184137
Closes #2786
2019-02-20 18:52:48 +00:00
Paul Kaplan
656ab3ce3c
Merge pull request #2789 from paulkaplan/report-thumbnailing
Get thumbnails from the project for reporting
2019-02-20 13:39:49 -05:00
Ben Wheeler
3179f7e59d use solid icons, not outlines ones, on 2019 conference page 2019-02-19 16:26:30 -05:00
Paul Kaplan
4e8ea5c3bd Get thumbnails from the project for reporting 2019-02-15 14:27:36 -05:00
Ben Wheeler
9509e698cb initial conference 2019 changes 2019-02-15 12:11:14 -05:00
Paul Kaplan
326e75b437
Merge pull request #2788 from LLK/hotfix/fix-toolbox-refresh
Update GUI to bring in toolbox refresh fix
2019-02-15 11:28:59 -05:00
Paul Kaplan
94d8137976
Update GUI to bring in toolbox refresh fix 2019-02-15 09:54:39 -05:00
Paul Kaplan
97abd93130
Merge pull request #2785 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190214204000
chore(package): update scratch-gui to version 0.1.0-prerelease.201902…
2019-02-15 09:27:49 -05:00
Benjamin Wheeler
a985585d80
Merge pull request #2764 from apple502j/patch-11
Don't refer to a section which does not exist
2019-02-15 07:59:51 -05:00
greenkeeper[bot]
e3f10968a2 chore(package): update scratch-gui to version 0.1.0-prerelease.20190214204000
Closes #2779
2019-02-14 22:04:41 +00:00
Paul Kaplan
20ca36e6ba
Merge pull request #2778 from LLK/release/02-13-2019
Release 02/13/2019
2019-02-14 15:30:58 -05:00
Ben Wheeler
752a90965c in FAQ, added reference to Scratch Extensions to blocks change answer 2019-02-14 14:17:57 -05:00
Paul Kaplan
15bfada0ba
Update GUI to fix single-frame-gif issue 2019-02-14 14:03:40 -05:00
Andrew Sliwinski
5e1d2beabf
Merge pull request #2782 from jakel181/patch-2
Updating Privacy Policy
2019-02-14 13:54:07 -05:00
jakel181
99a4408df3
Update privacypolicy.jsx 2019-02-14 11:23:41 -05:00
jakel181
ec87c9ee8f
Update privacypolicy.jsx 2019-02-14 11:12:50 -05:00
jakel181
e15f0c8baa
Update privacypolicy.jsx 2019-02-14 11:08:19 -05:00
Paul Kaplan
fd95283cf0
Merge pull request #2777 from LLK/develop
Merge develop into release branch 02-13-2019
2019-02-13 19:19:34 -05:00
Paul Kaplan
e1654458a2
Merge pull request #2776 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190213213304
chore(package): update scratch-gui to version 0.1.0-prerelease.201902…
2019-02-13 19:18:03 -05:00
greenkeeper[bot]
05cb8cbb52 chore(package): update scratch-gui to version 0.1.0-prerelease.20190213213304
Closes #2775
2019-02-13 23:39:08 +00:00
jakel181
370d249975
Update moderator.jsx 2019-02-13 16:40:10 -05:00
jakel181
4ae339a5e6
Update moderator.jsx 2019-02-13 16:24:20 -05:00
jakel181
3fdfe6d588
Update moderator.jsx 2019-02-13 16:10:50 -05:00
Paul Kaplan
5c6d987875
Merge pull request #2772 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190213180412
chore(package): update scratch-gui to version 0.1.0-prerelease.201902…
2019-02-13 15:34:28 -05:00
greenkeeper[bot]
de9f2c7cf7 chore(package): update scratch-gui to version 0.1.0-prerelease.20190213180412
Closes #2770
2019-02-13 18:28:25 +00:00
Benjamin Wheeler
6ed66a7321
Merge pull request #2767 from benjiwheeler/autocensored-message
show autocensored message if API indicates project was autocensored
2019-02-12 10:31:41 -05:00
Ray Schamp
8ed04f0c98
Merge pull request #2756 from LLK/greenkeeper/initial
Update dependencies to enable Greenkeeper 🌴
2019-02-12 09:56:33 -05:00