scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1181 commits 218 branches 1 tag 463 MiB
Commit graph

1181 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
175a71711d Update existing forms on the site to use formsy 
Or not in the case of the search form
 2016-06-14 17:29:29 -04:00
Ray Schamp
b5c615b1fa Use formsy-react for validation 
Complete validation for username/password form (except for checking if a username exists).
 2016-06-14 17:27:53 -04:00
Ray Schamp
de3151924c Lint 2016-06-14 17:27:53 -04:00
Ray Schamp
1eaf6effcc Tiny bit of style 2016-06-14 17:27:53 -04:00
Ray Schamp
04c8650512 Allow other types other than form in FormStep 2016-06-14 17:27:53 -04:00
Ray Schamp
2ca846f826 Use Scratch components for the form and clean up 2016-06-14 17:27:52 -04:00
Ray Schamp
350a573fc5 Move formset into forms 2016-06-14 17:27:52 -04:00
Ray Schamp
17a3f1ebcb Add initial form data 2016-06-14 17:27:52 -04:00
Ray Schamp
68d49a84dc Update FormSet to advance steps onSubmit 2016-06-14 17:27:52 -04:00
Ray Schamp
144d6e3754 wip 2016-06-14 17:27:52 -04:00
Ray Schamp
a080b2b64f wip 2016-06-14 17:27:52 -04:00
Matthew Taylor
55765551ae Merge pull request #570 from mewtaylor/bugfix/fastly-condition 
Bugfix: shorten fastly condition
 2016-06-14 13:16:52 -04:00
Matthew Taylor
60187d4a75 Allow access to 2014 and 2015 pages 2016-06-14 12:42:13 -04:00
Matthew Taylor
dfc4f9574d use route aliases for generalizable route patterns 
1. match all `^/explore` to www
2. match all `^/search` to www
3. match all `^/conference` to www
 2016-06-14 11:28:20 -04:00
Matthew Taylor
45d78b9c7c remove /components from routes.json 
It's a dev-only route, and is in `dev-routes.json` already
 2016-06-14 11:26:17 -04:00
The_Grits
1785c767b4 whoops 2016-06-13 15:37:31 -04:00
The_Grits
554dcb100c Fix gh-555: Squished News Icons 2016-06-13 15:06:41 -04:00
Ray Schamp
cead467bda Merge pull request #566 from rschamp/hotfix/remove-banner 
[Master] Remove Make it Fly banner
 2016-06-13 14:56:46 -04:00
Ray Schamp
01b662f77f Merge pull request #567 from rschamp/hotfix/remove-banner 
[Develop] Remove Make it Fly banner
 2016-06-13 14:43:37 -04:00
Ray Schamp
e2dcd6c647 Remove Make it Fly banner 
This reverts commit 7cf3846231, reversing
changes made to afe14ebe88.
 2016-06-13 14:35:08 -04:00
Andrew Sliwinski
efee67770f Merge pull request #565 from thisandagain/bugfix/apache 
Fix issues in FAQ of /developers page.
 2016-06-13 13:59:49 -04:00
Andrew Sliwinski
e05572dc0a Fix issues in FAQ of /developers page. 2016-06-13 11:38:11 -04:00
Connor Hudson
d7c78bd234 Merge pull request #562 from technoboy10/gh123-randomize-rows 
Fix GH-123: Shuffle top loved and top remixed
 2016-06-13 10:38:18 -04:00
Matthew Taylor
e04b314656 remove dashes 
Thanks @rschamp!
 2016-06-13 10:07:00 -04:00
Matthew Taylor
5b73c4192d change name to getUnsignedValue 
thanks @rschamp!
 2016-06-13 10:06:43 -04:00
Matthew Taylor
0c2a73a910 Don't use dash in name 
It's used for grouping in `build-locales`.
 2016-06-13 09:41:12 -04:00
Connor Hudson
fde193ca06 move shuffle to utility module 2016-06-13 09:40:32 -04:00
Matthew Taylor
e5f274933b Add final copy for teacher account banner 2016-06-13 07:47:43 -04:00
Connor Hudson
3d6a95e84b fix error with shuffleArray function 2016-06-09 17:33:49 -04:00
Connor Hudson
04166ab423 add shuffleArray function, shuffle most loved and most remixed 2016-06-09 17:22:31 -04:00
Matthew Taylor
e5467e5f45 Add "For Developers" to the footer 
Fixes #556
 2016-06-09 11:54:14 -04:00
