scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-11 08:11:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
7108 commits 221 branches 1 tag 505 MiB
Commit graph

120 commits

Author SHA1 Message Date
Linda
0f2ca09892 added Katelyn to credits page 2018-09-04 12:54:29 -04:00
chrisgarrity
409b452200
Merge pull request #1979 from joker314/feature/add-bryce-taylor 
Add brycedtea to Credits page
 2018-07-31 08:08:21 -04:00
Sheshank Shankar
3c020d9200
Update credits.jsx 2018-07-19 10:57:09 -07:00
Sheshank Shankar
a5070bfda5
Remove trailing spaces 2018-07-19 09:08:20 -07:00
Sheshank Shankar
4de9b49d2a
Bug fix 2018-07-19 09:07:08 -07:00
Sheshank Shankar
7b205fb136
Add Kathy Wu to credits 2018-07-19 08:59:43 -07:00
jokebookservice1
0f5778cab9 Add brycedtea to Credits page 2018-07-19 18:54:50 +03: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
590f505a61 Revert "Merge pull request #1788 from LLK/revert-1775-hotfix/es6-upgrade" 
This reverts commit 1b1b396e92, reversing
changes made to a144bab0e6.
 2018-01-30 11:53:12 -05:00
Ray Schamp
46511e1253
Revert "[Develop] Upgrade to ES6" 2018-01-30 09:54:45 -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
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
10fb7e032a up to date 2018-01-15 20:23:24 +01:00
Kerr Travers
34093e6aa9 Fixes #1728 | Add new member to credits (#1729) 2017-12-07 13:02:00 -05:00
Matthew Taylor
a1da26b0c9 Point at @GulpTea’s avatar 2017-10-30 08:39:42 -04:00
KT
16f312b0fa Fix #1612 (#1616) 
* Adding new mods and moving others to "Previous MIT Scratch Team Members" maintaining alphabetical order
 2017-10-12 08:26:47 -04:00
Sheshank Shankar
e8671c1727 Add Tina Quach to Credits. Resolves GH-1572 
* Add Tina Quach to Credits

* Update credits.jsx

* Update credits.jsx
 2017-09-26 11:10:58 -04:00
