Matthew Taylor
|
080df8673b
|
fix typo in become curator import
|
2018-01-09 14:58:08 -05:00 |
|
Matthew Taylor
|
3e7bb349ba
|
match props to rows, rather than object
this was not detecting row updates well on re-render
|
2018-01-09 14:47:45 -05:00 |
|
Matthew Taylor
|
797afb6d28
|
Merge pull request #1761 from mewtaylor/issue/gh-1711
Implement GH-1711: Add 3.0 preview faq page
|
2018-01-09 13:19:48 -05:00 |
|
Matthew Taylor
|
c7d4a70878
|
handle spacing for list items
|
2018-01-09 13:06:20 -05:00 |
|
Matthew Taylor
|
e4611088ff
|
extract faq from published page
after review from @thisandagain – thanks!
|
2018-01-09 12:55:36 -05:00 |
|
Matthew Taylor
|
85d6636c28
|
remove superfluous import
|
2018-01-08 13:42:25 -05:00 |
|
Matthew Taylor
|
3e7ccc6207
|
Add preview faq page
Implements #1711
|
2018-01-08 13:39:29 -05:00 |
|
Matthew Taylor
|
53acea2112
|
Merge pull request #1670 from mewtaylor/issue/whats-happening
Implement GH-1628: Use new activity endpoint
|
2017-12-18 14:59:10 -05:00 |
|
Ray Schamp
|
7a00acf737
|
Merge pull request #1744 from LLK/hotfix/conference-route
[Develop] Ignore querystring when routing conference page
|
2017-12-18 12:42:19 -05:00 |
|
Ray Schamp
|
007bb54bf1
|
Merge pull request #1743 from LLK/hotfix/conference-route
[Master] Ignore querystring when routing conference page
|
2017-12-18 12:42:07 -05:00 |
|
Ray Schamp
|
6c39953c5b
|
Ignore querystring when routing conference page
There should be a generalized solution for this, but my attempts have failed thus far.
|
2017-12-18 11:50:04 -05:00 |
|
Ray Schamp
|
969bc9e1cf
|
Travis pls
|
2017-12-18 11:50:03 -05:00 |
|
chrisgarrity
|
e0461ca77a
|
Merge pull request #1738 from LLK/hotfix/revert-HOC-banners
[DEVELOP] Hotfix/revert hoc banners
|
2017-12-15 15:51:10 -05:00 |
|
chrisgarrity
|
b16cf6d5cc
|
Merge pull request #1737 from LLK/hotfix/revert-HOC-banners
[MASTER] revert 2017 HoC top and middle banners
|
2017-12-15 15:50:44 -05:00 |
|
Ray Schamp
|
a20722885a
|
Merge pull request #1667 from jwzimmer/issue/update-test-readme
update read me for automated tests
|
2017-12-14 17:42:00 -05:00 |
|
Ray Schamp
|
08a2acdfc1
|
Remove references to Saucelabs
|
2017-12-14 17:36:15 -05:00 |
|
Ray Schamp
|
cdbdd54b8d
|
Merge branch 'issue/update-test-readme' of https://github.com/jwzimmer/scratch-www into jwzimmer-issue/update-test-readme
|
2017-12-14 17:35:04 -05:00 |
|
Andrew Sliwinski
|
c176c4d8f3
|
Merge pull request #1741 from GreenBayRules/develop
Fixes #1736 Pull Request Template Enhancements
|
2017-12-14 09:20:33 -05:00 |
|
Sheshank Shankar
|
240606b3d0
|
Fixes #1702: Scratch Conference site - small edits (#1727)
Update the conference page with new banner image and small copy edits.
|
2017-12-13 15:25:12 -05:00 |
|
Sheshank Shankar
|
abea18a16e
|
Update PULL_REQUEST_TEMPLATE.md
|
2017-12-13 10:23:15 -08:00 |
|
Sheshank Shankar
|
eb19b88c86
|
Update PULL_REQUEST_TEMPLATE.md
|
2017-12-13 10:20:38 -08:00 |
|
chrisgarrity
|
04e1e36978
|
revert 2017 HoC top and middle banners
|
2017-12-12 11:21:35 -05:00 |
|
Sheshank Shankar
|
cc0451ec7b
|
Fixes #1702: Scratch Conference site - small edits (#1727)
Update the conference page with new banner image and small copy edits.
|
2017-12-12 10:27:24 -05:00 |
|
Andrew Sliwinski
|
3c9d7eb57a
|
Clarify licensing of trademarks in FAQ (#1735)
* Clarify logo licensing in FAQ
|
2017-12-11 17:02:11 -05:00 |
|
Matthew Taylor
|
758371dadd
|
Merge pull request #1671 from mewtaylor/issue/node-upgrade
Upgrade compatibility to node 8
|
2017-12-11 15:52:35 -05:00 |
|
Andrew Sliwinski
|
d2c97a76ac
|
Merge pull request #1734 from vutondesign/patch-1
Fix #1733 | Spelling issue
|
2017-12-11 15:45:11 -05:00 |
|
Kerr Travers
|
1e401e8074
|
Update ISSUE_TEMPLATE.md
|
2017-12-11 20:29:07 +00:00 |
|
Kerr Travers
|
d3b8acbb56
|
Fixes #1700 | Update about page (#1714)
Fixes #1700 adds 'Siegel Family Endowment' to the credits. Also changes all uses of `FormattedHTMLMessage` to `FormattedMessage` with placeholders.
|
2017-12-11 15:16:06 -05:00 |
|
chrisgarrity
|
70c8edd117
|
Merge pull request #1732 from chrisgarrity/add-pr-template
Add issue and pull-request templates
|
2017-12-11 15:09:15 -05:00 |
|
chrisgarrity
|
63785cb3d4
|
Add issue and pull-request templates
|
2017-12-11 14:56:40 -05:00 |
|
Ray Schamp
|
db4238bb0d
|
Merge pull request #1730 from LLK/revert-1715-hotfix/temp-row-remove
[Master] Add back curator and recently shared rows
|
2017-12-11 14:14:14 -05:00 |
|
Ray Schamp
|
23c14204d3
|
Merge pull request #1731 from LLK/revert-1715-hotfix/temp-row-remove
[Develop] Add back curator and recently shared rows
|
2017-12-11 14:13:30 -05:00 |
|
Matthew Taylor
|
24e65e707f
|
Revert "[Master] temporarily take out curator row and recently shared row"
|
2017-12-11 08:40:16 -05:00 |
|
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 |
|