scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-12 00:31:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2595 commits 221 branches 1 tag 506 MiB
Commit graph

2595 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Wheeler
e05079a28c mocked my permissioned studios 2018-06-19 00:00:37 -04:00
Ben Wheeler
4c657a1e80 showing actual studio membership, though not unadded studios yet 2018-06-18 23:36:20 -04:00
Ben Wheeler
054824b2de added package-lock.json to .gitignore 2018-06-18 23:36:20 -04:00
Ben Wheeler
847e204efc add to studio modal scrollbar formatting works 2018-06-18 19:47:43 -04:00
Ben Wheeler
f8df3c0146 added royal blue color, button styles, small jsx fixes to Add to Studio modal 2018-06-18 15:17:19 -04:00
Ben Wheeler
9d9226f4a4 got rid of bug keeping page from displaying 2018-06-16 19:28:28 -04:00
Ben Wheeler
f0fbc0a57f add to studio modal appears from project page, looks horrendous 2018-06-16 19:13:50 -04:00
Ben Wheeler
20242af3de preview view comment 2018-06-16 18:19:31 -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
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
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
apple502j
2c6ffd6fd9
Updated link to Scratch Wiki - to new domain 2018-05-30 20:14:03 +09:00
Ken
5deff9c9bd
Fix the /about research page link 2018-05-30 11:17:40 +08:00
Sean Hickey
f86bd5b84b Fixed up page/render include order. Fixed up code readability issue in details page. 2018-05-29 11:07:08 -04:00
Sean Hickey
f54379e0d7 Cleaned up linter errors 2018-05-29 11:07:08 -04:00
Sean Hickey
fd24fbacef Updated asset paths 2018-05-29 11:07:08 -04:00
Sean Hickey
2415dc6391 Removed package-lock 2018-05-29 11:07:07 -04:00
Sean Hickey
9ef187aada Updated conference pages for 2018 2018-05-29 11:07:07 -04:00
chrisgarrity
80de164d02
Handle See inside button (#1890) 
* Handle See inside button

Import GUI reducers, initial state and middleware (throttle).

Update render to handle state and middleware.

Remove preview mode state and use scratchGui.mode from redux instead.

URL is getting updated, and mode will be updated based on URL. However, the history needs work - it doesn’t work with the modal back.

* Update to latest GUI

This is the minimum version of GUI that is needed for see-inside

* Really remove cruft.
 2018-05-24 16:23:07 -04:00
Bryce Taylor
15779d833e
Merge pull request #1888 from BryceLTaylor/Selenium-login-failure-tests 
Selenium login failure tests
 2018-05-23 14:27:44 -04:00
Ray Schamp
8cb008f4b1
Merge pull request #1894 from LLK/hotfix/gdpr 
[Master] Hotfix Privacy Policy updates
 2018-05-23 11:34:38 -04:00
Andrew Sliwinski
c0ac741065 Remove link from email address 2018-05-23 09:55:56 -04:00
Andrew Sliwinski
0a7bcdf907 Fix mailto link 2018-05-23 09:55:52 -04:00
Andrew Sliwinski
311d7e5959 Fix links to account settings / password 2018-05-23 09:55:48 -04:00
Andrew Sliwinski
59ca64579e Fix typo 2018-05-23 09:55:42 -04:00
Andrew Sliwinski
244a76149b Resolve lint issues 2018-05-23 09:55:36 -04:00
Andrew Sliwinski
f6a11e1c43 Update default 'opt-in' state for teacher registration 2018-05-23 09:55:27 -04:00