scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 23:57:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2720 commits 217 branches 1 tag 464 MiB
Commit graph

2720 commits

This branch
This branch
All branches
Author SHA1 Message Date
chrisgarrity
1cfc5a8144
Merge pull request #1875 from chrisgarrity/issue/fix-path-for-fastly 
Correct preview route for fastly
 2018-05-03 08:14:48 -04:00
chrisgarrity
6df58e41fd Correct preview route for fastly 
- use more explicit route
- handle fastly error in the callback correctly
- more succinct parsing of the URL path
 2018-05-02 17:04:14 -04:00
chrisgarrity
d1420862ea
Initial GUI embed (#1869) 
- `/preview/editor` will load GUI with an empty project
- `/preview/:id/editor` will load GUI with a project from the projects server (not local data)
- passes intl object to GUI
- `/preview/:id` with show the project page with an embedded player
- `/preview/:id/fullscreen` will load the project page with the player in fullscreen mode.

* Note that we needed to Increase memory for the build to avoid running out of heap space, and build time increases by about 2 minutes
 2018-05-02 15:27:49 -04:00
chrisgarrity
04e27ec02a
Merge pull request #1870 from chrisgarrity/tx-add-research 
Add research view to transifex config
 2018-05-02 09:58:52 -04:00
chrisgarrity
8afaf36232 Add research view to transifex config 
the `view/research/l10n.json` configuration was missing from the transifex config, so translations are missing.
 2018-05-01 20:11:20 -04:00
chrisgarrity
4e9e791e2e
Merge pull request #1867 from LLK/hotfix/close-conf-reg 
[MASTER] Close registration when full
 2018-04-27 12:01:19 -04:00
chrisgarrity
65e7657680
Merge pull request #1868 from LLK/hotfix/close-conf-reg 
[DEVELOP] Close registration when full
 2018-04-26 15:00:22 -04:00
chrisgarrity
b8326a3d57
Feature/preview project2 (#1856) 
* Add user-session awareness
  - only show remix button if user is logged in (TBD: probably will want to hide if project creator == user)
* decorate text with @mentions and #hashtags
* Add studios, loves, favs
* In-place editing of title and description if current user is author and project shared (with validation)
 2018-04-24 11:00:47 -04:00
Linda
569773c0ea Gh 1834/add kazahk to language menu (#1859) 
* added kazakh to languages
 2018-04-24 10:33:52 -04:00
Ray Schamp
02e2ec8403
Merge pull request #1864 from LLK/hotfix/conference-remove-dorm 
[Master] Remove dorm information from 2018 Conference page
 2018-04-23 16:40:02 -04:00
Ray Schamp
773b77d5e8
Merge pull request #1863 from LLK/hotfix/remove-recent-row 
[Master] remove recent projects row
 2018-04-23 16:39:53 -04:00
Ray Schamp
c173922df6
Merge pull request #1861 from LLK/hotfix/conference-remove-dorm 
[Develop] Remove dorm information from 2018 Conference page
 2018-04-23 16:38:53 -04:00
Ray Schamp
9816846409
Merge pull request #1862 from LLK/hotfix/remove-recent-row 
[Develop] remove recent projects row
 2018-04-23 16:37:58 -04:00
chrisgarrity
520bd21cf2 remove obsolete l10n message 2018-04-23 16:29:51 -04:00
chrisgarrity
8cd28baef4 Remove recently shared row 2018-04-20 17:33:38 -04:00
chrisgarrity
ce6d78c715 Remove NEU dorm accomodations 
Dorms are no longer available. Fixes #1851
 2018-04-19 17:06:58 -04:00
Sarah Otts
5195e0e6b4
Merge pull request #1853 from seotts/issue/counter-notification 
Update DMCA copy
 2018-04-11 11:29:35 -05:00
seotts
9ab5cc9e5c added p around list 2018-04-10 16:33:41 -05:00
seotts
1948a320e6 Merge branch 'develop' of github.com:LLK/scratch-www into develop 2018-04-10 11:59:45 -05:00
Andrew Sliwinski
b544ccdaa7
Merge pull request #1846 from apple502j/develop 
Added Giga
 2018-04-09 08:26:10 -04:00
Ray Schamp
417791b589
Merge pull request #1849 from LLK/release/march-2018 
[Develop] March 2018 Release
 2018-04-05 17:01:47 -04:00
Ray Schamp
8f1bc76729
Merge pull request #1841 from LLK/release/march-2018 
[Master] March 2018 Release
 2018-04-05 17:00:50 -04:00
chrisgarrity
6f775b4293 revise react-slick and slick-carousel versions 2018-04-03 20:28:17 -04:00
apple502j
3a6c182087
Added Giga 2018-04-04 08:36:04 +09:00
Ray Schamp
52a5d929d1 Render messages inline 
This omits `for...of` which requires Symbol. The Symbol polyfill required by Babel for `for...of` apparently doesn't work for the react-tooltip library.  So just don't use `for...of`.
 2018-04-03 17:27:06 -04:00
Ray Schamp
25a0c5b729 Add Object.assign polyfill 
Fixes IE11 Splash page error
 2018-04-03 14:31:41 -04:00
chrisgarrity
a4572b37ec
Merge pull request #1740 from Kenny2github/research-page 
Migrate /research page
 2018-04-03 13:04:21 -04:00
Ken
68ae157bbf
Add /info/research redirect 2018-04-03 21:13:30 +08:00
Kenny2github
a516e8d9be Lint 2018-04-03 19:28:53 +08:00
Kenny2github
bf8baaf7d0 Fix everything 
*Updated to new convention for InformationPages
+Added route in routes.json (might be missing previous /info/research path)
-Removed package-lock.json to fix conflicts
*Updated l10n to not use HTML
 2018-04-03 16:22:36 +08:00
Ray Schamp
ac17fd9268 Un-update website 
This reverts commit b3845a975e.

(ty @seotts!)
 2018-04-02 17:22:54 -04:00
Ray Schamp
ba45940807
Merge pull request #1843 from rschamp/upgrade-react 
Upgrade to React 16
 2018-04-02 17:19:50 -04:00
Ray Schamp
2f8017bb89 Lint 2018-04-02 17:04:54 -04:00
Ray Schamp
a01cb1962e Use empty string for placeholder value 
Fixes React warning about using `selected` prop on `select` component options
 2018-04-02 15:16:19 -04:00
Ray Schamp
8d634c7f22 Update formsy-react-component to 1.0 
It's out of beta!
 2018-04-02 15:02:54 -04:00
Ray Schamp
3ff3236b70 Fix ajv version 
Previously I was seeing a warning that ajv@5 was required, so I downgraded. I was mistaken, because now the warning says 6 is required...
 2018-04-02 15:02:34 -04:00
Ray Schamp
cc041c2550 Update Symbol polyfill to actual minified version 2018-04-02 14:53:05 -04:00
chrisgarrity
19039a4905 Catch empty phone number 2018-04-02 13:49:45 -04:00
chrisgarrity
730835c4be Fix validation and lint errors 
* checkbox needed a default value
* general-error is passed a ref by formsy - cannot be stateless function
* add missing `label` prop to input field
* add missing proptypes to phoneinput.
 2018-04-02 12:26:12 -04:00
Ray Schamp
b3845a975e update website 2018-03-30 16:49:21 -04:00
Ray Schamp
191a95eb76 Resurrect phone input validation 2018-03-30 13:45:42 -04:00
Ray Schamp
41780fb7cb Finish updating react-telephone-input 2018-03-30 12:11:21 -04:00
Ray Schamp
ad81dba61b Finish linting 2018-03-30 11:28:59 -04:00
Ray Schamp
9001e6ba5c Lint 2018-03-30 11:21:41 -04:00
Ray Schamp
33e7b7fdd9 Remove package-lock.json 2018-03-30 10:51:23 -04:00
chrisgarrity
3c8fb99c44 eslint dependency 
Someday: remove this when updating eslint
 2018-03-30 10:51:23 -04:00
chrisgarrity
7c46f6957a Fix up student registration 2018-03-30 10:51:23 -04:00
chrisgarrity
67f292037a Correcting teacher registration for react16 2018-03-30 10:51:22 -04:00
Ray Schamp
55a45349da WIP - update phone input 2018-03-30 10:51:22 -04:00
Ray Schamp
827942f910 Update ES6 Symbol polyfill 
Apparently the one we are using isn't sufficient for one of our dependencies coming with scratch-gui, so update to a different one that is sufficient.
 2018-03-30 10:51:22 -04:00