Commit graph

2453 commits

Author SHA1 Message Date
Colby Gutierrez-Kraybill
5b1891efdb node:8 is current 2018-03-27 14:11:24 -04:00
Colby Gutierrez-Kraybill
70468321c5 Docker files
Completes first pass at dockerization
2018-03-23 15:50:01 -04:00
Colby Gutierrez-Kraybill
878116f949 Add protocol and localhost
With API_HOST and FALLBACK, need full protocol.  API_HOST must be localhost, as it’s the browser performing the local request and does not know the docker network hostnames assigned during docker-compose
2018-03-23 15:49:40 -04:00
Colby Gutierrez-Kraybill
d428025287 Need protocol
With API_HOST and FALLBACK, need full protocol.  API_HOST must be localhost, as it’s the browser performing the local request and does not know the docker network hostnames assigned during docker-compose
2018-03-23 15:49:02 -04:00
Bryce Taylor
c198c66066
Merge pull request #1836 from BryceLTaylor/addCypressTests
Add cypress tests
2018-03-23 09:19:38 -04:00
BryceLTaylor
d876c809ac Fix linting issues in Cypress test-footer-links test 2018-03-22 15:14:05 -04:00
BryceLTaylor
53e8d66a11 Linted Cypress test files with —fix 2018-03-22 15:06:37 -04:00
BryceLTaylor
3f169123d9 Delete cypress example files 2018-03-22 15:05:47 -04:00
BryceLTaylor
88de06f61b Setup Cypress linting 2018-03-22 15:01:51 -04:00
BryceLTaylor
7d8bd57714 Clarify README for the Cypress tests more. 2018-03-21 10:44:09 -04:00
BryceLTaylor
240780b859 Clarify README in the Cypress Tests 2018-03-21 10:42:41 -04:00
BryceLTaylor
057e000b12 Clarify and expand README for Cypress tests 2018-03-21 10:40:45 -04:00
chrisgarrity
b7900aca05
Merge pull request #1833 from chrisgarrity/feature/preview-project
Feature/preview project  - part 1 (elements 'above the fold')
2018-03-21 10:29:01 -04:00
BryceLTaylor
96f9ae40d4 Update git ignore for Cypress tests 2018-03-21 10:00:52 -04:00
BryceLTaylor
95303e7079 Add initial cypress tests 2018-03-21 10:00:23 -04:00
chrisgarrity
1b2050c58a cleanup 2018-03-20 20:19:48 -04:00
chrisgarrity
feda4416f3 Temporarily remove gui dependencies 2018-03-20 14:44:47 -04:00
Ray Schamp
91c6756878
Merge pull request #1690 from as-com/uglify-development
Don't run UglifyJS unless it's a production build
2018-03-19 14:00:08 -04:00
Ray Schamp
aee9f0c608 Fix linting
Something is off with our indentation rules. Possibly a bug in the version of eslint we're using?
2018-03-19 11:58:03 -04:00
chrisgarrity
c5ea057974
Merge pull request #1835 from JoelGritter/patch-2
Fix #1825
2018-03-19 10:00:38 -04:00
Joel Gritter
536e4c7e0b
Remove filled jobs
Removed: Designer, Learning Resource Designer, QA Engineer, Senior Backend Engineer
2018-03-17 18:50:04 -04:00
Joel Gritter
316a36f1ed Fix gh-1824: Add note about real names (#1830)
* Add note about real names as a new string

Fixes gh-1824
2018-03-16 16:18:17 -04:00
chrisgarrity
1c6b0dd64c Cleanup
Fixing lint problems and removing (most) unused code. I left user and session as they will get used soon even though they aren’t currently.
2018-03-15 17:40:16 -04:00
Andrew Sliwinski
7bf690df5e
Merge pull request #1821 from ktrvs/ktrvs-update-privacy-policy
Update privacy policy to be more clear. | Fixes #1803
2018-03-15 13:00:48 -04:00
chrisgarrity
f836c6e3a8 Adding in remix metadata
- Moved preview state into redux
- Gets remix credit if the project is a remix
- Shows up to 5 remixes (direct children?)
- handles empty remixes result (it’s not an array)
- Added Column component - based on Grid, but doesn’t use frameless to set width.
- allows trailing ‘/‘ on the URL
- cleaned up conditional content
2018-03-14 15:50:27 -04:00
chrisgarrity
79199d6d32 Placeholders for everything ‘above the fold’ 2018-03-08 15:57:19 -05:00
Ray Schamp
cbbbb0d38f
Merge pull request #1818 from chrisgarrity/feature/gh1792-open-conf-reg
Conference March 1 update
2018-02-28 16:26:37 -05:00
Ray Schamp
4107975444
Merge pull request #1816 from jwzimmer/issue/gh-1814-update-wiki-link
Issue/gh 1814 update wiki link
2018-02-28 16:26:16 -05:00
Ray Schamp
bd224be0e4
Update footer to even newer expected URL 2018-02-28 15:58:48 -05:00
chrisgarrity
2d6327ba01 Update Northeastern accomodation info 2018-02-28 14:08:16 -05:00
chrisgarrity
f86bd01609 Remove obsolete code 2018-02-28 13:58:22 -05:00
Kerr
cf40bea072
Update privacy policy 2018-02-28 12:50:37 +00:00
chrisgarrity
ea6de54104 [WIP]: embed GUI in a preview page 2018-02-21 14:39:21 -05:00
chrisgarrity
1d42674651 Conference March 1 update
- Add buttons that link to conference registration
- Updated FAQ copy
2018-02-21 11:19:13 -05:00
Andrew Sliwinski
2c30faef09
Merge pull request #1809 from ktrvs/ktrvs-press-link-update
Fixes #1808 | Updates scratch press link to point to Scratch Foundation Media Kit.
2018-02-19 08:50:05 -05:00
jwzimmer
6db990ff06 Update footer link for wiki 2018-02-18 09:59:35 -05:00
Kerr Travers
2d98faf160
Update footer.jsx 2018-02-14 16:32:24 +00:00
Ray Schamp
a409894816
Merge pull request #1807 from LLK/release/2.2.27-jan
[Master] January 2018 Release
2018-02-13 10:50:03 -05:00
Ray Schamp
788d24b0f0
Merge pull request #1806 from LLK/release/2.2.27-jan
[Develop] January 2018 Release
2018-02-13 10:49:55 -05:00
Ray Schamp
f7364d6782
Merge pull request #1805 from rschamp/add-fullstack
Add Full Stack Engineer job post
2018-02-12 13:36:46 -05:00
Ray Schamp
2617dc95d1 Add Full Stack Engineer job post
Also reorder existing posts to be alphabetical
2018-02-12 13:33:20 -05:00
Ray Schamp
6eacece227
Merge pull request #1403 from carlflor/issue/gh1400-load-more-button-behavior
Fix gh-1400: Button Behavior for Search Result State
2018-02-12 13:28:34 -05:00
Ray Schamp
c6f7681197 Fix merge issues 2018-02-12 09:26:39 -05:00
Andrew Sun͈̮
a66a0f02e5
lint? 2018-02-08 12:01:07 -05:00
Andrew Sun͈̮
f392678174 Don't run UglifyJS unless it's a production build 2018-02-08 11:08:15 -05:00
Ray Schamp
5513b6a7e9 Merge branch 'develop' of github.com:LLK/scratch-www into issue/gh1400-load-more-button-behavior
# Conflicts:
#	src/views/search/search.jsx
2018-02-08 10:42:04 -05:00
Ray Schamp
8f4bc64154
Merge pull request #1689 from as-com/eval-devtool
Don't use eval devtool in production
2018-02-08 10:19:27 -05:00
chrisgarrity
5010e47edf
Merge pull request #1802 from LLK/hotfix/conf2018-feb-master
[MASTER] Hotfix Conference 2018 (Feb 6) - close session proposals
2018-02-06 07:10:44 -05:00
chrisgarrity
aff3c33817
Merge pull request #1796 from chrisgarrity/hotfix/conf2018-feb5
[DEVELOP] Hotfix Conference page to close session proposals
2018-02-05 08:41:27 -05:00
chrisgarrity
3fc0d2ab23 Another hotel update 2018-02-02 13:26:05 -05:00