scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-26 15:32:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14445 commits 223 branches 1 tag 531 MiB
Commit graph

14445 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
8fb16bf397 Add formatting for teacher reg flow 2016-06-23 07:27:43 -04:00
Connor Hudson
3624e18e08 inherit line height, remove margin 2016-06-22 16:58:58 -04:00
Connor Hudson
230cadffa5 more styling, carousel 2016-06-22 16:48:58 -04:00
Ray Schamp
93ed60cd0d Add teacher waiting room view 2016-06-22 13:35:38 -04:00
Connor Hudson
dd249e8b88 add assets for teacher page 2016-06-22 13:18:47 -04:00
Connor Hudson
9c14f7cb3f create landing page 2016-06-22 13:18:19 -04:00
St19_Galla
ab2dc47921 Update navigation.scss 2016-06-22 11:22:30 -04:00
Ray Schamp
de8ac6c56a Only pass necessary props to steps 
Rather than lazily including all form progress to every step, just give each step what it needs.
 2016-06-21 18:45:41 -04:00
carljbowman
98fb9a4cc1 Merge pull request #591 from carljbowman/jobs-update 
Jobs page update
 2016-06-21 16:31:52 -04:00
carljbowman
ee8d6bf0c5 Update Jobs page 
- Add 'Web Designer' position
- Adjusted typography to match new Type Standards
- Add Hex Value to Colors for consistency
 2016-06-21 15:00:51 -04:00
carljbowman
53988c2345 Don't lint temporary locale .json files 2016-06-21 15:00:05 -04:00
Matthew Taylor
9d6fb63d18 Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow 
* 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www: (46 commits)
  Add serverside email validation
  Clean up
  Move registration step to main component
  Submit the rest of the fields when registering
  This help text is redundant now
  Fix organization "other" field enablement
  Get the form creating regular accounts
  Add method to api for submitting forms
  Update language chooser for formsy
  Add missing string
  Add progress indicators
  Style pass
  Remove unused label component
  Remove unused mixin factory
  Fixup api refactor
  Add serverside username validation
  L10n pass
  Explain the GeneralError component
  Add help text when a field is not required
  L10n WIP
  ...

# Conflicts:
#	src/l10n.json
#	src/views/splash/splash.jsx
 2016-06-17 15:32:49 -04:00
Connor Hudson
5d12e5773d Merge pull request #584 from technoboy10/gh554-localize-faq 
Fix GH-554: Localize FAQ title
 2016-06-17 14:47:46 -04:00
Matthew Taylor
b337b47590 Merge pull request #586 from mewtaylor/issue/conference-updates 
Fix GH-[571,563] – updates to the conference site
 2016-06-17 14:14:53 -04:00
Ray Schamp
bf76e88ca2 Add serverside email validation 2016-06-17 13:01:53 -04:00
Ray Schamp
11b9876930 Clean up 2016-06-17 12:22:29 -04:00
Ray Schamp
078463ac25 Move registration step to main component 
Add a placeholder error step
 2016-06-17 12:22:11 -04:00
Ray Schamp
8646bd84b3 Submit the rest of the fields when registering 2016-06-17 11:01:34 -04:00
Ray Schamp
532a1cce57 This help text is redundant now 2016-06-17 11:01:10 -04:00
Ray Schamp
ad5da0f543 Fix organization "other" field enablement 2016-06-17 11:00:48 -04:00
Matthew Taylor
f0b178c290 Merge pull request #583 from mewtaylor/issue/gh-541-faq-schools 
Fix GH-541: Add "schools" section to faq
 2016-06-17 09:39:41 -04:00
Ray Schamp
d7ca0166ab Get the form creating regular accounts 2016-06-16 17:25:14 -04:00
Ray Schamp
26e1ee553b Add method to api for submitting forms 
Some of our legacy endpoints expect this style rather than json.

Also clean up the way useCsrf works — don't always set json attribute to an empty object.
 2016-06-16 17:24:31 -04:00
Matthew Taylor
32e9b089c5 updates to the conference site 
1. new collaborators
2. new sold out language
3. some copy edits
 2016-06-16 17:07:22 -04:00
