scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-14 17:51:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3809 commits 220 branches 1 tag 511 MiB
Commit graph

3809 commits

This branch
This branch
All branches
Author SHA1 Message Date
The_Grits
174b351845 Delete the extra space 2016-04-09 14:28:05 -04:00
Shane M. Clements
32e2fb5516 Fixed another lint issue. 2016-04-09 11:07:21 -06:00
Shane M. Clements
a6be92448b Fixed linting errors and webpack config for redirect routes. 2016-04-09 10:39:55 -06:00
Shane M. Clements
cbc58d2f11 Added code for redirects and now redirecting the donation URL to the proper location. Fixes #412. 2016-04-09 10:04:39 -06:00
Matthew Taylor
8a8513a5cd Merge pull request #416 from mewtaylor/hotfix/wedo-page 
[Master] Hotfix: Wrap wedo2 view in page component
 2016-04-07 17:31:00 -04:00
Matthew Taylor
8fd4b154b2 Merge pull request #417 from mewtaylor/hotfix/wedo-page 
[Develop] Hotfix: Wrap wedo2 view in page component
 2016-04-07 17:01:17 -04:00
Matthew Taylor
7aeaaeb480 Wrap wedo2 view in page component 2016-04-07 16:49:35 -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
6d349cb7f9 Update supporting organizations 
Changed according to #413
 2016-04-06 17:49:30 -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
10455f980f Merge pull request #403 from LLK/release/2.2.7 
[develop] Release 2.2.7
 2016-04-05 15:27:11 -04:00
Ray Schamp
341e09acff Merge pull request #402 from LLK/release/2.2.7 
[master] Release 2.2.7
 2016-04-05 15:26:27 -04:00
Matthew Taylor
27b55082f0 Merge pull request #407 from mewtaylor/issue/gh-406-counselor-link 
GH-406: Add community counselor job
 2016-04-04 14:55:36 -04:00
Rachel Thornton
f545d8acf7 Fixed problem with loading 2016-04-04 14:11:35 -04:00
Rachel Thornton
ce8849e4aa Merge remote-tracking branch 'LLK/develop' into develop 
# Conflicts:
#	src/components/navigation/navigation.jsx
 2016-04-03 16:46:23 -04:00
Rachel Thornton
8e6921cd82 Load button and tabs functioning 
Users can now load more projects by clicking a button at the bottom of
the page, and check out different genres of project using the tabs.
 2016-04-03 16:45:31 -04:00
Ray Schamp
53e508dd24 Merge pull request #411 from sayamindu/develop 
Add view for community blocks interview recruitment
 2016-04-01 16:34:57 -04:00
Andrew Sliwinski
a059aab829 Merge pull request #408 from sayamindu/develop 
Add view for community blocks interview recruitment
 2016-04-01 16:18:33 -04:00
Sayamindu Dasgupta
bd81438800 Add view for community blocks interview recruitment 
We are recruiting Scratchers for interviews on the Scratch Community
blocks feature; this is a part of my PhD disseration. This commit has
the PDF forms and the views that are needed for the recruitment.
 2016-04-01 13:23:48 -04:00
Matthew Taylor
7734ee8931 Add community counselor job 
Fixes #406
 2016-04-01 10:29:13 -04:00
Ray Schamp
122b97b2a9 Merge pull request #405 from rschamp/hotfix/production-modules 
[develop] Hotfix: Don't require dev dependencies in production
 2016-03-31 12:35:22 -04:00
Ray Schamp
4714b32fa9 Merge pull request #404 from rschamp/hotfix/production-modules 
[master] Hotfix: don't require dev dependencies in production
 2016-03-31 12:35:02 -04:00
Ray Schamp
8bc3e5e2a5 Don't require dev dependencies in production 2016-03-31 12:24:33 -04:00
Ray Schamp
4e99e701d5 Merge pull request #401 from rschamp/bugfix/nav-session-undefined 
Fix reference to session
 2016-03-29 18:39:54 -04:00
