scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2683 commits 216 branches 1 tag 464 MiB
Commit graph

2683 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
83db222e28 Fix "Load More" on search 
Concatenating a number with null results in NaN, and when NaN was used as an API query argument, resulted in a 503.
 2018-01-30 10:50:05 -05:00
Ray Schamp
0054424b9d Restore JSON linting 2018-01-30 10:36:08 -05:00
Ray Schamp
53d3bb94dc Revert "Merge pull request #1787 from LLK/revert-1786-hotfix/es6-upgrade" 
This reverts commit 5ce1a9f411, reversing
changes made to 5be4c45f08.
 2018-01-30 10:33:15 -05:00
Ray Schamp
1b1b396e92
Merge pull request #1788 from LLK/revert-1775-hotfix/es6-upgrade 
Revert "[Develop] Upgrade to ES6"
 2018-01-30 09:55:05 -05:00
Ray Schamp
46511e1253
Revert "[Develop] Upgrade to ES6" 2018-01-30 09:54:45 -05:00
Ray Schamp
5ce1a9f411
Merge pull request #1787 from LLK/revert-1786-hotfix/es6-upgrade 
Revert "[Master] Upgrade to ES6"
 2018-01-30 09:54:04 -05:00
Ray Schamp
c7c92c49f7
Revert "[Master] Upgrade to ES6" 2018-01-30 09:53:25 -05:00
Ray Schamp
5be4c45f08
Merge pull request #1786 from LLK/hotfix/es6-upgrade 
[Master] Upgrade to ES6
 2018-01-30 08:40:29 -05:00
Ray Schamp
a144bab0e6
Merge pull request #1775 from LLK/hotfix/es6-upgrade 
[Develop] Upgrade to ES6
 2018-01-29 15:53:59 -05:00
chrisgarrity
a7532c49db Fix projects curated row 
Changed the localization string to use a placeholder to allow translators to re-order if needed.

Also added preview-faq to the transifex config.
 2018-01-29 14:22:23 -05:00
Ray Schamp
57cc6f8770 Fix padding on Privacy Policy page 2018-01-29 14:18:57 -05:00
Ray Schamp
2ac6ed4c73 Use a prop for refreshSession 
Since dispatch is not passed in anymore.
 2018-01-29 14:16:59 -05:00
Ray Schamp
99c1f3f0b8 Avoid adding click event properties to formData 
Setting onClick to onNextStep directly caused click event data to be passed in handleAdvanceStep, which then merged it with the formData state in student registration. This caused issues.
 2018-01-29 14:00:29 -05:00
Ray Schamp
2df911259d Disable no-multi-comp completely for steps.jsx 2018-01-29 14:00:29 -05:00
chrisgarrity
7b15ef2363 Handle search queries 2018-01-29 13:07:48 -05:00
chrisgarrity
404dc4b04c Ensure dropdown links are always white 
Add state pseudo classes to make the style more ‘specific’
 2018-01-29 10:54:32 -05:00
chrisgarrity
0841dc93e7 Fix tips modal 2018-01-29 10:08:17 -05:00
chrisgarrity
4633086bf3 Remove blue outline around modals 2018-01-29 08:56:03 -05:00
Andrew Sun͈̮
afbc5acf42 Don't use eval devtool in production 2018-01-28 20:11:55 -05:00
chrisgarrity
f8473b6bc8 Fix FormattedMessage ids 2018-01-26 13:26:13 -05:00
chrisgarrity
0d3db461c4 Fix other page header padding issues 2018-01-25 17:17:45 -05:00
chrisgarrity
273227aab4 Remove extra padding from FAQ page header 
Reorder the import of InformationPage and Page.
 2018-01-25 17:06:35 -05:00
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