chrisgarrity
484c949a92
Remove extra space before messages view
...
MessagesPresenation has to be loaded after Page.
2018-01-25 16:35:38 -05:00
Ray Schamp
ff211e312e
Fix teacher registration starting step
2018-01-25 15:44:00 -05:00
Ray Schamp
560538f046
Lint
2018-01-25 15:25:39 -05:00
Ray Schamp
911ba64444
Merge branch 'develop' of github.com:LLK/scratch-www into hotfix/es6-upgrade
2018-01-25 15:23:07 -05:00
Ray Schamp
2a64d61fed
Fix registration modal close behavior
2018-01-25 15:01:42 -05:00
Ray Schamp
6036fa79bc
Fix homepage row links
2018-01-25 14:48:09 -05:00
Andrew Sliwinski
ad3189c164
Merge pull request #1768 from LiFaytheGoblin/gh-1751/add_abkhaz_to_languages_menu
...
Gh 1751/add abkhaz to languages menu
2018-01-24 14:46:56 -05:00
Ray Schamp
d5411ca20b
Fix dropdown opening
2018-01-23 13:58:09 -05:00
Ray Schamp
f2392f6d5a
Fix test for ScratchEd footer link
2018-01-23 10:25:08 -05:00
Ray Schamp
f6bffd4192
Merge branch 'develop' of github.com:LLK/scratch-www into hotfix/es6-upgrade
...
# Conflicts:
# src/views/developers/developers.jsx
2018-01-23 09:50:33 -05:00
Matthew Taylor
6d1f2fbccd
initial es6 commit
2018-01-19 14:06:26 -05:00
LiFaytheGoblin
6341ff4085
Whoops, I somehow deleted the free line at the end, so here, I put it back again...
2018-01-17 13:58:58 +01:00
LiFaytheGoblin
51880b5013
Fixes #1751/ add abkhazian to language menu
2018-01-17 13:49:00 +01:00
chrisgarrity
900207da2d
Merge pull request #1767 from chrisgarrity/add-missing-paren
...
Add a closing paren
2018-01-16 11:50:24 -05:00
chrisgarrity
83f0cc1e18
Add a closing paren
...
Translators can’t translate a string with unbalanced paren’s.
2018-01-16 10:52:07 -05:00
LiFaytheGoblin
10fb7e032a
up to date
2018-01-15 20:23:24 +01:00
Ken
df070935a3
Move period and migrate to FormattedMessage ( #1757 )
...
* Move period
* update l10n with new msg format
* update jsx to use FormattedMessage instead of FormattedHTMLMessage
2018-01-13 12:05:29 -05:00
Florrie
9e487c8527
Fix CSS rule order
2018-01-12 11:51:11 -04:00
Strudy
14e29c547d
Add Changes to scratch conf website ( #1746 ) ( #1748 )
...
* Update l10n.json
2018-01-11 08:37:17 -05:00
Matthew Taylor
7754cd73bf
Merge pull request #1762 from mewtaylor/hotfix/add-back-rows
...
[Master] Add back in FPC and recently shared rows
2018-01-10 18:00:06 -05:00
Matthew Taylor
48f83189f7
Merge pull request #1763 from mewtaylor/hotfix/add-back-rows
...
[Develop] Add back in FPC and recently shared rows
2018-01-10 17:50:26 -05:00
Matthew Taylor
ade9ccef81
Add back in FPC and recently shared rows
...
There appears to have been a merge issue between the hotfixes around CSEdWeek and the implementation of the splash refactor, so this rectifies that error.
2018-01-10 17:43:14 -05:00
Matthew Taylor
e0a7c2a836
Merge pull request #1754 from LLK/develop
...
[Master] Release 2018.1
2018-01-10 13:02:53 -05:00
Matthew Taylor
380be6b5c1
copy state before assigning values
...
otherwise, redux won’t recognize a change in values
2018-01-09 16:44:32 -05:00
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
Florrie
ab107f865c
Hide Firefox focus ring
...
See this StackOverflow answer: https://stackoverflow.com/a/18853002/4633828
This isn't a perfect fix - we have to set `color` explicitly, rather
than use `inherit`, because we want the text color to be the same when
the select element is focused. That means both `color` and
`text-shadow`'s color have to be explicitly set to the same thing
(otherwise they might not match). Yay, hacks!
2018-01-05 13:37:06 -04:00
Florrie
870b916db3
Only transition border property
...
..since it's the only property which actually animates. (The background
image also changes on hover/focus, but that isn't visually effected by
transition, so we ignore it.)
This is for the next commit. Without this, the focus ring slowly
disappears, and the text slowly becomes the color it's meant to be;
neither of those are good.
2018-01-05 13:34:57 -04: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