Ray Schamp
c9157e70b9 Fix reference to session 
Caused by merging an old branch which didn't have conflicts, but did have a different understanding of session.
 2016-03-29 18:38:39 -04:00
Matthew Taylor
1c20600272 Merge pull request #399 from mewtaylor/issue/gh-398-jobs-error 
Fix GH-398: Add page component to jobs view
 2016-03-28 14:27:34 -04:00
Matthew Taylor
1adb8ecf5b Add page component to jobs view 
Fixes #398
 2016-03-28 14:18:44 -04:00
Rachel Thornton
bfd3fac6a0 Merge remote-tracking branch 'LLK/develop' into develop 
# Conflicts:
#	src/components/navigation/navigation.jsx
 2016-03-26 21:15:36 -04:00
Ray Schamp
78649b69e2 Merge pull request #353 from morantsur/feature/microworlds 
Moving Microworlds pages to scratch-www & adding arts
 2016-03-25 15:43:10 -04:00
Ray Schamp
ea04658b4a Merge pull request #387 from rschamp/feature/scratchr2#2937-student-nav 
Add "My Class" to student nav
 2016-03-25 14:32:22 -04:00
Rachel Thornton
ff228e022c Merge remote-tracking branch 'LLK/develop' into develop 2016-03-25 11:35:47 -04:00
Ray Schamp
0fa50bfd73 Merge pull request #394 from rschamp/bugfix/nav-css 
Fix incorrect nesting in search styles
 2016-03-24 13:13:18 -04:00
Ray Schamp
6e0d35efaa Fix incorrect nesting in search styles 2016-03-24 13:12:41 -04:00
Ray Schamp
74d23d05dc Remove inline default messages 2016-03-24 12:29:40 -04:00
Ray Schamp
2d6a38800b Add "My Class" to student nav 2016-03-24 12:28:32 -04:00
Ray Schamp
29fa914b9a Merge pull request #391 from rschamp/feature/token-from-cookie 
Add method to retrieve token from session cookie and use it
 2016-03-24 12:27:07 -04:00
Ray Schamp
042ef65070 Merge pull request #393 from rschamp/feature/silence 
Upgrade sass-lint, quiet various warnings
 2016-03-24 12:02:40 -04:00
Ray Schamp
dce35a4bee Add keys to children where necessary 2016-03-24 11:29:26 -04:00
Ray Schamp
d0ff2660bd Don't configure sentry unless there's a DSN 2016-03-24 11:29:04 -04:00
Rachel Thornton
d4277cabae Early Explore Page 
Added an early prototype of the new Explore page
 2016-03-24 10:16:53 -04:00
Matthew Taylor
49611edb0d Merge pull request #384 from mewtaylor/feature/gh-372-cards 
Implement GH-372: Add `/info/cards/` route
 2016-03-24 07:04:34 -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
Matthew Taylor
56787ee09c Add spot check for cards, use new Page paradigm 2016-03-23 16:47:55 -04:00
Matthew Taylor
b903067658 Update the cards with new grouped structure 2016-03-23 16:37:15 -04:00
Matthew Taylor
f95b62bf67 Change name to cards to prevent interaction fx 
thanks @rschamp !
 2016-03-23 16:37:15 -04:00
Matthew Taylor
5d693ed53d Add /info/cards/ route 
Also implements a method for handling translation of static files as described in https://github.com/LLK/scratch-www/issues/372#issuecomment-193350144
 2016-03-23 16:37:15 -04:00
Ray Schamp
339c23a64e Add some sources to the unsign method 2016-03-23 10:02:20 -04:00
Ray Schamp
21dffa73f0 Fix indentation 2016-03-23 09:50:41 -04:00
Matthew Taylor
cc457aeddd Merge pull request #392 from mewtaylor/cleanup/localization-stuff 
Cleanup: catch more localization errors that might arise
 2016-03-23 09:25:05 -04:00
Matthew Taylor
c448b15dd4 Refactor build-locales a bit 
This makes a couple of procedure-specific parts into methods in `locale-compare`, so that they can be tested more readily.
 2016-03-23 08:22:09 -04:00