scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 09:35:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
2834 commits 216 branches 1 tag 474 MiB
Commit graph

1870 commits

Author SHA1 Message Date
Ben Wheeler
f8df3c0146 added royal blue color, button styles, small jsx fixes to Add to Studio modal 2018-06-18 15:17:19 -04:00
Ben Wheeler
9d9226f4a4 got rid of bug keeping page from displaying 2018-06-16 19:28:28 -04:00
Ben Wheeler
f0fbc0a57f add to studio modal appears from project page, looks horrendous 2018-06-16 19:13:50 -04:00
Ben Wheeler
20242af3de preview view comment 2018-06-16 18:19:31 -04:00
Connor Hudson
b826a1ad2f Add onExtensionAdded function to bindAll call 2018-06-15 09:52:12 -04:00
Connor Hudson
3b09bf145c Fix hasStatus prop type 2018-06-15 08:47:52 -04:00
Connor Hudson
1f5075f9d8 Initial (hacky) solution for loading EIABCW content 2018-06-14 16:54:55 -04:00
chrisgarrity
7f41771710
Merge pull request #1925 from LLK/hotfix/update-conference 
[HOTFIX] [DEVELOP] - Content updates for Scratch Conference 2018 website (sponsor logos and keynote descriptions)
 2018-06-14 16:32:19 -04:00
chrisgarrity
83a27f11c0
Merge pull request #1924 from LLK/hotfix/update-conference 
[HOTFIX] - Content updates for Scratch Conference 2018 website (sponsor logos and keynote descriptions)
 2018-06-14 16:31:15 -04:00
Connor Hudson
3eb0e12bf6 Only use extensions with preexisting data URIs for demo chips 2018-06-14 15:11:03 -04:00
Connor Hudson
b40f939566 iconSrc -> iconURI to match CategoryInfo format 2018-06-14 15:10:33 -04:00
Andrew Sliwinski
3f4f413510
Merge pull request #1923 from apple502j/patch-3 
Change splash to use 30000000
 2018-06-14 12:29:17 -04:00
Ray Schamp
1840b9df31 Convert presentation function component 
Fixing a typo let the linter catch that this no longer needs to be a class component
 2018-06-14 09:26:44 -04:00
Ray Schamp
4ce05622bc Move report options from state 
These never change so don't belong there.
 2018-06-14 09:22:00 -04:00
Connor Hudson
b317c12e79 Add some mockup extensions 2018-06-13 16:45:48 -04:00
Connor Hudson
e7e0ba720c Add extension list styles 2018-06-13 16:45:06 -04:00
Andrew Sliwinski
87a039c101
Merge pull request #1919 from thisandagain/bugfix/gdpr 
Use 16 as offset for teacher registration
 2018-06-13 16:24:28 -04:00
Connor Hudson
f9dd4e76aa Add padding to extension status div 2018-06-13 15:35:58 -04:00
Connor Hudson
0733a5dde4 Fix class name for extension icon 2018-06-13 15:32:31 -04:00
Connor Hudson
11af7fec9b Add extension status styling, tweak margins and spacing 2018-06-13 15:24:19 -04:00
Sean Hickey
8f0b12c2a6 Updated sponsor logos and keynote descriptions 2018-06-13 15:12:50 -04:00
Ray Schamp
add01c8393
Merge pull request #1922 from colbygk/hotfix/funding_redirects 
[Develop] Add donate and connect (email list) redirects
 2018-06-13 14:57:50 -04:00
Connor Hudson
a9e8a06c6d Add props to ExtensionChip 2018-06-13 14:53:41 -04:00
Connor Hudson
0056e93e4a Add more margin to extension chip content, use rem where it makes sense 2018-06-13 14:53:26 -04:00
Connor Hudson
6bace1b11e Add ExtensionChip component with demo content 2018-06-13 14:05:20 -04:00
apple502j
070cbe091f
Change splash (GH-1916) 
It uses "30000000 projects" by default now!
 2018-06-13 17:32:35 +09:00
Colby Gutierrez-Kraybill
835b33e91e Add donate and connect (email list) redirects 
* https://scratch.mit.edu/donate → https://secure.donationpay.org/scratchfoundation/
* https://scratch.mit.edu/connect → https://eepurl.com/cws7_f
 2018-06-12 18:27:15 -04:00
Andrew Sliwinski
ca6d78d928 Use 16 as offset for teacher registration as per GDPR 2018-06-12 15:40:52 -04:00
apple502j
6bb022107d
Changed link from /help to /tips 
#1909
 2018-06-05 18:26:34 +09:00
