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

2987 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
5844fed2e0 Merge branch 'hotfix/update-conference-2018-3' into develop 2018-07-09 16:34:23 -04:00
chrisgarrity
78b49c5f30
Merge pull request #1954 from LLK/hotfix/update-conference-2018-3 
[MASTER] Conference site updates - schedule, logos, room locations
 2018-07-09 16:28:01 -04:00
Bryce Taylor
d251a73672
Merge pull request #1953 from BryceLTaylor/Update-Integration-README 
Update integration readme with Sauce Labs information
 2018-07-09 10:51:45 -04:00
jokebookservice1
07202ff6ec
Remove unneeded testing file 2018-07-09 16:48:17 +03:00
Andrew Sliwinski
f3bd092482
Merge pull request #1951 from JoelGritter/JoelGritter-patch-1 
Fix gh-1950: Update parent email age on FAQ page
 2018-07-09 08:47:24 -04:00
Ben Wheeler
9cac70ab18 small steps towards addtostudio modal's container-presentation refactor 2018-07-07 14:09:43 -04:00
Connor Hudson
5b520c21ef Update copy from doc 2018-07-06 13:47:55 -04:00
Connor Hudson
a7aae29041 Tweak small top banner styles 2018-07-06 11:38:41 -04:00
Connor Hudson
917497ab66 Use localization strings for banner copy 2018-07-06 10:37:51 -04:00
Connor Hudson
565eeb776f Make middle banner image resize properly and keep its aspect ratio 2018-07-06 10:37:10 -04:00
BryceLTaylor
2bb898788f Update Intergration README to have Saucelabs info 2018-07-06 10:33:40 -04:00
BryceLTaylor
ba5ac92b00 Adjust how smoke tests are called in package.json 2018-07-06 10:32:59 -04:00
Sean Hickey
377eaf0e61 Conference updates - schedule, logos, room locations 2018-07-06 10:17:57 -04:00
Connor Hudson
61aad76b68 Fix middle banner image styles 2018-07-06 09:52:24 -04:00
Ray Schamp
bdc2260531
Merge pull request #1944 from BryceLTaylor/Selenium-Helper-Update 
Selenium helper update
 2018-07-05 15:55:22 -04:00
Connor Hudson
d1d7b2e711 Adjust middle banner width and margin to match other front page rows 2018-07-05 15:26:34 -04:00
BryceLTaylor
6cb52fca5c Fully remove Selenium_Promise_Manager=0 from tests 2018-07-05 14:22:58 -04:00
BryceLTaylor
f678c97727 Make Selenium Helper file more resemble GUI and Update Tests to use it 2018-07-05 14:22:58 -04:00
BryceLTaylor
3ef4278385 Remove use of var from selenium-helpers.js 2018-07-05 14:16:36 -04:00
Ben Wheeler
d9543314cc small comment 2018-07-05 13:34:41 -04:00
BryceLTaylor
5edb9fe425 remove path to tap in package.json 2018-07-05 13:24:31 -04:00
BryceLTaylor
8231453bab Fully remove Selenium_Promise_Manager=0 from tests 
# Conflicts:
#	test/integration/smoke-testing/test_footer_links.js
#	test/integration/smoke-testing/test_navbar_links.js
#	test/integration/smoke-testing/test_project_rows.js
 2018-07-05 13:23:47 -04:00
Joel Gritter
b77c5fe837
Update parent email age 
13 -> 16
 2018-07-05 09:27:53 -04:00
Ben Wheeler
af25e44fc6 refactoring add to studio modal into container and presentation; added getCuratedStudios functionality to preview 2018-07-04 18:01:11 -04:00
Connor Hudson
4129a701e7 Second pass at responsive top banner 2018-07-03 16:18:11 -04:00
Connor Hudson
5ebb5fa8db Fix image weirdness on chrome, safari 2018-07-03 15:02:00 -04:00
Connor Hudson
08178a58e5 Initial work on responsive middle banner 2018-07-03 14:48:20 -04:00
Connor Hudson
0eb12ae469 Style button on top banner 2018-07-03 13:16:01 -04:00
Connor Hudson
97cb50917f Add initial pass at middle banner 2018-07-03 12:21:21 -04:00
Connor Hudson
142b46b138 Rename image container 2018-07-03 12:07:03 -04:00
Connor Hudson
655625568c Add initial pass at top banner with assets 2018-07-03 12:03:22 -04:00
Connor Hudson
4eca432811 Style middle banner 2018-07-02 11:41:17 -04:00
Connor Hudson
251f7bf59d Add middle banner in progress copy 2018-07-02 11:41:10 -04:00
Connor Hudson
dfaee503b8 Style top banner, add placeholder copy 2018-07-02 10:51:19 -04:00
Connor Hudson
5b5eb8cc5a Tweak class for small top banner 2018-07-02 10:25:58 -04:00
Connor Hudson
cf48231284 Tweak class names, button padding for small top banner 2018-07-02 10:08:38 -04:00
Connor Hudson
918b4b5948 Style small top banner a little more 2018-07-02 09:59:22 -04:00
Ray Schamp
ff662b37c5
Merge pull request #1946 from JoelGritter/JoelGritter-patch-1 
Fix gh-1899: Add Console Warning
 2018-06-29 10:24:04 -04:00
Joel Gritter
b4c35122b9
eslint-disable for console.log's 
Should resolve the Travis-CI errors
 2018-06-29 09:57:46 -04:00
Connor Hudson
4c49ae1701 Create small top banner component 2018-06-29 09:28:11 -04:00
Connor Hudson
fd9c0df623 Add styles for banners 2018-06-29 09:28:03 -04:00
Connor Hudson
4ee6bfcad2 Add call to action link to banners 2018-06-29 09:27:54 -04:00
Joel Gritter
1a6fa9466f
Add console warning 2018-06-29 09:23:55 -04:00
Connor Hudson
c469a0ed97 Show MiddleBanner if logged out 2018-06-28 13:58:23 -04:00
Connor Hudson
178ee415e7 Show top banner if logged in and on tablet or desktop 2018-06-28 13:51:51 -04:00
Connor Hudson
1371687a22 Add boilerplate code for beta banners 2018-06-28 13:50:18 -04:00
Connor Hudson
289e17195d
Merge pull request #1932 from technoboy10/feature/projects-extension-display 
Preview - Implement extension info strip
 2018-06-27 16:59:47 -04:00
Colby Gutierrez-Kraybill
0d0b973848
Merge pull request #1939 from LLK/hotfix/update-conference-2018-2 
[MASTER] Conference site updates, this should deploy now with the updated EB_AWS keys
 2018-06-27 12:51:15 -04:00
Colby Gutierrez-Kraybill
02c45300d6
Merge pull request #1940 from LLK/hotfix/update-conference-2018-2 
[DEVELOP] Conference site updates
 2018-06-27 12:37:03 -04:00
Ben Wheeler
6989fd4ecf Added SVGs for add to studio modal 2018-06-27 11:38:32 -04:00