Linda
e119cea627 Fixes GH-1435/Reduce work for translators on credits page (#1514) 
* Fixes GH-1435/Make as many names as possible on credits page non-translate

* fixed the travis error that occured before
 2017-09-15 17:24:41 -04:00
LiFaytheGoblin
aa8efd0bc9 fixed the travis errors that occured earlier 2017-09-15 14:34:21 +02:00
LiFaytheGoblin
b5c44bae96 Fixes GH-1435/Make as many names as possible on credits page non-translate 2017-09-07 17:33:12 +02:00
chrisgarrity
c7eabe18c3 Merge pull request #1483 from Petroochio/gh-1470-credits-overflow 
Fix gh-1470 Firefox Overflow on Credits Page
 2017-09-05 10:15:31 -04:00
The_Grits
9942e91175 Add Tracy Tang (#1489) 2017-08-29 22:41:10 -04:00
Peter Gyory
59435d9ec6 Fix gh-1470 Firefox Overflow on Credits Page 
Add specific style on credits page to allow for word wrap
 2017-08-23 14:43:18 -06:00
St19_Galla
ad25e09980 Add Ellen Daoust 2017-08-16 13:39:17 -04:00
Ken
6dc5bfa788 Update credits (#1451) 
Fixes #1450 

Thanks @Kenny2github
 2017-08-09 08:36:48 -04:00
Matthew Taylor
b13c76e1ea Merge pull request #1436 from TheGrits/patch-4 
Fix gh-1433: Fix Gunicorn Link
 2017-08-02 08:31:05 -04:00
The_Grits
487fd1b47a Fix Gunicorn Link 2017-07-25 20:38:03 -04:00
LiFaytheGoblin
f9a9130351 Added JT Galla to the Credits Page under 'Aknowledgements' 2017-07-25 22:11:05 +02:00
The_Grits
a3714e5348 Add transifex remove pootle 2017-07-06 23:06:23 -04:00
Matthew Taylor
6ace6926c0 Merge pull request #1347 from LiFaytheGoblin/fix_issue/gh_1331_add_mark_ferrell_to_credits_page 
Fix issue/gh-1331: added mark ferrell to credits page
 2017-06-13 16:22:54 -04:00
The_Grits
dd655df674 Fix gh-1343: Update Credits Page (#1346) 
* Remove Christina Huang

* Add Christina Huang to Previous Members
 2017-06-12 09:22:58 -04:00
LiFaytheGoblin
acfb5d71ac added mark ferrell to credits page (issue 1331) 2017-06-11 12:57:26 +02:00
The_Grits
0a747f68bd Add DD Liu 
Resolves #1296
 2017-05-01 11:24:55 -04:00
The_Grits
c45663e966 Add Juanita Buitrago to Previous Members 2017-03-13 17:09:08 -04:00
The_Grits
f1880e47d5 Remove Juanita Buitrago 2017-03-13 17:08:39 -04:00
The_Grits
7e9a6ef410 Add, remove, and resort! (2) 2017-03-13 16:17:12 -04:00
The_Grits
b5cebffe11 Add, remove, resort! 2017-03-13 16:06:37 -04:00
The_Grits
40e2bf8500 credits typo 
Should fix #1201
 2017-02-22 10:57:37 -05:00
The_Grits
7f148f1a47 Remove MIT Scratch Team from Localization 2017-02-14 14:01:54 -05:00
The_Grits
1d47e0ef6a Add Organizations Back In 2017-02-08 09:12:14 -05:00
The_Grits
3f4e40ef5c Localize Credits Page 2017-01-14 00:38:16 -05:00
The_Grits
4eb3287c0e FormattedMessage and FormattedHTMLMessage 2017-01-13 23:46:26 -05:00
St19_Galla
b83a3825e9 Add Travis-CI 2016-10-06 15:55:00 -04:00
Ray Schamp
6fa1c13cfb Move Randy Jou to previous Scratch Team section 2016-10-03 11:39:21 -04:00
St19_Galla
f2c176a521 Update Credits 2016-08-31 14:59:03 -04:00
Matthew Taylor
82dbfabcec Constrain view styles to within view name classes 
So that they don't affect styles declared outside the scope of the view. Thanks @rschamp!
 2016-05-12 18:32:57 -04:00
Matthew Taylor
e1cebe46db Ergonomics – get rid of typography file 
1. Merge typography into main
2. Get rid of use of `#view` in scss
3. Make `render` work with conference pages
 2016-05-12 18:05:26 -04:00
Matthew Taylor
2eb62e8ab3 move component convention back to what it was 
formerly presentation components such as `navigation` and `footer` have been nested, and renamed to `container` inside their respective component subdirs
 2016-04-21 18:13:21 -04:00
Matthew Taylor
eed6f1fc08 Restructure src 
1. Put formatting-specific components into the `presentation` subdir of `components`
2. Put content-specific components into the `container` subdir of `components`
3. Put views that are sub-urls of the site into a subdir of `views` (i.e. `microworlds`, and eventually `conference`)
 2016-04-21 15:46:32 -04:00
The_Grits
08ccaa7721 Spaces and Intel 2016-04-15 15:59:32 -04:00
The_Grits
d6b08a0bff Add Chris and Julia 
As per https://github.com/LLK/scratch-www/issues/413#issuecomment-209889924
 2016-04-14 12:36:20 -04:00
The_Grits
855154edcf Update CN url 
As per https://github.com/LLK/scratch-www/pull/414#issuecomment-206880466
 2016-04-07 09:36:45 -04:00
The_Grits
09d095b963 Change supporting organizations 
As per #413.
Specific additions:
- Cartoon Network
- Lemann Foundation
 2016-04-06 17:42:05 -04:00
Ray Schamp
19f469db48 Upgrade and quiet sass-linter 
These warnings were annoying me because the noise makes it easy to miss real issues.

The `no-mergeable-selectors` rule is one that we do want to have, but right now it asks that you merge selectors in different `@media` blocks.  When the next release happens we should put that back.

https://github.com/sasstools/sass-lint/issues/307

Similarly, we want `force-element-nesting` but there is a problem with that because there's no easy way to have a nested selector in a list of selectors.
https://github.com/sasstools/sass-lint/issues/575

Finally, until they implement per-line overrides, we have to silence `class-name-format` because we don't have control over the ReactModal class names.  It's a useful rule to keep class names consistent though.  Per-line ignores should be coming soon: https://github.com/sasstools/sass-lint/issues/70
 2016-03-23 18:34:54 -04:00
Ray Schamp
faabc63e65 Move component structure to one tree 
Instead of inserting `Navigation` and `Footer` into every `render`ed component, just compose them in the views with a new `Page` component.
 2016-03-18 10:54:26 -04:00
The_Grits
7992c43b87 Update credits.jsx 
Travis was complaining that link 188 had over 120 characters, this should fix it.
 2016-02-12 07:37:25 -05:00
Matthew Taylor
212a2d2c41 Merge pull request #352 from technoboy10/gh333-creditspage 
Fix gh-333: Add/Remove Moderators on Credits Page
 2016-02-10 22:51:54 -05:00
The_Grits
91f3de0682 link formatting in paragraphs 2016-02-08 14:50:56 -05:00
The_Grits
3939dde44e Update credits.scss 2016-02-08 08:10:41 -05:00
The_Grits
2a6f30cdb7 word-wrap for p elements 
Should fix #354, I'll test on a local machine.
 2016-02-05 07:59:09 -05:00
Technoboy10
e1b9cf5716 Removed Megan Haddadi, added Linda and Lily 2016-02-03 08:36:05 -07:00
Matthew Taylor
581f071c0e Add missing alt tags 2016-01-25 08:30:10 -05:00
Matthew Taylor
7303b7963b import main.scss in render.jsx 
Fallout from #305, fixes #324
 2016-01-14 14:55:24 -05:00
Matthew Taylor
98d0f0de6e Updates based on feedback 
1. changes intl filenames to `[view].intl.js`
2. Move nav/footer rendering to `render.jsx`
3. Set locale cookie before submitting language change form

Thanks @thisandagain !
 2016-01-14 08:32:43 -05:00
Matthew Taylor
ceec694b2a Revert "Migrate to using a loader method" 
This reverts commit 214430b0c4.
 2016-01-08 13:50:58 -05:00
Matthew Taylor
214430b0c4 Migrate to using a loader method 
This moves all locale/translation building to a dependency, `scratch-www-intl-loader`, as well as tests associated with it. Also gets rid of the `make translations` step.
 2016-01-07 17:01:57 -05:00
Matthew Taylor
448ca0b103 Remove main bundle 
Render footer and nav on each view directly instead of globally in a separate bundle
 2016-01-06 14:23:47 -05:00
Andrew Sliwinski
167353c68d Migrate credits page. Resolves GH-30. Resolves GH-174. Resolves GH-215 2015-11-18 21:14:54 -05:00