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
2914 commits 217 branches 1 tag 464 MiB
Commit graph

2914 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
1840b9df31 Convert presentation function component 
Fixing a typo let the linter catch that this no longer needs to be a class component
 2018-06-14 09:26:44 -04:00
Ray Schamp
4ce05622bc Move report options from state 
These never change so don't belong there.
 2018-06-14 09:22:00 -04:00
Connor Hudson
b317c12e79 Add some mockup extensions 2018-06-13 16:45:48 -04:00
Connor Hudson
e7e0ba720c Add extension list styles 2018-06-13 16:45:06 -04:00
Andrew Sliwinski
87a039c101
Merge pull request #1919 from thisandagain/bugfix/gdpr 
Use 16 as offset for teacher registration
 2018-06-13 16:24:28 -04:00
Colby Gutierrez-Kraybill
f9abebf86a
Merge pull request #1921 from colbygk/hotfix/funding_redirects 
[Master] Add donate and connect (email list) redirects
 2018-06-13 15:59:20 -04:00
Connor Hudson
f9dd4e76aa Add padding to extension status div 2018-06-13 15:35:58 -04:00
Connor Hudson
0733a5dde4 Fix class name for extension icon 2018-06-13 15:32:31 -04:00
Connor Hudson
11af7fec9b Add extension status styling, tweak margins and spacing 2018-06-13 15:24:19 -04:00
Sean Hickey
8f0b12c2a6 Updated sponsor logos and keynote descriptions 2018-06-13 15:12:50 -04:00
Ray Schamp
add01c8393
Merge pull request #1922 from colbygk/hotfix/funding_redirects 
[Develop] Add donate and connect (email list) redirects
 2018-06-13 14:57:50 -04:00
Connor Hudson
a9e8a06c6d Add props to ExtensionChip 2018-06-13 14:53:41 -04:00
Connor Hudson
0056e93e4a Add more margin to extension chip content, use rem where it makes sense 2018-06-13 14:53:26 -04:00
Connor Hudson
6bace1b11e Add ExtensionChip component with demo content 2018-06-13 14:05:20 -04:00
apple502j
070cbe091f
Change splash (GH-1916) 
It uses "30000000 projects" by default now!
 2018-06-13 17:32:35 +09:00
Colby Gutierrez-Kraybill
835b33e91e Add donate and connect (email list) redirects 
* https://scratch.mit.edu/donate → https://secure.donationpay.org/scratchfoundation/
* https://scratch.mit.edu/connect → https://eepurl.com/cws7_f
 2018-06-12 18:27:15 -04:00
Andrew Sliwinski
ca6d78d928 Use 16 as offset for teacher registration as per GDPR 2018-06-12 15:40:52 -04:00
Ray Schamp
9a48aceaf3
Merge pull request #1911 from LLK/release/may-2018 
[Master] May 2018 Release
 2018-06-07 15:22:01 -04:00
Ray Schamp
ee23bbf1b5
Update scratch-gui version 2018-06-05 13:21:37 -04:00
Colby Gutierrez-Kraybill
57c65c82f7
Merge pull request #1839 from colbygk/cleanup_dockerized 
Dockerization
 2018-06-05 10:39:24 -04:00
Ray Schamp
45f006e04e
Emphasize the internal nature of the Docker config 2018-06-05 10:26:48 -04:00
Ray Schamp
4c599f1088
Remove outdated reference to parallel scratch-gui 2018-06-05 10:22:53 -04:00
chrisgarrity
56c2da5ff7 Update to latest gui 2018-06-05 10:08:53 -04:00
Andrew Sliwinski
667d7c1381
Merge pull request #1915 from apple502j/patch-2 
Changed link from /help to /tips
 2018-06-05 08:30:18 -04:00
apple502j
6bb022107d
Changed link from /help to /tips 
#1909
 2018-06-05 18:26:34 +09:00
Andrew Sliwinski
680695d8de
Merge pull request #1902 from Kenny2github/fix-research-link 
Fix the /about research page link
 2018-06-04 12:22:57 -04:00
Andrew Sliwinski
8824b64c89
Merge pull request #1904 from apple502j/patch-1 
Updated link to Scratch Wiki - to new domain
 2018-06-04 12:22:19 -04:00
Ray Schamp
05a47da8ca
Merge pull request #1914 from joker314/patch-1 
Fix search bar's handling of special characters
 2018-06-04 10:53:58 -04:00