Ray Schamp
d27b0a2433 Update language chooser for formsy 2016-06-16 16:31:13 -04:00
Ray Schamp
9a3b83f8c6 Add missing string 2016-06-16 16:30:59 -04:00
Connor Hudson
1e571d0e2d localize FAQ title 2016-06-16 15:11:43 -04:00
Matthew Taylor
f5cbdfa2c9 Merge pull request #582 from mewtaylor/issue/teacher-faq 
Add teacher faq page
 2016-06-16 11:31:29 -04:00
Connor Hudson
c188a268e2 Merge pull request #568 from TheGrits/patch-1 
Fix gh-555: Squished News Icons
 2016-06-16 11:17:44 -04:00
Ray Schamp
e062096445 Add progress indicators 2016-06-16 10:54:36 -04:00
Matthew Taylor
b13a388425 Fix typo 
thanks @technoboy10!
 2016-06-16 10:54:35 -04:00
Matthew Taylor
8ef3acd5d9 Merge pull request #560 from mewtaylor/issue/gh-556-footer 
Fix GH-556: Add "For Developers" to the footer
 2016-06-16 10:28:19 -04:00
Matthew Taylor
098bc8618a Merge pull request #577 from mewtaylor/issue/gh-573-grid-align 
Fix GH-573: center align grid while left aligning projects
 2016-06-16 10:24:53 -04:00
Matthew Taylor
b828200e94 add teacher faq page 2016-06-16 10:22:37 -04:00
Matthew Taylor
2ea2cfa6c5 Add "schools" section to faq 2016-06-15 15:22:41 -04:00
Ray Schamp
1fba322d01 Style pass 2016-06-15 15:08:56 -04:00
Matthew Taylor
ba5d8e0d63 Merge pull request #558 from mewtaylor/issue/gh-543-teacher-banner 
Fix GH-543: Add teacher banner to splash page
 2016-06-15 10:09:11 -04:00
Matthew Taylor
626b3f008e Merge branch 'develop' of https://github.com/LLK/scratch-www into issue/gh-543-teacher-banner 
* 'develop' of https://github.com/LLK/scratch-www: (29 commits)
  Add explore redirects
  Allow access to 2014 and 2015 pages
  use route aliases for generalizable route patterns
  remove `/components` from `routes.json`
  Remove Make it Fly banner
  Fix issues in FAQ of /developers page.
  move shuffle to utility module
  fix error with shuffleArray function
  add shuffleArray function, shuffle most loved and most remixed
  use `image` to get studio thumbnail
  quick formatting fix for box header on search
  Fix merge issue
  Add localizations, minor style changes
  Removed rows from grid, changed explore tabs
  Removed extraneous image file
  Whitespace added
  Small fix
  Support for studios
  Refactoring, new grid component
  Style changes
  ...

# Conflicts:
#	src/views/splash/splash.jsx
#	src/views/splash/splash.scss
 2016-06-15 09:45:05 -04:00
Matthew Taylor
2f359c1d92 Merge pull request #576 from mewtaylor/issue/gh-574-explore-redirect 
Fix GH-574: Add explore redirects
 2016-06-15 09:36:51 -04:00
Matthew Taylor
2193914650 center align grid while left aligning projects 
Fixes #573
 2016-06-15 09:34:15 -04:00
Matthew Taylor
311f431ca1 Add explore redirects 
for `/explore`, `/explore/projects` and `/explore/studios` to `/explore/<projects|studios>/all`
 2016-06-15 08:19:27 -04:00
Ray Schamp
fb57c25afd Remove unused label component 2016-06-14 17:47:56 -04:00
Ray Schamp
333d52d2b6 Remove unused mixin factory 2016-06-14 17:41:12 -04:00
Ray Schamp
dffea48299 Fixup api refactor 
Updates after a rebase
 2016-06-14 17:33:54 -04:00
Ray Schamp
8da8ab4100 Add serverside username validation 
With this we get cleanspeak for free
 2016-06-14 17:29:31 -04:00
Ray Schamp
8dac67f292 L10n pass 2016-06-14 17:29:31 -04:00
Ray Schamp
97c4e9beb9 Explain the GeneralError component 2016-06-14 17:29:31 -04:00
Ray Schamp
f74a078afb Add help text when a field is not required 
Most of our fields are required, so it makes more sense to display help when they are optional than to asterisk every required field
 2016-06-14 17:29:31 -04:00
Ray Schamp
667ff08a36 L10n WIP 2016-06-14 17:29:31 -04:00
Ray Schamp
ce007d64f8 Change password confirmation to "show password" 2016-06-14 17:29:30 -04:00