Andrew Sliwinski
680695d8de
Merge pull request #1902 from Kenny2github/fix-research-link 
Fix the /about research page link
 2018-06-04 12:22:57 -04:00
Andrew Sliwinski
8824b64c89
Merge pull request #1904 from apple502j/patch-1 
Updated link to Scratch Wiki - to new domain
 2018-06-04 12:22:19 -04:00
jokebookservice1
f95b05467d
Fix search bar's handling of special characters 
`decodeURI` is used for full URIs, not components thereof.
 2018-06-03 13:23:52 +01:00
chrisgarrity
74c76fb1cf Refactor report-modal 
* addresses comments for https://github.com/LLK/scratch-www/pull/1900
* renames report fields to match scratchr2 expectations
* restyle modal to allow display of validation messages
* removed cruft
 2018-06-01 15:25:28 -04:00
chrisgarrity
47b90d449b Fix formatting of long project description fields 
Description block also needed to be `display: flex`, and the content was missing the `overflow: auto` to make it scrollable.
 2018-06-01 09:45:49 -04:00
chrisgarrity
6872cfc51f FIxing PR #1900 comments 
addresses most comments except modal refactor, and error response from sumitting report.
* restore gui as a dev dependency
* better separation of view container/presentation
* replace absolute heights for textareas with making all sub components `display: flex`
* start to make presentation more modular added subcomponents to the view folder:
  * share-banner (moved from components)
  * remix-credit
  * remix-list
  * studio-list
 2018-05-31 21:04:11 -04:00
chrisgarrity
285b2dbcff Updated styles 2018-05-31 15:02:45 -04:00
chrisgarrity
db3120091d Fix lint and don’t duplicate the ‘other’ string 2018-05-31 15:02:45 -04:00
chrisgarrity
c6f197f576 Adjust share-date to give action buttons more room 2018-05-31 15:02:45 -04:00
chrisgarrity
0bc5bf745d Fix up stats line 
* Update for newer version of API - remix count in stats
* create projectShape to remove duplication
* add approximate-number to limit the size of the stats row.
 2018-05-31 15:02:45 -04:00
chrisgarrity
71dfe690be First pass at correcting project input styles 
* Add placeholders to description input text-areas
* fix styling to show box shadow highlight on focus
* adjust height for non-remix project
* fix lint errors
 2018-05-31 15:02:45 -04:00
chrisgarrity
08cf4f4f3d Refactor report modal 
* move all the report modal presentation into the component
* add strings to general l10n file because we don’t handle l10n files in components
* Add current project id and username to the data before submitting
 2018-05-31 15:02:44 -04:00
chrisgarrity
34042c9e8e Report first pass 
Report button opens a modal with the report project form. All the content is currently in `preview/presentation` because components cannot have their own l10n files.
 2018-05-31 15:02:44 -04:00
chrisgarrity
bd391b422a presentation first pass 
First pass at project page design using actual assets from Carl, and matching styles with current design.

Includes a (negative margin) hack to line up the stage. see https://github.com/LLK/scratch-gui/issues/2132
 2018-05-31 14:58:23 -04:00
chrisgarrity
81ac8eeef2
Merge pull request #1907 from LLK/hotfix/conference-2018 
[DEVELOP]: Hotfix/conference 2018
 2018-05-31 14:49:54 -04:00
chrisgarrity
99ed30e2c8 Fix up favorites 
Found a couple of typos now that API can process favorites.
 2018-05-30 14:39:25 -04:00
