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

3193 commits

This branch
This branch
All branches
Author SHA1 Message Date
Connor Hudson
afde4597d0
Merge pull request #2010 from technoboy10/bugfix/tablet-banner-centering 
[DEVELOP] Fix top banner centering on android chrome
 2018-08-01 16:45:52 -04:00
Connor Hudson
42dbeee985 Set more position properties to fix banner centering on android chrome 2018-08-01 16:43:21 -04:00
Ben Wheeler
d941ec1dff do not modify state object directly 2018-08-01 16:37:48 -04:00
Ben Wheeler
7aa81199ce modal halo 2018-08-01 15:53:53 -04:00
Benjamin Wheeler
08453f9f7c
Merge branch 'develop' into studio-modal-benwheeler 2018-08-01 14:46:33 -04:00
carljbowman
35af52c40c
Merge pull request #2007 from carljbowman/develop 
Remove Darken and Ligthen SCSS
 2018-08-01 14:44:19 -04:00
Ben Wheeler
4ce72ce61f consolidated colors per consult with Carl 2018-08-01 14:42:15 -04:00
Ben Wheeler
38f4c6a5c3 rearranged colors; longer studio button names 2018-08-01 11:01:37 -04:00
Connor Hudson
d48adc2ae4 Set more position properties to fix banner centering on android chrome 2018-08-01 10:26:26 -04:00
Ben Wheeler
5fab657fad Merge remote-tracking branch 'origin/develop' into studio-modal-benwheeler 2018-08-01 10:14:09 -04:00
Ben Wheeler
ea3d69330b removed package-lock.json 2018-08-01 09:54:01 -04:00
kyleplo
86befd1e31
Remove recent from language 2018-08-01 09:17:01 -04:00
kyleplo
7091e65fb5
Remove recent option 2018-08-01 09:16:41 -04:00
apple502j
b7fd515517
Update the date 2018-08-01 09:35:18 +09:00
Ben Wheeler
c450b7e658 corrected brackets for lint error 2018-07-31 18:10:42 -04:00
kyleplo
a6bb77de8a
Rename m query parameter to mode 2018-07-31 17:26:03 -04:00
Ben Wheeler
e83f29dbbc moved NaN check in preview.jsx to be guard-style 2018-07-31 16:38:49 -04:00
carljbowman
3352f8a7f0 Add missing semicolon 2018-07-31 15:33:34 -04:00
carljbowman
e3e422714e Fix 2017 conference banner 
Updates the light blue background to a dark blue. Give the text more contrast.
 2018-07-31 15:33:11 -04:00
carljbowman
e41d16e656 Fix button contrast in Tips page masthead 
Previously the button was made aqua, but there was a lot of contrast between the ui-blue and ui-aqua.
 2018-07-31 15:32:29 -04:00
Ben Wheeler
d5e1401968 reverted docker-compose fallback 2018-07-31 15:06:12 -04:00
Ben Wheeler
097fb66955 currentStudioIds now an array; reverted a few changes 2018-07-31 15:00:56 -04:00
carljbowman
6a8676ea35 Remove Darken and Ligthen SCSS 
Updated all the places in the SCSS where we use Darken and Lighten properties.

These properties have been problematic in the past and caused some state issues, e.g. New message(s) hightlight (which was fixed seperately from this issue)
 2018-07-31 14:37:49 -04:00
chrisgarrity
4b3d6b9e9d
Merge pull request #1964 from JoelGritter/JoelGritter-patch-1 
Fix gh-1962: Update footer wiki link
 2018-07-31 08:08:55 -04:00
chrisgarrity
409b452200
Merge pull request #1979 from joker314/feature/add-bryce-taylor 
Add brycedtea to Credits page
 2018-07-31 08:08:21 -04:00
chrisgarrity
08e45c076f
Merge pull request #1980 from GreenBayRules/develop 
Add Kathy Wu to Credits
 2018-07-31 08:07:49 -04:00
kyleplo
9bf2f7d436
Add mode 2018-07-28 07:36:08 -04:00
kyleplo
5ad2476790
Fix indent 2018-07-27 14:16:57 -04:00
kyleplo
0494822f7c
Fix more errors 2018-07-27 13:15:53 -04:00
kyleplo
190cb7553e
Fix errors 2018-07-27 13:09:48 -04:00
kyleplo
6c5d655bd5
Add language file 2018-07-27 12:56:27 -04:00
kyleplo
539cfa5bcd
Add filter mode dropdown 2018-07-27 12:54:59 -04:00
kyleplo
3ebe44f86a
Add css for dropdown 2018-07-27 12:06:06 -04:00
Ben Wheeler
8eec0d3a87 corrected parentheses for lint error 2018-07-27 10:49:42 -04:00
Ben Wheeler
a60da11f8a curated studios endpoint doesn't pass unnecessary token to api 2018-07-26 18:54:58 -04:00
Ben Wheeler
7cc2f61a2b compressed svgs; small modal scss reversion 2018-07-25 16:30:50 -04:00
Ben Wheeler
1a4922a262 addtostudio buttons in own component; currentStudioIds redux object; lint fixes 2018-07-25 15:08:12 -04:00
Ray Schamp
49edbc5bfe
Merge pull request #1995 from LLK/hotfix/conference-2018-livestream 
[Develop] Conference 2018 Livestream
 2018-07-25 11:08:43 -04:00
Ray Schamp
7d424580b7
Merge pull request #1994 from LLK/hotfix/conference-2018-livestream 
[Master] Conference 2018 Livestream
 2018-07-25 11:08:12 -04:00
Sean Hickey
767fabb22c Updated livestream link to proper URL 2018-07-24 12:12:17 -04:00
Ben Wheeler
0c6b8607da better approach to tracking which studios the project current belongs to 2018-07-24 11:50:03 -04:00
Ben Wheeler
66c21d8b33 merged docker-compose 2018-07-24 09:29:07 -04:00
Ben Wheeler
ffe5e8cb43 adding distinct object to redux/preview.js state to track studio membership 2018-07-24 09:12:13 -04:00
Sean Hickey
8ab5656e33 Added link to keynote livestream 2018-07-23 16:49:13 -04:00
Bryce Taylor
4f927b1d38
Merge pull request #1968 from LLK/travis 
Make Travis run smoke tests with Saucelabs
 2018-07-23 14:47:08 -04:00
Ben Wheeler
52281502b2 corrected mismatched addtostudio field name in redux/preview.js 2018-07-23 10:39:20 -04:00
Ben Wheeler
f176835df6 removed whitespace 2018-07-23 09:50:26 -04:00
Colby Gutierrez-Kraybill
21d2f73bd7
Merge pull request #1975 from colbygk/docker_ergonomics 
watchOptions required for use in docker environment
 2018-07-23 09:50:21 -04:00
chrisgarrity
05f368a2e7
Merge pull request #1993 from LLK/develop 
[HOTFIX] Fix new message highlight.
 2018-07-23 09:35:59 -04:00
Andrew Sliwinski
1d282a4846
Merge pull request #1990 from carljbowman/develop 
Fix new message highlight
 2018-07-21 11:19:45 -04:00