Kerr Travers
34093e6aa9
Fixes #1728 | Add new member to credits ( #1729 )
2017-12-07 13:02:00 -05:00
Ray Schamp
21c73e92e2
Merge pull request #1715 from mewtaylor/hotfix/temp-row-remove
...
[Master] temporarily take out curator row and recently shared row
2017-12-03 14:32:46 -05:00
Matthew Taylor
67dec709a0
Merge pull request #1716 from mewtaylor/hotfix/temp-row-remove
...
[Develop] temporarily take out curator row and recently shared row
2017-12-03 13:26:48 -05:00
Ray Schamp
ce574739e7
Merge pull request #1722 from TheGrits/patch-3
...
[Master] Redirect /hoc2014 -> /tips
2017-12-02 12:57:44 -05:00
Ray Schamp
e24d5516e7
Merge pull request #1723 from TheGrits/patch-4
...
[Develop] Redirect /hoc2014 -> /tips
2017-12-02 12:39:52 -05:00
The_Grits
d0f365ffde
[develop] hoc2014 redirect hotfix
2017-12-02 12:20:50 -05:00
The_Grits
8f830c2a04
[master] hotfix hoc2014 redirect
2017-12-02 12:19:45 -05:00
Colby Gutierrez-Kraybill
7b7306e7f9
Merge pull request #1721 from LLK/hotfix/cache-nav-session-endpoints
...
[Master] Hotfix/cache nav session endpoints @rschamp said I should.
2017-12-01 16:13:38 -05:00
Colby Gutierrez-Kraybill
cd27b68cd1
Merge pull request #1720 from LLK/hotfix/cache-nav-session-endpoints
...
[Develop] Hotfix/cache nav session endpoints
2017-12-01 16:01:19 -05:00
Ray Schamp
deae3b1ad0
Merge pull request #1717 from rschamp/hotfix/no-purge-deploys
...
[Master] Conditionally purge on deploys
2017-12-01 15:56:31 -05:00
Ray Schamp
7432c20f73
Merge pull request #1718 from rschamp/hotfix/no-purge-deploys
...
[Develop] Conditionally purge on deploys
2017-12-01 15:45:44 -05:00
Ray Schamp
51d980cfb3
Conditionally purge on deploys
...
We can configure this within Travis
2017-12-01 15:34:31 -05:00
Matthew Taylor
9fbd5b691c
temporarily take out curator row and recently shared row
2017-12-01 15:12:49 -05:00
Colby Gutierrez-Kraybill
0ba2693c0e
Cache logged out account-nav.json and session
...
Cache ^/fragment/account-nav.json and ^/session for logged out users
2017-12-01 13:50:43 -05:00
chrisgarrity
ec507b73c5
Merge pull request #1654 from chrisgarrity/feature/hoc-2017
...
Top and middle banners for HoC 2017
2017-12-01 13:22:31 -05:00
Colby Gutierrez-Kraybill
fd6211bc6d
Merge pull request #1712 from LLK/hotfix/project-caching
...
[Master] Hotfix/project caching
2017-12-01 11:49:44 -05:00
Colby Gutierrez-Kraybill
c3f34ab02a
Merge pull request #1713 from LLK/hotfix/project-caching
...
[Develop] Hotfix/project caching
2017-12-01 11:29:13 -05:00
Colby Gutierrez-Kraybill
c65b0ef907
Stomp set-cookie
...
set-cookie causes the cache to not cache the page. Since we’re not trying to track the user beyond, we don’t want to try resetting the cookie again with the same info
2017-12-01 11:22:24 -05:00
Colby Gutierrez-Kraybill
1083a7a79f
Fix typos and correct cookie
...
scratchsessionsid not scratchsessionid
Cookie needs key added for assigned value of scratchlanguage
2017-12-01 10:18:47 -05:00
Colby Gutierrez-Kraybill
91b3feb0b1
Merge pull request #1708 from colbygk/session-caching
...
[Master] Project page caching
2017-12-01 09:59:26 -05:00
Ray Schamp
4ab0b73d89
[skip ci] Merge pull request #1710 from LLK/revert-1708-session-caching
...
Revert "[Master] Project page caching"
[skip ci]
2017-12-01 09:33:09 -05:00
Colby Gutierrez-Kraybill
69757e6bec
Revert "[Master] Project page caching"
2017-12-01 09:24:17 -05:00
Colby Gutierrez-Kraybill
d3b6cd032c
Merge pull request #1708 from colbygk/session-caching
...
[Master] Project page caching
2017-11-30 18:03:01 -05:00
Ray Schamp
3c18f02dd0
Merge pull request #1709 from colbygk/hotfix/langauges_fix
...
[Develop] Languages.json fix
2017-11-30 15:43:01 -05:00
Ray Schamp
b62e29f70a
Merge branch 'develop' into hotfix/langauges_fix
2017-11-30 15:42:41 -05:00
Colby Gutierrez-Kraybill
805224dd8f
Merge branch 'develop' into hotfix/langauges_fix
2017-11-30 15:04:49 -05:00
Colby Gutierrez-Kraybill
0c109113c7
Failed on actual run, needs to load languages from directory below
2017-11-30 15:01:08 -05:00
Colby Gutierrez-Kraybill
4895425c29
Languages fix
2017-11-30 14:55:21 -05:00
Colby Gutierrez-Kraybill
fb28558c67
Merge pull request #1707 from colbygk/session-caching
...
[Develop] Project page caching
2017-11-30 14:01:23 -05:00
Colby Gutierrez-Kraybill
3e8fdc9ce2
adjust tests to changes in fastly-config-methods.js
2017-11-30 11:46:39 -05:00
Colby Gutierrez-Kraybill
1e8bf2653c
Correct brace addition to VCL
2017-11-30 11:38:14 -05:00
Colby Gutierrez-Kraybill
785667691e
Fix up lint errors
2017-11-30 11:30:45 -05:00
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