jokebookservice1
f95b05467d
Fix search bar's handling of special characters 
`decodeURI` is used for full URIs, not components thereof.
 2018-06-03 13:23:52 +01:00
chrisgarrity
74c76fb1cf Refactor report-modal 
* addresses comments for https://github.com/LLK/scratch-www/pull/1900
* renames report fields to match scratchr2 expectations
* restyle modal to allow display of validation messages
* removed cruft
 2018-06-01 15:25:28 -04:00
chrisgarrity
47b90d449b Fix formatting of long project description fields 
Description block also needed to be `display: flex`, and the content was missing the `overflow: auto` to make it scrollable.
 2018-06-01 09:45:49 -04:00
chrisgarrity
b5a400e29d
Merge pull request #1906 from LLK/hotfix/conference-2018 
[MASTER]:Hotfix/conference 2018
 2018-06-01 08:38:35 -04:00
chrisgarrity
6872cfc51f FIxing PR #1900 comments 
addresses most comments except modal refactor, and error response from sumitting report.
* restore gui as a dev dependency
* better separation of view container/presentation
* replace absolute heights for textareas with making all sub components `display: flex`
* start to make presentation more modular added subcomponents to the view folder:
  * share-banner (moved from components)
  * remix-credit
  * remix-list
  * studio-list
 2018-05-31 21:04:11 -04:00
Ray Schamp
5124c613db
Merge pull request #1910 from LLK/travis 
Run smoke tests with Travis after deployment
 2018-05-31 15:55:23 -04:00
chrisgarrity
963a18980f
Merge pull request #1900 from chrisgarrity/feature/preview-presentation 
Merging this PR as is to avoid more conflicts and to get it into smoke-testing. Will address the comments in subsequent PRs
 2018-05-31 15:35:20 -04:00
BryceLTaylor
ecd3f673a6 Make travis only run selenium tests on Travis Branch 
Until we can get the tests to run reliably
 2018-05-31 15:05:40 -04:00
chrisgarrity
285b2dbcff Updated styles 2018-05-31 15:02:45 -04:00
chrisgarrity
db3120091d Fix lint and don’t duplicate the ‘other’ string 2018-05-31 15:02:45 -04:00
chrisgarrity
c6f197f576 Adjust share-date to give action buttons more room 2018-05-31 15:02:45 -04:00
chrisgarrity
0bc5bf745d Fix up stats line 
* Update for newer version of API - remix count in stats
* create projectShape to remove duplication
* add approximate-number to limit the size of the stats row.
 2018-05-31 15:02:45 -04:00
chrisgarrity
71dfe690be First pass at correcting project input styles 
* Add placeholders to description input text-areas
* fix styling to show box shadow highlight on focus
* adjust height for non-remix project
* fix lint errors
 2018-05-31 15:02:45 -04:00
chrisgarrity
08cf4f4f3d Refactor report modal 
* move all the report modal presentation into the component
* add strings to general l10n file because we don’t handle l10n files in components
* Add current project id and username to the data before submitting
 2018-05-31 15:02:44 -04:00
chrisgarrity
34042c9e8e Report first pass 
Report button opens a modal with the report project form. All the content is currently in `preview/presentation` because components cannot have their own l10n files.
 2018-05-31 15:02:44 -04:00
chrisgarrity
bd391b422a presentation first pass 
First pass at project page design using actual assets from Carl, and matching styles with current design.

Includes a (negative margin) hack to line up the stage. see https://github.com/LLK/scratch-gui/issues/2132
 2018-05-31 14:58:23 -04:00
chrisgarrity
81ac8eeef2
Merge pull request #1907 from LLK/hotfix/conference-2018 
[DEVELOP]: Hotfix/conference 2018
 2018-05-31 14:49:54 -04:00
BryceLTaylor
f15a8bd714 Make selenium-helpers.js build driver in headless mode 2018-05-31 11:52:57 -04:00
chrisgarrity
b64e0d2a5a
Merge pull request #1908 from chrisgarrity/feature/preview-favorites 
Fix up favorites
 2018-05-31 08:18:03 -04:00
BryceLTaylor
55f72e7487 Update travis.yml typo on running smoke tests 2018-05-30 16:29:37 -04:00
chrisgarrity
99ed30e2c8 Fix up favorites 
Found a couple of typos now that API can process favorites.
 2018-05-30 14:39:25 -04:00
BryceLTaylor
d58599a22f Update travis.yml to run smoke tests 2018-05-30 10:40:44 -04:00