Connor Hudson
|
ae49bbf74f
|
Update l10n strings
|
2018-07-16 10:09:10 -04:00 |
|
Connor Hudson
|
fee657977e
|
Use module.exports for banners, remove .default for banner imports in presentation
|
2018-07-16 09:17:26 -04:00 |
|
Colby Gutierrez-Kraybill
|
a047207e00
|
Merge pull request #1965 from colbygk/update_docker_compose
Update to track changes in docker-compose behavior
|
2018-07-13 13:52:49 -04:00 |
|
Ben Wheeler
|
bc7b31e924
|
finished draft of intermediary refactor of addtostudio modal redux code, container-presentation code simplified
|
2018-07-13 09:50:17 -04:00 |
|
Ray Schamp
|
f7970efcdc
|
Merge branch 'release/june-2018' of github.com:LLK/scratch-www into develop
|
2018-07-12 10:02:23 -04:00 |
|
Ray Schamp
|
5e64a4aacc
|
Merge pull request #1952 from LLK/release/june-2018
Release for June 2018
|
2018-07-12 09:41:46 -04:00 |
|
BryceLTaylor
|
a46fd34e0d
|
Make Travis run tests on all branches
|
2018-07-11 15:11:36 -04:00 |
|
Ben Wheeler
|
6a32edb2fe
|
addtostudiomodal: incomplete progress on 1. container-presentation refactor, 2. redux handling of add and leave studio requests
|
2018-07-11 15:08:01 -04:00 |
|
BryceLTaylor
|
417ce0996e
|
Use Travis’s built in CI environment variable for tests
|
2018-07-11 14:50:04 -04:00 |
|
BryceLTaylor
|
fb8e0292ce
|
Use Travis build Number rather than ID
|
2018-07-11 13:21:57 -04:00 |
|
BryceLTaylor
|
b1fa09eef9
|
Include Travis build id in Sauce Labs test name
|
2018-07-11 12:07:28 -04:00 |
|
BryceLTaylor
|
90d10dd417
|
Name Sauce Labs tests to indicate when run by Travis
|
2018-07-11 11:17:49 -04:00 |
|
BryceLTaylor
|
58ba061c66
|
Make Travis use Saucelabs
|
2018-07-11 11:14:44 -04:00 |
|
Colby Gutierrez-Kraybill
|
64d254e869
|
FALLBACK should reference localhost not docker specific scratchr2-app end point
|
2018-07-11 11:10:38 -04:00 |
|
Colby Gutierrez-Kraybill
|
9c35b80073
|
Update to track changes in docker-compose behavior
docker-compose no longer strips `-` from the project name, which makes `scratchapi` now `scratch-api` when referencing the network.
|
2018-07-11 10:42:09 -04:00 |
|
Joel Gritter
|
90ab0f75d0
|
Update wiki link
|
2018-07-10 17:29:25 -04:00 |
|
Ray Schamp
|
ae5d825c37
|
Merge branch 'hotfix/update-conference-2018-3' into release/june-2018
|
2018-07-09 16:35:50 -04:00 |
|
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 |
|