Commit graph

303 commits

Author SHA1 Message Date
Ray Schamp
fe74208f32 Add international phone validation 2016-06-14 17:29:29 -04:00
Ray Schamp
bcda082014 Add validation to the rest of the 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
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
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
e05572dc0a Fix issues in FAQ of /developers page. 2016-06-13 11:38:11 -04:00
Connor Hudson
fde193ca06 move shuffle to utility module 2016-06-13 09:40:32 -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
b065ed5254 quick formatting fix for box header on search 2016-06-09 07:57:41 -04:00
Matthew Taylor
9fad938eb8 Add localizations, minor style changes 2016-06-09 07:32:25 -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
bf1fa2934d Merge pull request #552 from mewtaylor/bugfix/mobile-nav-conference
[Develop] hotfix: mobile nav conference
2016-06-06 11:01:12 -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
Connor Hudson
5bd1f4f2ac add container div to fix dmca 2016-06-03 15:02:55 -04:00
Connor Hudson
245c9cbe4f Merge pull request #542 from technoboy10/gh307-newstatic
Fix GH-307: Restyle FAQ and legal pages
2016-06-03 14:31:08 -04:00
Technoboy10
9853f5ba5a Move all styling into the InformationPage component 2016-06-03 14:02:29 -04:00
Connor Hudson
f280d1d8df Remove quotes around keys, results -> session 2016-06-01 17:22:11 -04:00
Connor Hudson
fd1401fe1b used stricter comparison 2016-06-01 16:14:58 -04:00
Connor Hudson
4d65d478ed change to more extensible session 2016-06-01 15:28:18 -04:00
Connor Hudson
00ac15d475 add test, tweak terms 2016-06-01 12:05:03 -04:00
Connor Hudson
1178a50beb restyle all the things 2016-06-01 11:57:50 -04:00
Connor Hudson
10a4dc656e fix travis 2016-06-01 10:49:59 -04:00
Connor Hudson
e402363576 initial pass 2016-05-31 16:37:42 -04:00
Ray Schamp
7fb512f4a8 Merge pull request #531 from rschamp/feature/cn-banner
[Develop] Homepage module
2016-05-31 12:25:16 -04:00
Ray Schamp
3632f3dc1d Merge branch 'release/2.2.9' into develop 2016-05-31 12:24:21 -04:00
Ray Schamp
7cf3846231 Merge pull request #530 from rschamp/feature/cn-banner
[Master] Homepage module
2016-05-31 10:18:20 -04:00
Matthew Taylor
932dab40c7 Some additional mobile changes 2016-05-29 11:59:53 -04:00
Matthew Taylor
6eeebe05c3 Merge pull request #525 from mewtaylor/issue/conference-tweaks
For GH-497: conference tweaks for fallout from schedule/typography
2016-05-27 16:40:39 -04:00
Matthew Taylor
ad1e723188 Drop the text below the button
thanks @carljbowman!
2016-05-27 16:35:23 -04:00
Matthew Taylor
011032308c Consolidate text
thanks @carljbowman !
2016-05-27 16:19:51 -04:00
Matthew Taylor
74ac6e52bb conference formatting tweaks for mobile
thanks @carljbowman!
2016-05-27 15:55:27 -04:00
Matthew Taylor
b07b61c925 Update conference to reflect being sold out 2016-05-27 15:55:08 -04:00
Ray Schamp
45abaff962 Fix account links on Privacy Policy page 2016-05-27 14:33:12 -04:00
The_Grits
4f75713bd5 Update privacypolicy.jsx 2016-05-27 09:56:56 -04:00
Connor Hudson
a4f15f4ec8 Merge pull request #510 from technoboy10/gh507-scheduleanchor
Fix gh-507: Consistently change URI
2016-05-26 16:59:44 -04:00
Connor Hudson
59f4d303c6 Merge pull request #512 from TheGrits/patch-1
Fix gh-29: Migrate Terms of Use
2016-05-26 16:15:21 -04:00
The_Grits
f3fafb7b3a Rename and Update 2016-05-26 11:31:16 -04:00
The_Grits
9bd63bd11a Spacing 2016-05-26 11:23:17 -04:00
Ray Schamp
448bb8aa3f Add Power Puff Girls banner 2016-05-24 17:14:12 -04:00
Matthew Taylor
87ce6db1cd generalize pdf check
thanks @rschamp! fyi, I left it in cards only because I'm not sure that we really do this `(English)` thing anywhere else.
2016-05-24 14:27:16 -04:00
Matthew Taylor
ffc1e8d0ca Fix pdf localization check
It was adding the `(English)` suffix no matter what. This fixes it by getting the locale from props, and also by making the conditional check a bit more safe.
2016-05-24 13:09:34 -04:00
The_Grits
7948c8bbc4 Hello Travis 2016-05-24 10:21:19 -04:00