Matthew Taylor
ce02c82665 Merge pull request #559 from mewtaylor/feature/explore-from-rthorn 
Explore and Search Pages from rthorn
 2016-06-09 11:03:46 -04:00
Matthew Taylor
ef0037942e use image to get studio thumbnail 
same as with `project`
 2016-06-09 09:44:09 -04:00
Matthew Taylor
b065ed5254 quick formatting fix for box header on search 2016-06-09 07:57:41 -04:00
Matthew Taylor
365c3d0bad Fix merge issue 2016-06-09 07:44:28 -04:00
Matthew Taylor
9fad938eb8 Add localizations, minor style changes 2016-06-09 07:32:25 -04:00
Matthew Taylor
ac17850491 Add teacher banner to splash page 
This only shows if the logged in user is a teacher, and persists for teachers.
 2016-06-08 13:47:11 -04:00
Matthew Taylor
0894724dfd Merge branch 'develop' of https://github.com/rthorn/scratch-www into feature/explore-from-rthorn 
* 'develop' of https://github.com/rthorn/scratch-www:
  Removed rows from grid, changed explore tabs
  Removed extraneous image file
  Whitespace added
  Small fix
  Support for studios
  Refactoring, new grid component
  Style changes
  Changed path of search page to allow for studio tabs
  Changes to path for search results
  Removed unnecessary files
  Search page functions
  Starting mock of search page
  Fixed problem with loading
  Load button and tabs functioning
  Merge remote-tracking branch 'LLK/develop' into develop
  Early Explore Page

# Conflicts:
#	src/components/navigation/www/navigation.jsx
 2016-06-07 09:06:01 -04:00
Matthew Taylor
ad5b534f5e Merge pull request #551 from mewtaylor/bugfix/mobile-nav-conference 
[Master] hotfix: mobile nav conference
 2016-06-06 14:42:35 -04:00
Matthew Taylor
bf1fa2934d Merge pull request #552 from mewtaylor/bugfix/mobile-nav-conference 
[Develop] hotfix: mobile nav conference
 2016-06-06 11:01:12 -04:00
Connor Hudson
8022d76aaa Merge pull request #553 from technoboy10/gh548-signout 
Fix GH-548: Sign out should take effect before reload
 2016-06-06 09:06:36 -04:00
Connor Hudson
75ce6378a2 remove comment 2016-06-06 08:46:28 -04:00
Connor Hudson
9c66939bc3 use defaults instead of defaultsDeep 2016-06-06 08:45:35 -04:00
Matthew Taylor
fb4464d0d4 Correction for Nichole Pinkard's name on /expect 
Apologies for the copy error!
 2016-06-06 08:32:48 -04:00
Matthew Taylor
fce41dc32e use row wrap instead of columns 
apparently mobile doesn't like columns as much as row wrap for flexbox.
 2016-06-06 08:29:51 -04:00
Matthew Taylor
8a2f4404c5 Merge pull request #550 from mewtaylor/bugfix/conference-schedule 
[Master] Hotfix: conference schedule formatting bugfixes
 2016-06-03 23:05:33 -04:00
Matthew Taylor
bcec3d8fc6 Merge pull request #549 from mewtaylor/bugfix/conference-schedule 
[Develop] Hotfix: conference schedule bug fixes
 2016-06-03 19:52:16 -04:00
Matthew Taylor
c8f6c36b1f Fix schedule formatting 
1. Sort schedule by 24-hour time to handle 12-o-clock
2. Sort chunks by type AND time, since multiple chunks have the same name
 2016-06-03 19:43:53 -04:00
Connor Hudson
c2c5d806b3 Merge pull request #547 from technoboy10/fix-dmca 
Fix DMCA page
 2016-06-03 15:27:24 -04:00
Connor Hudson
5bd1f4f2ac add container div to fix dmca 2016-06-03 15:02:55 -04:00