apple502j
2c6ffd6fd9
Updated link to Scratch Wiki - to new domain 2018-05-30 20:14:03 +09:00
Ken
5deff9c9bd
Fix the /about research page link 2018-05-30 11:17:40 +08:00
Sean Hickey
f86bd5b84b Fixed up page/render include order. Fixed up code readability issue in details page. 2018-05-29 11:07:08 -04:00
Sean Hickey
f54379e0d7 Cleaned up linter errors 2018-05-29 11:07:08 -04:00
Sean Hickey
fd24fbacef Updated asset paths 2018-05-29 11:07:08 -04:00
Sean Hickey
9ef187aada Updated conference pages for 2018 2018-05-29 11:07:07 -04:00
chrisgarrity
80de164d02
Handle See inside button (#1890) 
* Handle See inside button

Import GUI reducers, initial state and middleware (throttle).

Update render to handle state and middleware.

Remove preview mode state and use scratchGui.mode from redux instead.

URL is getting updated, and mode will be updated based on URL. However, the history needs work - it doesn’t work with the modal back.

* Update to latest GUI

This is the minimum version of GUI that is needed for see-inside

* Really remove cruft.
 2018-05-24 16:23:07 -04:00
Andrew Sliwinski
c0ac741065 Remove link from email address 2018-05-23 09:55:56 -04:00
Andrew Sliwinski
0a7bcdf907 Fix mailto link 2018-05-23 09:55:52 -04:00
Andrew Sliwinski
311d7e5959 Fix links to account settings / password 2018-05-23 09:55:48 -04:00
Andrew Sliwinski
59ca64579e Fix typo 2018-05-23 09:55:42 -04:00
Andrew Sliwinski
244a76149b Resolve lint issues 2018-05-23 09:55:36 -04:00
Andrew Sliwinski
f6a11e1c43 Update default 'opt-in' state for teacher registration 2018-05-23 09:55:27 -04:00
Andrew Sliwinski
71af5978ad Update privacy policy 2018-05-23 09:55:08 -04:00
Andrew Sliwinski
f19a6c6196 Remove link from email address 2018-05-22 16:15:26 -04:00
Andrew Sliwinski
7241164cf7 Fix mailto link 2018-05-22 09:59:08 -04:00
Andrew Sliwinski
8b9df4857f Fix links to account settings / password 2018-05-22 09:58:17 -04:00
Andrew Sliwinski
495d9e1177 Fix typo 2018-05-22 09:24:36 -04:00
Andrew Sliwinski
585a2e6686
Merge pull request #1891 from thisandagain/hotfix/privacy 
[Develop] Hotfix - Update Privacy Policy
 2018-05-21 17:15:21 -04:00
Andrew Sliwinski
88e99e655b Resolve lint issues 2018-05-21 17:04:50 -04:00
Andrew Sliwinski
d78d78e1fa Update default 'opt-in' state for teacher registration 2018-05-21 15:55:42 -04:00
Andrew Sliwinski
881c2affa4 Update privacy policy 2018-05-21 15:55:21 -04:00
Andrew Sliwinski
32fc959ed2 Remove references to Linux in download l10n strings 2018-05-16 09:44:11 -04:00
Andrew Sliwinski
a302d37eef Remove references to Linux for the Scratch 2.0 offline editor. Resolves GH-1880 2018-05-15 10:19:12 -04:00
chrisgarrity
6df58e41fd Correct preview route for fastly 
- use more explicit route
- handle fastly error in the callback correctly
- more succinct parsing of the URL path
 2018-05-02 17:04:14 -04:00
chrisgarrity
d1420862ea
Initial GUI embed (#1869) 
- `/preview/editor` will load GUI with an empty project
- `/preview/:id/editor` will load GUI with a project from the projects server (not local data)
- passes intl object to GUI
- `/preview/:id` with show the project page with an embedded player
- `/preview/:id/fullscreen` will load the project page with the player in fullscreen mode.

* Note that we needed to Increase memory for the build to avoid running out of heap space, and build time increases by about 2 minutes
 2018-05-02 15:27:49 -04:00
chrisgarrity
65e7657680
Merge pull request #1868 from LLK/hotfix/close-conf-reg 
[DEVELOP] Close registration when full
 2018-04-26 15:00:22 -04:00
chrisgarrity
b8326a3d57
Feature/preview project2 (#1856) 
* Add user-session awareness
  - only show remix button if user is logged in (TBD: probably will want to hide if project creator == user)
* decorate text with @mentions and #hashtags
* Add studios, loves, favs
* In-place editing of title and description if current user is author and project shared (with validation)
 2018-04-24 11:00:47 -04:00
Ray Schamp
c173922df6
Merge pull request #1861 from LLK/hotfix/conference-remove-dorm 
[Develop] Remove dorm information from 2018 Conference page
 2018-04-23 16:38:53 -04:00
Ray Schamp
9816846409
Merge pull request #1862 from LLK/hotfix/remove-recent-row 
[Develop] remove recent projects row
 2018-04-23 16:37:58 -04:00
chrisgarrity
520bd21cf2 remove obsolete l10n message 2018-04-23 16:29:51 -04:00
chrisgarrity
8cd28baef4 Remove recently shared row 2018-04-20 17:33:38 -04:00
chrisgarrity
ce6d78c715 Remove NEU dorm accomodations 
Dorms are no longer available. Fixes #1851
 2018-04-19 17:06:58 -04:00
seotts
9ab5cc9e5c added p around list 2018-04-10 16:33:41 -05:00
Andrew Sliwinski
b544ccdaa7
Merge pull request #1846 from apple502j/develop 
Added Giga
 2018-04-09 08:26:10 -04:00
Ray Schamp
417791b589
Merge pull request #1849 from LLK/release/march-2018 
[Develop] March 2018 Release
 2018-04-05 17:01:47 -04:00
apple502j
3a6c182087
Added Giga 2018-04-04 08:36:04 +09:00
Ray Schamp
52a5d929d1 Render messages inline 
This omits `for...of` which requires Symbol. The Symbol polyfill required by Babel for `for...of` apparently doesn't work for the react-tooltip library.  So just don't use `for...of`.
 2018-04-03 17:27:06 -04:00
Ken
68ae157bbf
Add /info/research redirect 2018-04-03 21:13:30 +08:00
Kenny2github
a516e8d9be Lint 2018-04-03 19:28:53 +08:00
Kenny2github
bf8baaf7d0 Fix everything 
*Updated to new convention for InformationPages
+Added route in routes.json (might be missing previous /info/research path)
-Removed package-lock.json to fix conflicts
*Updated l10n to not use HTML
 2018-04-03 16:22:36 +08:00
Ray Schamp
2f8017bb89 Lint 2018-04-02 17:04:54 -04:00
Ray Schamp
a01cb1962e Use empty string for placeholder value 
Fixes React warning about using `selected` prop on `select` component options
 2018-04-02 15:16:19 -04:00
chrisgarrity
19039a4905 Catch empty phone number 2018-04-02 13:49:45 -04:00
chrisgarrity
730835c4be Fix validation and lint errors 
* checkbox needed a default value
* general-error is passed a ref by formsy - cannot be stateless function
* add missing `label` prop to input field
* add missing proptypes to phoneinput.
 2018-04-02 12:26:12 -04:00
Ray Schamp
191a95eb76 Resurrect phone input validation 2018-03-30 13:45:42 -04:00
Ray Schamp
41780fb7cb Finish updating react-telephone-input 2018-03-30 12:11:21 -04:00
Ray Schamp
ad81dba61b Finish linting 2018-03-30 11:28:59 -04:00
Ray Schamp
9001e6ba5c Lint 2018-03-30 11:21:41 -04:00
chrisgarrity
7c46f6957a Fix up student registration 2018-03-30 10:51:23 -04:00
chrisgarrity
67f292037a Correcting teacher registration for react16 2018-03-30 10:51:22 -04:00
Ray Schamp
55a45349da WIP - update phone input 2018-03-30 10:51:22 -04:00
chrisgarrity
53ca763646 Add Error Boundary and Crash message 
Added all the strings to general l10n as error boundary/crash message applies to all pages.
 2018-03-30 10:51:22 -04:00
Ray Schamp
79665e5986 Fix warnings on About 2018-03-30 10:49:58 -04:00
Ray Schamp
f375130190 Remove unrecognized props from Input 
In the process, make Input into a stateless component, since apparently this state isn't ever changed.
 2018-03-30 10:49:58 -04:00
Ray Schamp
34f39b1c0b Update to React 16, and dependent packages 
The Splash page renders with this commit.
 2018-03-30 10:49:58 -04:00
Ray Schamp
61c2bb148a Use country data from an NPM package 
To prepare to upgrade react-telephone-input which removed this module
 2018-03-30 10:49:58 -04:00
Kenny2github
82c651cece A New Beginning 2018-03-27 18:33:10 +08:00
chrisgarrity
b7900aca05
Merge pull request #1833 from chrisgarrity/feature/preview-project 
Feature/preview project  - part 1 (elements 'above the fold')
 2018-03-21 10:29:01 -04:00
chrisgarrity
1b2050c58a cleanup 2018-03-20 20:19:48 -04:00
chrisgarrity
c5ea057974
Merge pull request #1835 from JoelGritter/patch-2 
Fix #1825
 2018-03-19 10:00:38 -04:00
Joel Gritter
536e4c7e0b
Remove filled jobs 
Removed: Designer, Learning Resource Designer, QA Engineer, Senior Backend Engineer
 2018-03-17 18:50:04 -04:00
Joel Gritter
316a36f1ed Fix gh-1824: Add note about real names (#1830) 
* Add note about real names as a new string

Fixes gh-1824
 2018-03-16 16:18:17 -04:00
chrisgarrity
1c6b0dd64c Cleanup 
Fixing lint problems and removing (most) unused code. I left user and session as they will get used soon even though they aren’t currently.
 2018-03-15 17:40:16 -04:00
Andrew Sliwinski
7bf690df5e
Merge pull request #1821 from ktrvs/ktrvs-update-privacy-policy 
Update privacy policy to be more clear. | Fixes #1803
 2018-03-15 13:00:48 -04:00
chrisgarrity
9545e53c98 Close registration when full 
Hotfix ready to deploy when conference registration has filled up.
 2018-03-15 09:00:49 -04:00
chrisgarrity
f836c6e3a8 Adding in remix metadata 
- Moved preview state into redux
- Gets remix credit if the project is a remix
- Shows up to 5 remixes (direct children?)
- handles empty remixes result (it’s not an array)
- Added Column component - based on Grid, but doesn’t use frameless to set width.
- allows trailing ‘/‘ on the URL
- cleaned up conditional content
 2018-03-14 15:50:27 -04:00
chrisgarrity
79199d6d32 Placeholders for everything ‘above the fold’ 2018-03-08 15:57:19 -05:00
chrisgarrity
2d6327ba01 Update Northeastern accomodation info 2018-02-28 14:08:16 -05:00
chrisgarrity
f86bd01609 Remove obsolete code 2018-02-28 13:58:22 -05:00
Kerr
cf40bea072
Update privacy policy 2018-02-28 12:50:37 +00:00
chrisgarrity
ea6de54104 [WIP]: embed GUI in a preview page 2018-02-21 14:39:21 -05:00
chrisgarrity
1d42674651 Conference March 1 update 
- Add buttons that link to conference registration
- Updated FAQ copy
 2018-02-21 11:19:13 -05:00
Kerr Travers
2d98faf160
Update footer.jsx 2018-02-14 16:32:24 +00:00
Ray Schamp
788d24b0f0
Merge pull request #1806 from LLK/release/2.2.27-jan 
[Develop] January 2018 Release
 2018-02-13 10:49:55 -05:00
Ray Schamp
2617dc95d1 Add Full Stack Engineer job post 
Also reorder existing posts to be alphabetical
 2018-02-12 13:33:20 -05:00
Ray Schamp
c6f7681197 Fix merge issues 2018-02-12 09:26:39 -05:00
Ray Schamp
5513b6a7e9 Merge branch 'develop' of github.com:LLK/scratch-www into issue/gh1400-load-more-button-behavior 
# Conflicts:
#	src/views/search/search.jsx
 2018-02-08 10:42:04 -05:00
chrisgarrity
aff3c33817
Merge pull request #1796 from chrisgarrity/hotfix/conf2018-feb5 
[DEVELOP] Hotfix Conference page to close session proposals
 2018-02-05 08:41:27 -05:00
chrisgarrity
a5f2121fea Another hotel update 2018-02-02 10:25:12 -05:00
chrisgarrity
901ec9d2f1 Update hotel links 2018-02-02 09:23:46 -05:00
St19_Galla
15982b5699 Fix gh-1780: Corrects Link on About Page (#1781) 
* Update about.jsx

* shorten
 2018-02-01 17:26:34 -05:00
Linda
358ac9a5b9 fixes #1764/reduce string duplication in teaacher registration (#1791) 2018-02-01 17:25:55 -05:00
Arav Narula
2799d12069 Update credits.jsx (#1770) 
* Update credits.jsx

* Fix up ES6 changes.
 2018-02-01 17:24:28 -05:00
Ray Schamp
25a1280cca
Merge pull request #1759 from towerofnix/fix-firefox-focusring 
Hide Firefox focus ring on <select> elements (language selector)
 2018-02-01 09:29:09 -05:00
chrisgarrity
2989857dbe Update Conference page to close session proposals 
Fixes #1782, needs to be hotfixed on Feb 5
 2018-01-31 17:14:42 -05:00
Ray Schamp
cbc5bbd565 Fix search tabs 2018-01-31 13:00:27 -05:00
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
c7c92c49f7
Revert "[Master] Upgrade to ES6" 2018-01-30 09:53:25 -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
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
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
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
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
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
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
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
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
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
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
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
Carl-Myer R. Flor
36b90980a6 Adds button behavior for various search result state 2017-12-11 23:24:02 +08: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
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
Matthew Taylor
9fbd5b691c temporarily take out curator row and recently shared row 2017-12-01 15:12:49 -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
Kerr
8722a1d374
Update jobs.jsx 2017-11-29 22:12:24 +00: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
Sheshank Shankar
3e52bc7fc5
Make Conference logo button link to homepage. 2017-11-21 16:51:11 -08:00