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
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
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
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
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
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
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
Ray Schamp
4e0d54df98
Split up concerns of form progression and display
...
Still thinking of a good name for the form "card" component...
2016-06-14 17:29:30 -04:00
Ray Schamp
da2a4ce48c
Add bot honeypot
2016-06-14 17:29:30 -04:00
Ray Schamp
cfa85427b1
Add address validation
2016-06-14 17:29:30 -04:00
Ray Schamp
d7df1e980f
Move api mixin to lib, remove mixin
...
The mixin doesn't gain us anything except complexity
2016-06-14 17:29:30 -04:00
Ray Schamp
56e16bc0dc
Actually provide every state in world choice
2016-06-14 17:29:30 -04:00
Ray Schamp
0512b614be
Fixup use iso
2016-06-14 17:29:29 -04:00
Ray Schamp
f126a71336
Use iso-31660-2 package for country data
2016-06-14 17:29:29 -04:00
Ray Schamp
9da2bb29a8
Base phone and address country on user country
2016-06-14 17:29:29 -04:00
Ray Schamp
3ea1c64184
Split out steps from the view
2016-06-14 17:29:29 -04:00
Ray Schamp
0f3485534b
Organize form data into objects
2016-06-14 17:29:29 -04:00
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
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
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
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
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
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
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
The_Grits
ac96ffc6f6
Squash and Merge
2016-05-24 10:05:17 -04:00
Connor Hudson
e73b26b686
fix spacing issues
...
Fixes Travis testing
2016-05-23 15:35:05 -04:00
Technoboy10
a3fda6be30
use single quotes to appease travis
2016-05-23 14:28:34 -04:00
Technoboy10
6bddc8d2d3
replace anchor when schedule day clicked
2016-05-23 14:10:09 -04:00
Technoboy10
0b6b81e1f1
Merge branch 'release/2.2.9' of https://github.com/llk/scratch-www into release/2.2.9
2016-05-23 10:48:29 -04:00
Technoboy10
b020964ef4
add media query to center links
2016-05-23 10:48:11 -04:00
Technoboy10
7bb9c622c7
set time headers to correct color
2016-05-23 10:10:31 -04:00
Matthew Taylor
a477be4814
Some more cleanup
...
1. typo with splitting token/session out
2. redefine `chunk` as `timeSlot`
3. move timeSlot sorting into its own method
2016-05-19 17:37:51 -04:00
Matthew Taylor
337b6dcfca
fix lint warnings
2016-05-19 17:02:21 -04:00
Matthew Taylor
a860b27941
Some updates to the redux structure
...
1. split `auth.js` up so it's 1 reducer per file
2. consolidate the conference schedule reducers
3. make conference reducer names more descriptive
4. add error handling for `body === 'undefined'`
Thanks @rschamp for all the help!
2016-05-19 16:55:25 -04:00
Matthew Taylor
bca90bd835
Add icons for schedule/details
...
from @carljbowman
2016-05-19 16:40:30 -04:00
Matthew Taylor
d69de477a1
Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/conference-schedule
...
* 'develop' of https://github.com/LLK/scratch-www : (32 commits)
Lint
Bundle all locale data
Don't bundle polyfills
Set up Raven within init.js
Prefix privacyPolicy message string
Exclude minified javascript from linting
One space more
Changes "interfacesto" to "interfaces to"
Remove tag target
Filter before mapping to avoid returning undefined
Fix Pass condition for "static" routes
Spacing2
Mangling is the default
Spacing
Update for typography fixes
Cherry pick PR #476 into master
Add invisible spacer to anchored sections
For Developers
Lint JSON, expand and simplify lint step
Fix banned user redirect
...
# Conflicts:
# src/redux/actions.js
# src/redux/reducer.js
2016-05-19 13:25:36 -04:00
Matthew Taylor
cad75217f0
Add schedule/detail components for conference
2016-05-19 11:34:59 -04:00
Matthew Taylor
4017266327
Fix typo
2016-05-19 11:26:11 -04:00
Ray Schamp
bb0ac87aec
Merge pull request #488 from TheGrits/patch-1
...
[Privacy Policy] One space more
2016-05-17 16:26:50 -04:00
Ray Schamp
dff9c3d128
Merge pull request #489 from technoboy10/patch-3
...
Hotfix: Resolve gh-484 (cosmetic issue in developers page)
2016-05-17 16:24:17 -04:00
The_Grits
2d80c46c74
One space more
...
I can't believe I missed this one earlier. *facepalm*
2016-05-17 15:46:20 -04:00
Connor Hudson
9808a31d9a
Changes "interfacesto" to "interfaces to"
2016-05-17 13:07:19 -06:00
Rachel Thornton
dc42b317e2
Removed rows from grid, changed explore tabs
...
Grid component now no longer uses row concept, and changed tabs in the
Explore page to projects/studios, with categories in a new picker above
the tabs. Also compressed svg files.
2016-05-17 12:40:16 -04:00
Ray Schamp
0ede616f44
Merge pull request #481 from TheGrits/patch-2
...
Fix Spacing Issues on Privacy Policy
2016-05-17 11:03:11 -04:00
The_Grits
792a5c9622
Spacing2
...
Changed as per @rschamp's comments
2016-05-17 11:02:34 -04:00
The_Grits
834f2db463
Spacing
...
I noticed some spacing issues on the page, I thought I would fix them.
2016-05-17 09:52:42 -04:00
Ray Schamp
6b420b4445
Update for typography fixes
2016-05-17 08:30:27 -04:00
Ray Schamp
b7dd55e7e0
Merge branch 'feature/for-developers' into develop
2016-05-17 08:28:25 -04:00
Matthew Taylor
89c2f2628e
Add invisible spacer to anchored sections
...
so that the headers are visible
2016-05-17 08:24:03 -04:00
carljbowman
e885c08ea1
For Developers
...
Add landing page for developers
2016-05-17 07:51:08 -04:00
The_Grits
76c003d854
Lint fixes
2016-05-16 06:45:06 -04:00
The_Grits
5d05d19566
aha
...
Does this fix the lint error?
2016-05-14 23:21:10 -04:00
The_Grits
c2fca9c4c6
Squash and Merge
2016-05-14 22:39:40 -04:00
Matthew Taylor
bf1b3f894d
Some leftovers
...
Thanks @rschamp again!
2016-05-12 22:54:07 -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
Rachel Thornton
577ed2c746
Small fix
2016-05-10 08:18:47 -04:00
Rachel Thornton
9c6475aed5
Support for studios
...
Search and Explore now support studios, thought currently the api is
not ready for them.
2016-05-10 08:16:46 -04:00
Rachel Thornton
d7c9057cbd
Refactoring, new grid component
...
Significant refactoring of Explore and Search pages, including new grid
component for displaying projects
2016-05-10 00:54:46 -04:00
Matthew Taylor
fd1016059b
Merge branch 'patch-8' of https://github.com/TheGrits/scratch-www into TheGrits-patch-8
...
* 'patch-8' of https://github.com/TheGrits/scratch-www :
Indent p element
Edit spacing
Whoops
Squash and Merge
Add DMCA route
# Conflicts:
# src/routes.json
2016-05-03 10:23:34 -04:00
Matthew Taylor
47d7257895
Merge pull request #462 from mewtaylor/hotfix/add-register-faq
...
[Develop] Hotfix: Add Registration to FAQ
2016-05-01 12:48:41 -04:00
Rachel Thornton
fdd78a5433
Style changes
...
Changes to style for lint tests
2016-04-30 16:38:48 -04:00
Rachel Thornton
eb499c929c
Changed path of search page to allow for studio tabs
...
Users and Forum tabs removed
2016-04-30 16:03:11 -04:00
Rachel Thornton
e2a7698cde
Changes to path for search results
...
No longer uses google_results in url
Also now has correct link to project page from clicking on projects in
explore and search
2016-04-30 14:50:11 -04:00
Rachel Thornton
bca374b88f
Merged changes to routing, separated Tabs into a component
2016-04-30 14:07:11 -04:00
Rachel Thornton
74a6d132bd
Search page functions
2016-04-30 11:44:10 -04:00
Matthew Taylor
c28f90857b
Add registration faq question
2016-04-29 17:37:41 -04:00
Matthew Taylor
07bbc38822
Merge pull request #433 from TheGrits/patch-7
...
Fix gh-19: Migrate Community Guidelines
2016-04-29 17:32:35 -04:00
The_Grits
20dcf8eb4f
switch
2016-04-29 17:27:39 -04:00
The_Grits
64143704d5
Thanks Travis
...
Got rid of a trailing space
2016-04-29 17:22:49 -04:00
The_Grits
aaf4ee5b49
oops lol
...
Gotta love those duplicate lines!
2016-04-29 17:18:09 -04:00
The_Grits
09775ad4a5
Squash and Merge
2016-04-29 17:15:26 -04:00
Matthew Taylor
87009babae
Merge pull request #431 from TheGrits/patch-6
...
Fix gh-426: Update Project Count
2016-04-29 16:38:02 -04:00
The_Grits
9ae31c132f
Indent p element
2016-04-28 09:18:26 -04:00
Matthew Taylor
cf71520875
final content update for conference
...
"coming soon" image for schedule, and schedule reference on landing page. Also background image for the landing page.
2016-04-27 23:23:43 -04:00
Matthew Taylor
7d7fb9797d
Cleanup for scratch conference
...
1. s/collaborators/sponsors
2. open footer links in new window
3. remove superfluous require statement
4. increase spacing for scratch family links
2016-04-26 12:24:55 -04:00
The_Grits
df8c036daf
Edit spacing
...
As per @mewtaylor 's suggestions on #435
2016-04-26 09:09:07 -04:00
Matthew Taylor
a4e19a5edc
Temporarily remove "View Full Schedule" link
...
Since we don't have one yet
2016-04-25 17:39:31 -04:00
The_Grits
c657a4b5f9
Squash and Merge
2016-04-25 07:52:20 -04:00
The_Grits
117eed5eb3
Squash and Merge
2016-04-23 14:27:08 -04:00
The_Grits
e73d3fabcc
All other references
2016-04-22 14:16:59 -04:00
The_Grits
123b366180
13mil -> 14mil
2016-04-22 14:11:25 -04:00
Matthew Taylor
3c487163a0
Last minute copy updates
2016-04-22 09:07:32 -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
66113e1c58
Add conference sub-site
2016-04-21 16:22:39 -04:00
Matthew Taylor
f05cb39501
Add flex-row component
...
Just a container with some default flexbox formatting.
2016-04-21 16:21:22 -04:00
Matthew Taylor
3c8a7db834
Take margins out of typography
...
They won't be the same margins for text-heavy and text-lite pages, so we should make thess view-specific for now
2016-04-21 16:19:20 -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
Rachel Thornton
405f666109
Merge remote-tracking branch 'LLK/develop' into develop
2016-04-18 16:51:53 -04:00
Rachel Thornton
dfa7b9e582
Starting mock of search page
2016-04-18 16:51:45 -04:00
Matthew Taylor
a6e199b5f4
Merge pull request #414 from TheGrits/patch-4
...
Fix gh-413: Update supporting organizations
2016-04-15 16:22:54 -04:00
The_Grits
c9492ae38b
Update l10n.json
2016-04-15 16:12:17 -04:00
The_Grits
08ccaa7721
Spaces and Intel
2016-04-15 15:59:32 -04:00
The_Grits
1a2e30fccd
mailto anchor
2016-04-15 15:58:11 -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
174b351845
Delete the extra space
2016-04-09 14:28:05 -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
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
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
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
Rachel Thornton
ff228e022c
Merge remote-tracking branch 'LLK/develop' into develop
2016-03-25 11:35:47 -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
Rachel Thornton
d4277cabae
Early Explore Page
...
Added an early prototype of the new Explore page
2016-03-24 10:16:53 -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
Matthew Taylor
4914ba6d85
Use formatNumber
to localize project count
...
`toLocaleString()` is not supported in Safari, but react-intl has a polyfill, and so it is. This also localized the intro description string, which wasn't previously. This also fixes #366 by doing as @rschamp suggested and checking if the count is the default count before setting the value.
2016-03-22 11:00:37 -04:00
Ray Schamp
7b72e6cdcd
Fix lint errors
2016-03-18 12:40:30 -04:00
Ray Schamp
a5e336a175
Use redux for session handling
2016-03-18 11:51:22 -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
morant
2e5a0e1439
Merge remote-tracking branch 'upstream/develop' into feature/microworlds
...
* Removed microwords from server/routes for now.
# Conflicts:
# server/routes.json
# src/components/thumbnail/thumbnail.jsx
2016-03-11 21:14:27 -05:00
Matthew Taylor
cb81ae550a
Merge pull request #382 from mewtaylor/hotfix/wedo-appstore-link
...
[Develop] Hotfix: wedo appstore link
2016-03-10 15:28:50 -05:00
Matthew Taylor
c514d814c9
Update device manager app store link
2016-03-10 15:14:08 -05:00
Matthew Taylor
b484480e1e
Merge branch 'wedo-landing' into develop
...
* wedo-landing:
Update with links, fix linter issues, center setup
[WIP] Add WeDo Landing page
# Conflicts:
# server/routes.json
2016-03-10 09:05:51 -05:00
Matthew Taylor
aeaa02aae8
Update with links, fix linter issues, center setup
2016-03-09 23:04:25 -05:00
carljbowman
3220fd1b9d
[WIP] Add WeDo Landing page
...
Adding LEGO WeDO landing page. This also includes the initial pass on Global Typographic Standards.
Needs Work
-Add URLs to all links on the page (still being generated)
-Ater URLs have been added, update translation JSON to include messages that include links
2016-03-09 14:33:17 -05:00
Andrew Sliwinski
47ab0a0ae0
Update jobs to match Media Lab listings
2016-03-02 09:42:51 -05:00
Andrew Sliwinski
7511121972
Merge branch 'develop' into feature/jobs
2016-03-01 10:19:34 -05:00
Matthew Taylor
0ac9f5edc5
Merge pull request #359 from TheGrits/patch-2
...
Fix gh-357: Splash - Initial value of project count is arbitrary
2016-02-23 11:43:26 -05:00
morant
c7cc1b626f
Revert "Revert "Fix review comments, and organize code a bit.""
...
This reverts commit e9cb08d273
.
2016-02-19 15:11:23 -05:00
morant
e9cb08d273
Revert "Fix review comments, and organize code a bit."
...
This reverts commit 3d9d280bb9
.
2016-02-19 14:39:43 -05:00
morant
3d9d280bb9
Fix review comments, and organize code a bit.
...
The only visible change should be that the tips thumbnails are no longer links.
2016-02-19 14:30:07 -05:00
The_Grits
8d05ed84b4
singlequotes
...
Apparently double quotes don't work
2016-02-18 14:34:02 -05:00
The_Grits
9f2325bd83
"over 13 million"
...
Changed as per @mewtaylor's suggestion
2016-02-18 14:29:58 -05: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
53cf85a4c2
Update project count
...
Updated the number with a more recent number, I wasn't sure if using a string like "Loading..." would damage anything.
2016-02-08 10:04:38 -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
Andrew Sliwinski
6204b52479
WIP
2016-01-31 13:02:10 -05:00
Matthew Taylor
581f071c0e
Add missing alt tags
2016-01-25 08:30:10 -05:00
Matthew Taylor
2e79a5aa6b
Merge pull request #323 from mewtaylor/bugfix/readme-update
...
Added some more documentation
2016-01-19 16:11:49 -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
dddc867c1e
Merge pull request #319 from mewtaylor/feature/gh-288-accessibility
...
GH-288: accessibility
2016-01-14 10:27:29 -05:00
Matthew Taylor
112cad14e3
Added some more documentation
2016-01-14 10:25:03 -05:00
Matthew Taylor
9e58efc7e2
Merge pull request #305 from mewtaylor/feature/266-componentize-locale-strings
...
GH-266: view-ify locale strings
2016-01-14 10:10:02 -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
morant
d002e0c63a
Turn microworld to a component, and create paths to all three microworlds
2016-01-13 14:21:59 -05:00
morant
793b8c025d
remove unneeded imports, and show design studio without a propmpt project as a carousel
2016-01-13 12:32:53 -05:00
Matthew Taylor
f00d07b0bf
edit all indentation
...
ht @thisandagain!
2016-01-13 11:52:38 -05:00
Matthew Taylor
592f66c9a8
Fix credits link
...
Fixes #297
2016-01-13 10:35:26 -05:00
Matthew Taylor
2ac3e5337f
Add alternative labels for input and links
...
See https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_01
2016-01-12 13:27:36 -05:00
Matthew Taylor
01975b7e4d
Add alt
attribute to image tags
...
See https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_02
2016-01-12 13:27:09 -05:00
morant
2cf6befeaf
add hip hop and fashion JSONs, and minor fixes to microworlds.jsx
2016-01-11 18:38:15 -05:00
Matthew Taylor
c88fc6f27d
Make general nowrap
more specific to paragraphs
...
And remove the overrides that were already there. ht @rschamp and @carljbowman!
2016-01-11 14:58:55 -05:00
morant
6aa93b1711
Error Handling - when a component isn't declared, don't show it.
2016-01-08 18:35:17 -05:00
morant
2593d7aaf5
Generic version of the Microworlds.
...
No arts specific features anymore.
Still fails when a component is missing
2016-01-08 16:18:51 -05:00
morant
cca175154c
First version of generic microworlds.
...
Reads videos information from JSON, other parts still not generic.
2016-01-08 14:43:39 -05:00
morant
5c919506cf
Add tips
2016-01-08 14:42:35 -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
d5ffd9fcc0
Flatten messages for components into one object
...
thanks @rschamp!
2016-01-07 11:02:14 -05:00
Matthew Taylor
398f9cb95a
Move component strings into views
...
Handle localization and string loading in views only. Components should just of default text, but not the actual text for the page itself – all text handling should be at the view level.
2016-01-07 10:11:03 -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
Matthew Taylor
8ae98d703f
Make localizations view-based
...
1. Load locale strings into `window._messages` in a separate file added to `template.html`, which contains view-specific and general strings
2. Update build-locales to compile separate files
2016-01-06 14:09:32 -05:00
morant
77a4bd2d10
adding tips to the microworld
2015-12-21 13:30:22 -05:00
Matthew Taylor
1c802f9230
Some translations cleanup
...
A couple missing translations
2015-12-09 14:03:30 -05:00
Andrew Sliwinski
fc59793aff
Merge pull request #244 from thisandagain/feature/about
...
Migrate - About View
2015-12-08 13:52:27 -05:00
Andrew Sliwinski
64546a2410
Merge pull request #245 from thisandagain/feature/credits
...
Migrate - Credits View
2015-12-08 13:52:18 -05:00
Andrew Sliwinski
2fdc6458e0
Address feedback from review
2015-12-08 10:53:12 -05:00
Andrew Sliwinski
aa7efc7e4f
Merge branch 'develop' of github.com:llk/scratch-www into feature/about
2015-12-08 10:31:48 -05:00
Andrew Sliwinski
30f4feff48
Hotfix for HOC legal notices
2015-12-04 10:41:25 -05:00
Hannah Cole
92dc1727e2
fixed tests, formatting
2015-12-01 16:14:37 -05:00
Hannah Cole
97877b1fbd
jobs page styling changes
2015-12-01 16:00:52 -05:00
Hannah Cole
1eadc19d5e
localized jobs page
2015-12-01 15:50:29 -05:00
Hannah Cole
6ec9f7da11
created jobs page
2015-11-29 13:53:03 -05:00
Hannah Cole
c82aecf1f7
created jobs page
2015-11-29 13:42:26 -05:00
morant
bd1319edff
Add interactive design studio, and make studios show arts projects.
...
Also many design changes.
2015-11-29 09:32:01 -05:00
morant
9f0d36624a
Fresh version of arts microworld
2015-11-22 21:40:08 -05:00
carljbowman
ba2902f979
Add Made with Code Logo
2015-11-20 09:56:10 -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
Andrew Sliwinski
82eedaaf13
Resolve merge conflicts
2015-11-18 20:06:54 -05:00
Andrew Sliwinski
8a2ac5f24e
Resolve lint errors
2015-11-18 20:06:05 -05:00
Andrew Sliwinski
f2561fbc03
Migrate about view. Resolves GH-63
2015-11-18 19:57:07 -05:00
Ray Schamp
7c0363e99b
Merge pull request #211 from rschamp/bugfix/GH-195
...
Fix GH-195: Use a spinner component to convey activity while logging in
2015-11-11 11:11:02 -05:00
carljbowman
96b1dba277
Update HOC tutorials and linking
...
- Swapped Pong Game with B-Ball Hoops
- Changed Bearstack Story's thumbnail to clear up confusion around similar thumbnails
- Added 'B-Ball Hoops' to localization JSON
- Added anchor link to resource section for easy acess.
2015-11-10 10:58:08 -08:00
Andrew Sliwinski
35a3e4c192
Merge pull request #216 from rschamp/bugfix/GH-128
...
Fix GH-128: Use table layout in IE 9 for navigation and homepage
2015-11-06 10:14:22 -05:00
Ray Schamp
b1694c1adc
Fix GH-128 again: use table layout for IE 9
2015-11-05 19:33:02 -05:00
Matthew Taylor
21e1e73c95
Fix HOC links
...
bearstack, dance studio
2015-11-04 10:33:26 -05:00
Matthew Taylor
ad8d32474f
Update HOC page with new mobile, styling & content
...
Mobile styling is from the frameless framework from #198 (ht @rthorn!). Localization also in as well.
Use `white-space: normal` instead of `inline-block`
Prep for componetizing Sub-Nav
- Fixed top banner extra margin
- Updated HTML containers and SCSS
Add subnavigation component
Added more content
- More projects (still need photos)
- Added section about Studios (need to create links to studios)
WIP: adding frameless to HOC page
Remove Grid elements on Sections
Made the implmentation more granular with breakpoints in mind.
More formatting adjustments
Cards in box now working.
Update responsive behavior and spacing
Updated all elements to respond to new grid system breakpoints.
Update content and organize HOC assets
- Added studios section with studio elements
- Reorganized the image assets for HOC 2015
Fix SCSS linting errors
Update addtional activities photo assets
Generalize `info` class on subnav
Move onto one line
left-align single-column studio links
Add strings for localization
Some rebase conflicts
Code review feedback
ht @thisandagain!
Fix alignment of studios
Keep `inline-block` for mobile
2015-11-03 23:50:51 -05:00
Ray Schamp
f97e3f51ee
Add Spinner component
...
Using one found on http://tobiasahlin.com/spinkit/ for now. @carljbowman please help
2015-11-03 18:45:38 -05:00
Matthew Taylor
46742459bf
Add empty host for clear-cache
proxy request
...
So that it actually goes to scratchr2, not scratch-api
2015-10-30 09:14:49 -04:00
Matthew Taylor
d897d4387d
Use xhr to clear cache instead of form
...
because csrf. also, since we don't have a definite message/banner system in place yet, use the button itself for feedback rather than messages. The button will disable if it has been successfully used, or turn pink if there was an error (and it will not be disabled in that case).
2015-10-29 10:28:32 -04:00
Ray Schamp
399d91fea5
Use shouldShowWelcome method to show welcome panel
...
Fixes GH-153. Again...
2015-10-25 16:34:32 -04:00
Ray Schamp
2eb63e604d
Scope message handler to confirmation iframe
2015-10-25 12:13:48 -04:00
Ray Schamp
3b729fcb0a
Move "should show banner" test to one function
2015-10-25 12:13:48 -04:00
Ray Schamp
8cde05fdc8
Fix remaining Modal styles
2015-10-25 12:13:47 -04:00
Ray Schamp
7e74c4a105
Use classNames everywhere with dynamic classNames
...
Fixes GH-141, and keeps it from being introduced on Banner
2015-10-25 12:13:23 -04:00
Matthew Taylor
ccd048893f
Merge branch 'develop' into feature/email-confirmation-banner
...
* develop:
Fix GH-168: Rehabilitate the `Modal` props.style
Fix GH-162: Show "user deletion canceled" modal
Set empty states on sign out
Clean up activity item rendering logic
Add some padding to the empty message
Make sure boxes aren't transparent
Add empty state for What's Happening box
Fix GH-124: Fix studio thumbnail URLs
Only show "Welcome" panel if user is < 2 weeks old
Fix #152 : Don't output activity without a message
Fix #102 : Add remix and love icons
Update arrow icons on Carousels
# Conflicts:
# src/components/modal/modal.jsx
# src/views/splash/splash.jsx
2015-10-25 09:05:35 -04:00
Ray Schamp
3963a15caa
Merge pull request #143 from rschamp/feature/empty-activity
...
Add empty state for What's Happening box
2015-10-24 18:58:53 -04:00
Matthew Taylor
eb38951f06
Set empty states on sign out
...
also make state setting a bit more uniform
2015-10-24 14:52:11 -04:00
Matthew Taylor
07bd1f215f
Move to using iframe in modal
...
like registration
2015-10-24 14:33:34 -04:00
Ray Schamp
5865b6d619
Add some padding to the empty message
2015-10-24 12:38:23 -04:00
Ray Schamp
21b7386270
Merge pull request #157 from rschamp/bugfix/GH-152
...
Fix #152 : Don't output activity without a message
2015-10-24 12:25:55 -04:00
Ray Schamp
616e99c631
Only show "Welcome" panel if user is < 2 weeks old
...
Or if they've dismissed it. Fixes GH-153.
2015-10-24 12:06:16 -04:00
Ray Schamp
39550d805a
Fix #152 : Don't output activity without a message
2015-10-23 17:41:50 -04:00
Matthew Taylor
cfb7fa0307
Merge branch 'develop' into feature/email-confirmation-banner
...
* develop:
separate out arrows var from settings object
Handle arrow display dynamically
Deploy from Travis
Adjust nitpicks, remove whitespace in (), add around +
display title and extras differently
Add registration component to `JOIN SCRATCH`
Explicitly set `Accept-Language` to cookie lang
Remove the session listener on unmount
Localize the welcome panel
Update spacing on Splash page elements
Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions
Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions
Update entire Tutorial cards to be clickable
Add window.Intl polyfill. Resolves GH-96
Override `Slider`'s `arrows` setting by row length
use ellipsis if text overflows and urlify username
Test the build when we test our build
Default admin panel to closed
Set 'black' default props for thumbnails and carousel
Remove localhost from api call for message count
2015-10-23 15:30:13 -04:00
Matthew Taylor
317b520220
Handle arrow display dynamically
...
And handle specific case for studio homepage row. Fixes #130 and also stuff left over from #105
2015-10-23 13:28:11 -04:00
Ray Schamp
be6358fba9
Merge pull request #138 from rschamp/feature/welcome-panel
...
Add welcome panel component to homepage
2015-10-22 22:42:47 -04:00
Ray Schamp
b6a6b7faad
WIP
2015-10-22 18:40:04 -04:00
Ray Schamp
429aa03507
Add dismissable email confirmation banner
2015-10-22 17:19:31 -04:00
Ray Schamp
af415e1bf3
Set template cue to dismiss welcome panel
2015-10-22 17:17:27 -04:00
Ray Schamp
58d3ed4ecb
Add welcome component and show it conditionally
...
Move some of the colors used on the splash page into _colors.scss so they can be reused.
2015-10-22 12:21:47 -04:00
carljbowman
dc13d63d2e
Update entire Tutorial cards to be clickable
...
Wrapped the Tutorial cards in link tags, rather than just the button.
2015-10-22 10:34:18 -04:00
Matthew Taylor
fe96c6fa71
Override Slider
's arrows
setting by row length
...
If the row length is less than `slidesToShow`, don't show the arrows.
2015-10-21 16:49:50 -04:00
Ray Schamp
345540aa20
Organize view methods
...
Proposing this ordering: attributes, lifecycle, getters, handlers, rendering
2015-10-21 15:12:41 -04:00
Ray Schamp
b847777d09
Merge pull request #111 from rschamp/feature/hide-empty-rows
...
Only display custom rows that exist and have items
2015-10-21 14:34:37 -04:00
Ray Schamp
8df5e41991
Only display custom rows that exist and have items
2015-10-21 14:27:29 -04:00
Matthew Taylor
43ea666141
Get project count from api when logged out
2015-10-21 14:12:34 -04:00
Matthew Taylor
23558f583f
change max
to limit
for new api
2015-10-20 17:07:16 -04:00
Ray Schamp
50646b6c3c
Localize homepage row content
2015-10-20 14:49:25 -04:00
Ray Schamp
6259cb5b97
Pull homepage rows from the API
...
Not localized yet
2015-10-20 14:49:25 -04:00
Matthew Taylor
22e8ceca5e
Activity with current friends-activity
format
...
This updates `activity.jsx` to handle the current `friends-activity` format (which is a bit hacky atm), and uses `FormattedRelative` to handle relative timestamps
2015-10-20 13:41:17 -04:00
Matthew Taylor
43786861c8
Add AdminPanel
component
...
And include it on the splash page.
2015-10-19 14:55:38 -04:00
Matthew Taylor
7b704e878f
Give name to the exported module
2015-10-16 15:10:17 -04:00
Matthew Taylor
0577860f3a
Rename renderer
to render
...
and make it a method that returns a component, rather than an object with a render method
2015-10-15 23:11:09 -04:00
carljbowman
c7367967ba
Update Hover JS fuctions with intative naming
2015-10-14 14:53:40 -06:00
carljbowman
5a8ab315b5
Remove extra white space on HOC Landing
2015-10-14 14:46:13 -06:00
carljbowman
4424fe2f0b
Add Collaborators and Logos
2015-10-14 14:45:00 -06:00
carljbowman
144d30ad09
Remove excess/unused CSS
2015-10-14 10:33:56 -06:00
carljbowman
2d745dd1ea
Update HOC with Banner Hoverstates & Assets
...
- Added hover states on the tutorial cards that changes the banner background.
- Included new web optimized image assets.
2015-10-14 10:30:52 -06:00
Andrew Sliwinski
3bf13df8fe
More copy changes for HOC
2015-10-13 18:18:15 -04:00
Andrew Sliwinski
2a881fccb5
Quick HOC copy changes from Natalie & Mitch
2015-10-13 17:20:05 -04:00
Ray Schamp
07be335a42
Consolidate rendering to helper function
2015-10-13 11:45:23 -06:00
Ray Schamp
da9174c520
Make app more transparent to Selenium
2015-10-09 14:16:37 -06:00