Colby Gutierrez-Kraybill
66edcb60a8
Remove unused vcl code generators, setBackend and setFrontend
2017-11-30 11:28:53 -05:00
Colby Gutierrez-Kraybill
279e25eb69
Simplify how the conditional is created for setting the S3 backend, caching related behavior for non-logged in users and maintaining language settings and passing to backend
2017-11-30 11:11:38 -05:00
Colby Gutierrez-Kraybill
7a6be0306b
Cache ^/projects/ to users who are not logged-in
2017-11-30 11:11:38 -05:00
Colby Gutierrez-Kraybill
9efd8e65eb
Add specific /projects cache handling when user is not logged-in
2017-11-30 11:11:26 -05:00
Andrew Sliwinski
21a99c873e
Merge pull request #1704 from VutonDesign/patch-1
...
Fixes #1703 | Update role on jobs page
2017-11-30 11:05:03 -05:00
Kerr
8722a1d374
Update jobs.jsx
2017-11-29 22:12:24 +00:00
Matthew Taylor
1acb9c6a1f
Merge pull request #1698 from mewtaylor/hotfix/avatar-endpoint
...
[Master] Hotfix: Change avatar to use `uploads` endpoint
2017-11-29 16:03:29 -05:00
Matthew Taylor
bfff01f024
Merge branch 'hotfix/avatar-endpoint' into develop
...
* hotfix/avatar-endpoint:
fall back to default image if thumb not found
2017-11-29 08:04:17 -05:00
Matthew Taylor
02da6f62a6
fall back to default image if thumb not found
...
This incorporates a fallback image into the thumbnail component for all of project, studio and avatar thumbnails using the `onerror` property of img elements (which is supported across all browsers).
/cc @thisandagain @rschamp
2017-11-29 08:03:48 -05:00
Matthew Taylor
ea90dc9309
Merge pull request #1699 from mewtaylor/hotfix/avatar-endpoint
...
[Develop] Hotfix: Change avatar to use `uploads` endpoint
2017-11-28 15:33:14 -05:00
Matthew Taylor
be7e83db78
Change avatar to use uploads endpoint
2017-11-28 14:01:55 -05:00
Matthew Taylor
6524856bf1
use parentheses around message values
...
for readability. thanks @rschamp!
2017-11-27 16:25:57 -05:00
Matthew Taylor
8ea1f621ef
use mapDispatchToProps
...
thanks @rschamp!
2017-11-27 16:25:19 -05:00
Andrew Sliwinski
bdc0992168
Merge pull request #1681 from GreenBayRules/develop
...
Make Conference logo button link to homepage.
2017-11-21 20:18:08 -05:00
Sheshank Shankar
3e52bc7fc5
Make Conference logo button link to homepage.
2017-11-21 16:51:11 -08:00
Matthew Taylor
87146c3193
Merge branch 'hotfix/dec-1' of https://github.com/LLK/scratch-www into develop
...
* 'hotfix/dec-1' of https://github.com/LLK/scratch-www :
update transifex config to reflect new conference page
fix lint
update translations to just use `FormattedMessage`
Change back routeAlias for conference pages
Add Learning Resource designer (#1676 )
Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673 )
Fix #1649 : Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650 ) (#1663 )
# Conflicts:
# src/routes.json
# src/views/conference/2018/index/index.jsx
# src/views/conference/2018/index/l10n.json
2017-11-21 17:14:19 -05:00
Matthew Taylor
425f22735a
Merge pull request #1679 from LLK/hotfix/dec-1
...
[Master] December 1st Hotfix
2017-11-21 17:11:42 -05:00
Matthew Taylor
8f7bb287ed
update transifex config to reflect new conference page
2017-11-21 16:35:05 -05:00
Matthew Taylor
666a893dad
fix lint
...
whoops!
2017-11-21 14:19:18 -05:00
Matthew Taylor
d55caf7e96
update translations to just use FormattedMessage
2017-11-21 11:17:35 -05:00
Matthew Taylor
2acf90ba41
Change back routeAlias for conference pages
...
These are needed to ensure that fastly doesn’t 404 on the 2016 and 2017 sites.
2017-11-21 09:25:42 -05:00
Sheshank Shankar
3283904bb9
Add Learning Resource designer ( #1676 )
2017-11-21 09:19:45 -05:00
Sheshank Shankar
4f14dfcbe3
Fixes #1633 - Scratch Conference 2018 Website Phase 1 ( #1673 )
...
* add 2018 conference page (new subdirectory and index page)
* Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences.
* Update mailto link in the footer
2017-11-21 09:19:37 -05:00
Sheshank Shankar
4ae8edd193
Add Learning Resource designer ( #1676 )
2017-11-20 09:13:11 -05:00
Sheshank Shankar
2ba03708c3
Fixes #1633 - Scratch Conference 2018 Website Phase 1 ( #1673 )
...
* add 2018 conference page (new subdirectory and index page)
* Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences.
* Update mailto link in the footer
2017-11-20 09:12:12 -05:00
Matthew Taylor
2dd82e858e
use writeFileSync
...
Thanks @thisandagain!
2017-11-16 09:58:08 -05:00
Ray Schamp
3d277c118b
Merge pull request #1626 from jwzimmer/issue/add-signing-out
...
Issue/add signing out
2017-11-15 15:42:46 -05:00
Ray Schamp
d3719d078f
Merge pull request #1624 from jwzimmer/issue/fix-failing-footer-links
...
Updated selenium & chromedriver versions, which fixed test failures i…
2017-11-15 15:42:10 -05:00
Ray Schamp
8b61ce72e1
Scratch itch
2017-11-15 13:33:30 -05:00
Matthew Taylor
b584bb80e7
Upgrade compatibility to node 8
...
This fixes an issue in compilation by upgrading node-sass to v4.6, and also upgrades express in the process.
Callback added to `writeFile` in `get-localized-urls` in order to avoid a deprecation warning during `make translations`.
2017-11-15 13:28:10 -05:00
Matthew Taylor
91a0e865ad
Use new activity endpoint
...
This also moves homepage row retrieval into redux to further move towards using redux to handle functionality. This implements #1628 .
2017-11-15 12:49:23 -05:00
Colby Gutierrez-Kraybill
9b55a403d7
Merge pull request #1669 from VutonDesign/develop
...
Fix #1668 (Update llk link)
2017-11-14 13:35:56 -05:00
Kerr
f2f51453bf
Update l10n.json
2017-11-14 17:48:47 +00:00
jwzimmer
c16dea05a1
update read me for automated tests
2017-11-14 09:28:25 -05:00
chrisgarrity
ef4f851e6d
Switch CTA button based on logged in state
...
Invite logged-out users to ‘Get Started with Coding!’, and make the whole Scratch animation clickable (goes to the Animate a Name tutorial).
See #1664
2017-11-08 16:53:42 -05:00
chrisgarrity
048d5c1383
Switch CTA button based on logged in state
...
Invite logged-out users to ‘Get Started with Coding!’, and make the whole Scratch animation clickable (goes to the Animate a Name tutorial).
See #1664
2017-11-08 16:50:14 -05:00
chrisgarrity
3de61d092f
Merge pull request #1662 from chrisgarrity/feature/hoc-2017
...
Feature/hoc 2017
2017-11-08 14:36:03 -05:00
Matthew Taylor
081e3c5327
Fix #1649 : Edit Scratch Conf Website - Correct Info for Costa Rica Conf ( #1650 ) ( #1663 )
...
* Adds fix to #1644
* Update l10n.json
* Add files via upload
* Add files via upload
* Delete index.jsx
* Delete index.scss
* Delete l10n.json
* Update index.jsx
* Update l10n.json
* Update l10n.json
* Update index.jsx
2017-11-08 13:30:16 -05:00
chrisgarrity
60a2a51bb5
minor formatting changes for consistency
2017-11-08 09:04:33 -05:00
Sheshank Shankar
c143d6c706
Fixes #1645 and #1644 ( #1646 )
...
* Fixes #1645
* Fixes #1644 as well
* hopefully this should fix it
* Update download.jsx
* Update download.jsx
2017-11-07 17:31:52 -05:00
The_Grits
39c6915884
Fix gh-1634: Fix Localization on Developers Page ( #1636 )
...
* Add ScratchJr Section Localization
* Add Localization for ScratchJr and "Projects"
* Update ScratchJr String / Remove ScratchJr Title
* Readd "ScratchJr"
2017-11-07 17:30:11 -05:00
Sheshank Shankar
58ddff4001
Fix #1649 : Edit Scratch Conf Website - Correct Info for Costa Rica Conf ( #1650 )
...
* Adds fix to #1644
* Update l10n.json
* Add files via upload
* Add files via upload
* Delete index.jsx
* Delete index.scss
* Delete l10n.json
* Update index.jsx
* Update l10n.json
* Update l10n.json
* Update index.jsx
2017-11-07 16:42:53 -05:00
chrisgarrity
4fe3997df4
Top and middle banners for HoC 2017
...
Css animated top banner
Middle banner of activities - responsive
https://github.com/LLK/scratchr2/issues/4869
Also updated ttt see-more/open- modal link to be consistent with the new icon from Carl.
2017-11-03 16:50:26 -04:00
Matthew Taylor
7e00d40325
Merge pull request #1647 from LLK/release/2.2.26
...
[Develop] Release 2.2.26
2017-11-03 12:04:11 -04:00
Matthew Taylor
eef64e139e
Merge pull request #1648 from LLK/release/2.2.26
...
[Master] Release 2.2.26
2017-11-03 12:04:00 -04:00
Matthew Taylor
a87b7dc3fa
Merge pull request #1653 from mewtaylor/issue/gh-1652
...
Fix GH-1652: resolve typo in social message count name
2017-11-03 10:17:11 -04:00
Matthew Taylor
8489918805
resolve typo
...
I think this happened when I was resolving a merge conflict, and I confused the naming from previous/new along the way. Thanks @jwzimmer!
Fixes #1652
2017-11-03 10:16:01 -04:00
Matthew Taylor
05bdcc74e0
Merge pull request #1639 from mewtaylor/issue/gulptea-avatar
...
Point at GulpTea’s avatar in credits page
2017-10-30 10:36:48 -04:00
Matthew Taylor
a1da26b0c9
Point at @GulpTea’s avatar
2017-10-30 08:39:42 -04:00
Matthew Taylor
18f82fce3f
Merge branch 'issue/gh-1546' into develop
...
* issue/gh-1546:
Make api request on filter change
render load more even if messages not there
# Conflicts:
# src/views/messages/container.jsx
# src/views/messages/presentation.jsx
2017-10-26 08:41:54 -04:00
