Matthew Taylor
37131df008
Handle message count split in container
...
Fixes issue where admin messages caused social messages to display as unread when they weren’t
2017-10-03 12:53:49 -04:00
Matthew Taylor
d272a2e4e6
Handle case of messages length being less than unreadcount
...
this fixes #1561 by making sure that if the count is retrieved before the messages themselves, there is no error in the console.
2017-10-02 10:33:53 -04:00
Sheshank Shankar
e8671c1727
Add Tina Quach to Credits. Resolves GH-1572
...
* Add Tina Quach to Credits
* Update credits.jsx
* Update credits.jsx
2017-09-26 11:10:58 -04:00
chrisgarrity
1d08a9e201
Rename AnimateYourNameGuide to NameGuide
...
remove obsolete static URL so localizations get picked up correctly.
git-ignore localized-urls.json as it’s pulled from scratch-resources now.
2017-09-25 17:16:58 -04:00
Andrew Sliwinski
d542f18e74
Merge pull request #1552 from VutonDesign/patch-1
...
Rewording | 10n.json
2017-09-20 07:57:38 -04:00
Matthew Taylor
c9eacf4ac3
Merge pull request #1559 from mewtaylor/issue/gh-1545
...
Fix GH-1545: add `unread` as a key/value on each message
2017-09-19 17:18:42 -04:00
Matthew Taylor
a9cb7bbd99
don’t iterate over list if no filter applied
...
thanks @chrisgarrity !
2017-09-19 17:11:46 -04:00
chrisgarrity
5f48fc13e8
Link to pt-br downloads if locale is pt-br ( #1558 )
...
* Link to pt-br downloads if locale is pt-br
2017-09-19 11:56:30 -04:00
Matthew Taylor
9b3b1a2623
render load more even if messages not there
...
This handles #1546 by still checking about whether to display the loadMore button even if messages are not present (i.e. if a subfilter has no messages present).
2017-09-19 10:30:14 -04:00
Matthew Taylor
4fa3c0f761
Merge pull request #1551 from mewtaylor/issue/gh-1540
...
Fix GH-1540: Direct studio activity link to the activity tab
2017-09-19 10:18:18 -04:00
Matthew Taylor
8c631b40d9
add unread
as a key/value on each message
...
This fixes #1545 by adding unread as a key/value on each message during the filtering process. This means the unread count is always applied to the list of full messages, and never to a subset (as was happening before to cause #1545 ).
2017-09-19 10:13:52 -04:00
Ray Schamp
5245123a4c
Merge pull request #1555 from rschamp/hotfix/qa-engineer
...
[Develop] Add QA Engineer posting
2017-09-18 14:16:19 -04:00
Ray Schamp
62ad6ff51f
Add QA Engineer posting
2017-09-18 11:48:01 -04:00
Vuton Design
20ce38e8d0
Update l10n.json
2017-09-16 09:30:34 +01:00
Linda
e119cea627
Fixes GH-1435/Reduce work for translators on credits page ( #1514 )
...
* Fixes GH-1435/Make as many names as possible on credits page non-translate
* fixed the travis error that occured before
2017-09-15 17:24:41 -04:00
Matthew Taylor
1335de9b57
Direct studio activity link to the activity tab
...
Fixes #1540 by ensuring that the anchor link for studio activity is directed to the activity tab of the studio
2017-09-15 15:49:57 -04:00
LiFaytheGoblin
aa8efd0bc9
fixed the travis errors that occured earlier
2017-09-15 14:34:21 +02:00
Florrie
14fd4e9a5b
Change CSS class .mod-studio-activity to .mod-forum-activity in forum post message row
2017-09-10 10:11:27 -03:00
Matthew Taylor
2a48f8a9a2
Merge pull request #1523 from LLK/release/messages-page
...
[Develop] Release: new notifications page
2017-09-09 01:07:59 -04:00
Matthew Taylor
026c035af3
adjust line-height for notifications
...
this applies to the comments only
2017-09-08 14:24:59 -04:00
Matthew Taylor
9e3823e6e7
add icons to social message notifications
2017-09-08 14:10:46 -04:00
Matthew Taylor
1dffc08445
change the way invites are assigned
...
assign invites directly to the state rather than by defaults in order to ensure empty objects can be part of an update
2017-09-08 10:24:39 -04:00
Matthew Taylor
b82d312dd8
make invite an array instead of an object
...
When trying to clear the invite, because invite is currently an object, it’s getting the state’s existing invite re-applied via `defaultsDeep`. Making it an array should solve this issue
2017-09-08 09:29:46 -04:00
LiFaytheGoblin
b5c44bae96
Fixes GH-1435/Make as many names as possible on credits page non-translate
2017-09-07 17:33:12 +02:00
Andrew Sliwinski
f3ee0443e8
Changed 'Animate a Name' educator guide link. Resolved GH-1509
2017-09-07 08:16:38 -04:00
Matthew Taylor
ce88466ee4
tweak formatting for message content
...
helps with comment formatting
2017-09-06 11:41:26 -04:00
Matthew Taylor
2bd9b184c5
Fix GH-[1505, 1507]: hide message counter on 0 ( #1510 )
...
* Hide messages counter when at 0
fixes #1507
* check for body before looking at success
fixes #1505
2017-09-06 10:05:14 -04:00
Matthew Taylor
b77e278927
handle logout on messages page ( #1503 )
...
Go back to redirecting to splash on logout, and empty messages page too.
2017-09-05 14:31:10 -04:00
Matthew Taylor
432a6240aa
have tab link go to curator tab
2017-09-05 12:38:16 -04:00
Matthew Taylor
b7f1f5e913
fix comment message handling
...
add comment message to redux to access the current user, and fix the string
2017-09-05 12:06:06 -04:00
Matthew Taylor
d7fe43fad7
fix commentee assignment
2017-09-05 11:41:56 -04:00
chrisgarrity
c7eabe18c3
Merge pull request #1483 from Petroochio/gh-1470-credits-overflow
...
Fix gh-1470 Firefox Overflow on Credits Page
2017-09-05 10:15:31 -04:00
Matthew Taylor
23c40c8f5e
if social messages less than 0, display 0
...
handles a caching edge case with admin messages.
2017-09-05 10:03:35 -04:00
Matthew Taylor
6493052725
Use username, not user id, for profile link
2017-09-05 09:10:41 -04:00
Matthew Taylor
71b93cb207
reduce unread count on successful admin message dismiss
2017-09-01 11:07:21 -04:00
Matthew Taylor
630ae5e462
fix formatting for numbers and for dismiss icon
...
fixes #1494
2017-09-01 11:05:29 -04:00
Matthew Taylor
654dafdaee
fix binding for admin message dismissal
...
based on https://stackoverflow.com/questions/39009611/react-bindthis-value-in-opposite-order-on-function-declaration
2017-09-01 10:00:20 -04:00
Matthew Taylor
6dbc4abdc5
subtract admin notifications from social count
...
fallout from #1487
2017-08-31 17:48:07 -04:00
Matthew Taylor
3dd768f2f6
GH-1361: Implement Notifications Page ( #1487 )
...
* start work on www page
committing out of paranoia.
including changing splash page endpoints
* updates from feedback
thanks @rschamp! This includes:
1. splitting out messages list into a separate component (for clarity)
2. some comment/formatting adjustments for the api calls
3. removal of an extraneous property in emoji-text
* remove duplicate string declaration
* use object.assign instead of defaults deep
we don’t need deep defaults
* fix react warnings
2017-08-31 17:05:22 -04:00
Matthew Taylor
a089b664da
Merge pull request #1491 from LLK/release/2.2.24
...
[Develop] Release 2.2.24
2017-08-31 13:41:15 -04:00
Matthew Taylor
38d79df894
Change header for download page
...
follow up from https://github.com/LLK/scratch-www/pull/1475#issuecomment-326034683
2017-08-30 12:58:08 -04:00
The_Grits
9942e91175
Add Tracy Tang ( #1489 )
2017-08-29 22:41:10 -04:00
Peter Gyory
59435d9ec6
Fix gh-1470 Firefox Overflow on Credits Page
...
Add specific style on credits page to allow for word wrap
2017-08-23 14:43:18 -06:00
Ken
a5cf7c60d6
Correct “WeDo” case
2017-08-23 10:49:25 +08:00
The_Grits
21210e1fa5
Re-Add Community Moderator ( #1480 )
2017-08-22 19:25:31 -04:00
Ken
0f1bd3df17
Update text for “learn more” links ( #1478 )
...
* Update text for “learn more” links
* Remove “Scratch” from string
2017-08-22 09:51:21 -04:00
St19_Galla
283572ed29
Fix gh-1472 & gh-1473: FAQ Updates ( #1475 )
...
* various updates
* adding 2.0
2017-08-21 18:55:56 -04:00
St19_Galla
ad25e09980
Add Ellen Daoust
2017-08-16 13:39:17 -04:00
Ken
6dc5bfa788
Update credits ( #1451 )
...
Fixes #1450
Thanks @Kenny2github
2017-08-09 08:36:48 -04:00
chrisgarrity
6743364447
Merge pull request #1446 from St19Galla/patch-5
...
Fix #1444 : Change Things to Try to Tips
2017-08-09 08:28:10 -04:00
St19_Galla
b087874859
Update landing.jsx
2017-08-02 23:43:44 -04:00
St19_Galla
3f0f4d23e7
Update landing.jsx
2017-08-02 23:42:17 -04:00
Matthew Taylor
b13c76e1ea
Merge pull request #1436 from TheGrits/patch-4
...
Fix gh-1433: Fix Gunicorn Link
2017-08-02 08:31:05 -04:00
Matthew Taylor
1cda176c9e
Merge pull request #1434 from LiFaytheGoblin/issue/gh-1432-Addition_to_Credits_Page
...
Added JT Galla to the Credits Page under 'Aknowledgements'
2017-07-31 15:15:33 -04:00
Ray Schamp
3e371f5511
Merge branch 'develop' into jobs
2017-07-31 15:15:05 -04:00
Ray Schamp
e369a439e3
Add Senior Backend Engineer job posting
2017-07-31 14:47:56 -04:00
Matthew Taylor
fcb635b5a9
Merge pull request #1443 from St19Galla/patch-4
...
Fix gh-1442: Remove Moderator Position
2017-07-31 14:16:05 -04:00
St19_Galla
c472699dbe
Update landing.jsx
2017-07-31 11:22:24 -04:00
Matthew Taylor
5bd66cd628
Merge pull request #1439 from TheGrits/patch-5
...
Fix gh-1438: Update Community Guidelines
2017-07-28 15:35:24 -04:00
Matthew Taylor
d285cb08d7
Merge pull request #1443 from St19Galla/patch-4
...
Fix gh-1442: Remove Moderator Position
2017-07-28 14:00:13 -04:00
St19_Galla
dd9386b8e8
TTT -> Tips
2017-07-28 13:49:41 -04:00
St19_Galla
2cf2e7e951
Remove Moderator Position
2017-07-27 11:30:39 -04:00
The_Grits
d8a62719cb
Update Community Guidelines
2017-07-26 14:49:17 -04:00
The_Grits
487fd1b47a
Fix Gunicorn Link
2017-07-25 20:38:03 -04:00
LiFaytheGoblin
f9a9130351
Added JT Galla to the Credits Page under 'Aknowledgements'
2017-07-25 22:11:05 +02:00
Matthew Taylor
e2a596ea9d
Squashed commit of the following:
...
commit b8a05d9624
Author: Matthew Taylor <mewtaylor@gmail.com>
Date: Fri Jul 21 12:06:06 2017 -0400
only change style for links on page
otherwise, the footer links were getting the new styling
commit 34a3b8b49b
Author: St19_Galla <fcbdsp@gmail.com>
Date: Thu Jul 20 22:28:03 2017 -0400
Update l10n.json
commit 9c8241b92c
Merge: 3f90e98
bca79e6
Author: Matthew Taylor <mewtaylor@gmail.com>
Date: Thu Jul 20 16:36:32 2017 -0400
Merge pull request #1423 from mewtaylor/hotfix/camp-page
Hotfix Scratch Camp 2017 Page
commit bca79e652a
Author: St19_Galla <fcbdsp@gmail.com>
Date: Wed Jul 19 15:42:16 2017 -0400
Update l10n.json (#1421 )
commit 4a9418d49c
Author: St19_Galla <fcbdsp@gmail.com>
Date: Wed Jul 19 11:48:29 2017 -0400
Down Deep - Scratch Camp 2017 Page (#1409 )
* Add files via upload
* Create downdeep.jsx
* Delete downdeep.jsx
* Delete downdeep.scss
* Delete l10n.json
* Delete downdeep.jsx
* Create dd.jsx
* Rename dd.jsx to filler.jsx
* Add files via upload
* Delete dd.jsx
* Delete filler.jsx
* Create filler.jsx
* Add files via upload
* Delete filler.jsx
* Update routes.json
* whoops
* travis
* Update downdeep.jsx
* Update downdeep.scss
* Update downdeep.scss
* Update _colors.scss
* what i get for rushing
* Update downdeep.jsx
* Update l10n.json
* thisandagain's changes
* Carl's Changes
* carl's changes
* carl's changes
* Update downdeep.jsx
* Rename downdeep.jsx to camp.jsx
* Rename downdeep.scss to camp.scss
* Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx
* Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss
* Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json
* Update camp.jsx
* Add files via upload
* Update camp.jsx
* Update camp.scss
* Update l10n.json
* Create filler
* Add files via upload
* Delete bubbles.svg
* Delete dolphin.svg
* Delete fish-divider.svg
* Delete fish-divider2.svg
* Delete map.svg
* Delete ocean-bottom.svg
* Delete ocean-top.svg
* Delete treasure.svg
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update camp.jsx
* whoops
* Update camp.scss
* Update l10n.json
* Update camp.scss
* Update camp.jsx
* Update _colors.scss
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update _colors.scss
* Update camp.scss
* Update camp.scss
commit 3f90e98593
Merge: c8afebf
84a37a6
Author: Ray Schamp <rschamp@users.noreply.github.com>
Date: Thu Jul 13 16:32:51 2017 -0400
Merge pull request #1413 from rschamp/hotfix/rip-smartystreets
[Master] Remove SmartyStreets API
2017-07-21 12:10:48 -04:00
Matthew Taylor
e264a1d2c9
Merge pull request #1426 from St19Galla/patch-2
...
Fix gh-1425 // Camp Page Typo
2017-07-21 12:02:11 -04:00
St19_Galla
110e47f1d2
Update l10n.json
2017-07-20 22:28:03 -04:00
Matthew Taylor
d0e7c29b5f
key api calls on username
check
...
`this.props.user` will now return `true` because there is a default user object that’s empty. So, instead, wait for an actual user object
2017-07-20 15:01:36 -04:00
Matthew Taylor
cb4ca51061
Add new carousel component
...
1. Moves carousel to `LegacyCarousel` since it currently is designed to handle JSON from proxy endpoints
2. Add separate `Carousel` endpoint to handle data from project models in scratch’s new api, the standard moving forward.
2017-07-20 13:47:14 -04:00
Matthew Taylor
7d9b6fc5d8
Merge pull request #1415 from St19Galla/patch-2
...
Fix gh-1410: Correct "Tips" Page Link
2017-07-20 07:40:59 -04:00
Matthew Taylor
36583f0d04
Merge pull request #1416 from mewtaylor/issue/custom-rows-api
...
Move custom homepage row to new api endpoints
2017-07-19 17:19:27 -04:00
St19_Galla
9f47d504ec
Update l10n.json ( #1421 )
2017-07-19 15:42:16 -04:00
St19_Galla
43b8f0b38f
Down Deep - Scratch Camp 2017 Page ( #1409 )
...
* Add files via upload
* Create downdeep.jsx
* Delete downdeep.jsx
* Delete downdeep.scss
* Delete l10n.json
* Delete downdeep.jsx
* Create dd.jsx
* Rename dd.jsx to filler.jsx
* Add files via upload
* Delete dd.jsx
* Delete filler.jsx
* Create filler.jsx
* Add files via upload
* Delete filler.jsx
* Update routes.json
* whoops
* travis
* Update downdeep.jsx
* Update downdeep.scss
* Update downdeep.scss
* Update _colors.scss
* what i get for rushing
* Update downdeep.jsx
* Update l10n.json
* thisandagain's changes
* Carl's Changes
* carl's changes
* carl's changes
* Update downdeep.jsx
* Rename downdeep.jsx to camp.jsx
* Rename downdeep.scss to camp.scss
* Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx
* Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss
* Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json
* Update camp.jsx
* Add files via upload
* Update camp.jsx
* Update camp.scss
* Update l10n.json
* Create filler
* Add files via upload
* Delete bubbles.svg
* Delete dolphin.svg
* Delete fish-divider.svg
* Delete fish-divider2.svg
* Delete map.svg
* Delete ocean-bottom.svg
* Delete ocean-top.svg
* Delete treasure.svg
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update camp.jsx
* whoops
* Update camp.scss
* Update l10n.json
* Update camp.scss
* Update camp.jsx
* Update _colors.scss
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update _colors.scss
* Update camp.scss
* Update camp.scss
2017-07-19 11:48:29 -04:00
Matthew Taylor
36dc8283b8
move projects loved by following to new api endpoint
2017-07-19 11:25:39 -04:00
Matthew Taylor
753a3e1eed
Split splash into container/presentation component
...
This does a bit of upkeep based on recs from @rschamp that:
1. Splits splash into container/presentation components
2. Updates the default project count to 20 million
3. makes the api calls that get info from the api take in arguments rather than use the session
4. Updates `MapStateToProps` to be more specific in what it uses beyond just `session` and `permissions`
Thanks @rschamp!
2017-07-17 12:19:49 -04:00
Matthew Taylor
8c94a04e77
Move custom homepage row to new api endpoints
...
This goes along with https://github.com/LLK/scratch-api/pull/292 . This can be updated if we choose to migrate the `lovedByFollowing` endpoint off of proxy as well.
2017-07-13 15:35:18 -04:00
St19_Galla
093d8f4eb3
Update tips.jsx
2017-07-13 12:48:18 -04:00
Ray Schamp
02b36ab9f3
Merge pull request #1414 from rschamp/hotfix/rip-smartystreets
...
[Develop] Remove SmartyStreets API
2017-07-13 10:52:58 -04:00
Ray Schamp
84a37a671f
Remove SmartyStreets API
...
We are so lax with this that it's not actually helping us, and we don't have a plan with them anymore.
2017-07-13 10:44:50 -04:00
Matthew Taylor
03785b78f6
Merge pull request #1406 from TheGrits/patch-3
...
Fix gh-1382: Centre Align Note
2017-07-13 10:38:04 -04:00
The_Grits
6533b5b50a
Misplaced Periods Fix
2017-07-10 19:49:13 -04:00
The_Grits
c5f6619947
Fix gh-1382: Centre Align Note
2017-07-07 20:17:03 -04:00
Andrew Sliwinski
d705272341
Merge pull request #1402 from TheGrits/patch-3
...
Fix gh-1397: Update Supporting Organizations
2017-07-07 19:45:28 -04:00
The_Grits
a9ba27ef97
Fix gh-1404: Add Junior Designer
2017-07-07 19:34:55 -04:00
The_Grits
a3714e5348
Add transifex remove pootle
2017-07-06 23:06:23 -04:00
chrisgarrity
24bfc18487
Add missing closing tag for PDF Guide
2017-07-05 13:42:20 -04:00
Matthew Taylor
7a44be5e5b
Merge pull request #1389 from TheGrits/patch-3
...
Fix gh-1388: Help -> Tips on FAQ Page
2017-06-29 09:58:17 -04:00
The_Grits
5570632ed3
Help -> Tips
2017-06-28 16:54:42 -04:00
chrisgarrity
f7345c443d
Fix blocks icon for windows
...
Note for future reference - set the size for SVGs with height not width if using rem.
IE on Windows 7 doesn’t resize correctly if the width is set with rem. Height works with rem, and exact pixel width works, but that should be avoided.
2017-06-28 09:32:08 -04:00
chrisgarrity
a712a8d28a
Fix typo in tutorial URL ( #1377 )
...
Getting started tutorial link started with `//` instead of just `/`., and typo in downloading
2017-06-27 16:33:57 -04:00
chrisgarrity
022d2dd506
FIx layout problems ( #1380 )
...
* removed white-space: no wrap to let buttons flow in Cards section
* Fix download link (download should be part of the link)
* Set the size of the icons to fix alignment
2017-06-27 16:27:07 -04:00
Andrew Sliwinski
a16a189a7f
Update compatibility requirements to clarify support for ChromeOS
2017-06-26 09:42:56 -04:00
Matthew Taylor
dbb4fcc8a2
tweak some styling for the download page
...
Adds the numbers back in above the download steps, and also moves the “note for mac users” down into a callout.
2017-06-23 09:23:24 -04:00
chrisgarrity
74e315dc71
Add new Tips page ( #1357 )
...
New of tips page, uses cards from new resources server (s3)
* added get-localized-urls script to get the generated json from the s3 bucket
* added /tips route
* correct localized-urls for other pages
* remove thingstotry
* redirect /go
* fix up /info/cards view to use resources (s3).
* redirect /go to /tips
* change /hoc redirect from /go to /tips
* Add full set of cards pdf download to tips localization
* removed cards and guides from static PDFs, they are all coming from resources.scratch.mit.edu now.
* removed things to try view
Corrections for reviews:
* decided to pretty print the localized URLs
* replaced console.errors with process.stdout and fail with exit(1)
* formatted localized-urls to make it easier to read
* moved link outside `<Button…` makes whole button clickable instead of just text
* fixed up css styles, removed unnecessary classes
* corrected “unused” resource links
2017-06-21 16:20:18 -04:00
Matthew Taylor
c1ea4730c3
use $ui-gray
instead
2017-06-19 11:41:44 -04:00
Matthew Taylor
4342ef36a3
Have behavior for default/error on version check
...
This keeps the version field empty, as well as the links, until it gets a response from the `version.xml` request. It then displays an error message if there was an error trying to get the version.
2017-06-19 11:36:33 -04:00
Matthew Taylor
49a52b634c
add background gray for installation process
2017-06-19 11:35:15 -04:00
Matthew Taylor
cf863fb3d3
point links at /download
2017-06-16 10:14:01 -04:00
Matthew Taylor
6e3c255fa7
Make version dependent on xml call
...
Fixes #1351 by including a call to `version.xml` to get the most up-to-date offline build version, defaulting to the current version, `456.0.3`. This also fixes #1352 by switching the route to `/download`, with a redirect from `/scratch2download/`
2017-06-16 10:11:58 -04:00
Matthew Taylor
348fd2d860
Merge pull request #1258 from TheGrits/patch-3
...
Fix gh-1254: Migrate Download Page
2017-06-13 17:06:21 -04:00
The_Grits
5ed33945ff
Centre align
2017-06-13 16:58:01 -04:00
Matthew Taylor
6ace6926c0
Merge pull request #1347 from LiFaytheGoblin/fix_issue/gh_1331_add_mark_ferrell_to_credits_page
...
Fix issue/gh-1331: added mark ferrell to credits page
2017-06-13 16:22:54 -04:00
The_Grits
dd655df674
Fix gh-1343: Update Credits Page ( #1346 )
...
* Remove Christina Huang
* Add Christina Huang to Previous Members
2017-06-12 09:22:58 -04:00
LiFaytheGoblin
acfb5d71ac
added mark ferrell to credits page (issue 1331)
2017-06-11 12:57:26 +02:00
Matthew Taylor
69176fb572
Revert "[Develop] Revert PR #1324 "
2017-06-08 15:31:09 -04:00
The_Grits
e0ab9f4f03
Remove width from download page
2017-06-06 19:43:01 -04:00
Ray Schamp
e4ba1061b9
Revert "Merge pull request #1324 from mewtaylor/issue/api-250"
...
This reverts commit 949a166c0f
, reversing
changes made to 56b46fd861
.
2017-06-02 14:12:54 -04:00
The_Grits
c29dde59a1
Update download.scss
2017-06-02 08:13:29 -04:00
The_Grits
8b39259ce5
Thanks Travis
...
(and St19Galla)
2017-05-24 23:48:37 -04:00
The_Grits
15d393a9e2
Update Styling of Download Page
2017-05-24 20:19:49 -04:00
Matthew Taylor
949a166c0f
Merge pull request #1324 from mewtaylor/issue/api-250
...
For api-250: Change explore endpoint
2017-05-24 14:03:36 -04:00
Matthew Taylor
373c7784c6
Change conference date
...
Fixes #1322
2017-05-24 08:42:25 -04:00
Matthew Taylor
1a83b34387
Change explore endpoint
...
For scratch-api#250
2017-05-22 15:41:28 -04:00
The_Grits
d740eb586f
Lint fix download page
2017-05-22 11:58:55 -04:00
The_Grits
fadf0a3346
Download Page Restyle
2017-05-20 00:24:18 -04:00
Andrew Sliwinski
afe134a898
Merge pull request #1309 from thisandagain/hotfix/cm
...
[Develop] Hotfix - Remove "Trust & Safety Manager" role from jobs page
2017-05-15 11:37:38 -04:00
Matthew Taylor
5b3341673f
Merge pull request #1312 from mewtaylor/hotfix/revert-birthday-banner
...
[Develop] Hotfix: Remove 10th anniversary banner
2017-05-15 11:23:41 -04:00
Matthew Taylor
ae53dcd746
Remove 10th banner
2017-05-15 11:08:15 -04:00
Andrew Sliwinski
042ae48408
Remove 'Trust & Safety Manager' role from jobs page
2017-05-14 12:52:53 -04:00
The_Grits
f901d3b429
Restyle the Download Page
2017-05-03 16:19:56 -04:00
Andrew Sliwinski
52b6ed9eb8
Merge pull request #1271 from TheGrits/patch-5
...
Fix gh-875: Double Search Bar
2017-05-03 14:37:02 -04:00
Matthew Taylor
b1e33a2933
Merge pull request #1299 from TheGrits/patch-9
...
Fix gh-1294: Unlocalize Browser Links
2017-05-03 14:33:50 -04:00
Matthew Taylor
787040b972
Merge pull request #1297 from TheGrits/patch-8
...
Fix gh-1296: Add DD Liu to Credits Page
2017-05-03 11:48:01 -04:00
Ray Schamp
ed2cd81a7a
Merge pull request #1300 from St19Galla/patch-1
...
Fix gh-1282 ~ Add "United States" to faq/educators page
2017-05-02 18:15:34 -04:00
St19_Galla
f82d5f8341
add US to educators
2017-05-02 15:34:57 -04:00
St19_Galla
5083614f48
add US to faq
2017-05-02 15:33:31 -04:00
The_Grits
a837c05ac7
Remove localized Microsoft links
2017-05-02 15:29:00 -04:00
The_Grits
5822b2facb
Update Firefox Link
2017-05-02 13:38:00 -04:00
The_Grits
0a747f68bd
Add DD Liu
...
Resolves #1296
2017-05-01 11:24:55 -04:00
Matthew Taylor
00b80b40f3
Merge pull request #1295 from mewtaylor/issue/r2-4586
...
Implement r2-4586: Add anniversary banner
2017-05-01 07:35:31 -04:00
Matthew Taylor
d6f8b2fa9e
add card tutorial redirect
2017-04-28 13:43:18 -04:00
Matthew Taylor
a950c91725
Add studio link
2017-04-28 09:09:06 -04:00
Matthew Taylor
fc075aedaf
Add anniversary banner
2017-04-28 08:51:40 -04:00
Matthew Taylor
aef7b5e834
Merge pull request #1291 from LLK/release/2.2.20
...
[Master] Release 2.2.20
2017-04-26 22:20:07 -04:00
Matthew Taylor
76c46be17b
Merge pull request #1269 from mewtaylor/issue/r2-4470
...
Fix R2-4470: Only allows birthdays >= 13 yrs old for teacher reg
2017-04-19 16:41:09 -04:00
Matthew Taylor
f2e4858868
Revert "[Master] Temp Hotfix: remove custom rows"
2017-04-18 06:36:39 -04:00
Matthew Taylor
6b513f82e0
Merge pull request #1268 from mewtaylor/issue/gh-1265
...
[Develop] Hotfix GH-1265: Update jobs route to include moderator
2017-04-14 14:20:20 -04:00
Matthew Taylor
cd3fb9245a
Only apply offset to teachers
...
thanks @chrisgarrity!
2017-04-14 14:18:32 -04:00
The_Grits
5cc8911b04
Thanks Travis
2017-04-14 11:13:46 -04:00
The_Grits
d7e63aadee
Fix gh-875: Double Search Bar
2017-04-14 10:08:17 -04:00
Matthew Taylor
cb7ce8c71d
update language for age validation
...
thanks @TheGrits!
2017-04-13 07:41:47 -04:00
Matthew Taylor
2c472b607a
Only allows birthdays > 13 yrs old for teacher reg
...
Helps fix https://github.com/LLK/scratchr2/issues/4470 from the UX side of things
2017-04-12 17:41:43 -04:00
Matthew Taylor
12e87df7c3
Merge pull request #1257 from TheGrits/patch-4
...
Nit-picky Developer Class Type
2017-04-11 12:58:09 -04:00
Matthew Taylor
5ca5c149f3
temporarily remove custom homepage rows
...
redis emptied when mc1 restarted, so this is all going to mysql at the moment
2017-04-11 09:27:19 -04:00
The_Grits
6dbf66d59d
Patches and Styling
2017-04-06 10:40:46 -04:00
Matthew Taylor
b2e827f752
Merge pull request #1260 from mewtaylor/release/april-fools-rollback
...
[Develop] Hotfix: Revert those changes we did last week
2017-04-03 14:51:29 -04:00
Matthew Taylor
9affc8441c
Revert "Merge pull request #1255 from LLK/release/branch"
...
This reverts commit c36bde2c30
, reversing
changes made to becae19f6f
.
2017-04-03 14:32:38 -04:00
The_Grits
94dec64045
Thanks Travis
...
Gotta love missing semicolons
2017-04-01 13:06:45 -04:00
The_Grits
68d10ffe32
Patch 3 wip ( #30 )
2017-04-01 10:55:47 -04:00
The_Grits
6255f989b0
Nit-picky Developer Class Type
...
Just noticed that the type on this page was copied over from the About page. Non-blocking issue, just me being nit-picky.
2017-04-01 10:06:40 -04:00
The_Grits
0f87a65622
importy
2017-03-31 19:35:33 -04:00
Matthew Taylor
d8ef3110e2
don’t apply to top banners
2017-03-31 10:26:56 -04:00
Matthew Taylor
0e645ce954
Reset banner on new login
2017-03-31 10:00:40 -04:00
Matthew Taylor
d66e11fced
Banner updates
2017-03-31 09:02:54 -04:00
Matthew Taylor
3a299e06f7
Merge pull request #1240 from TheGrits/patch-3
...
Fix gh-1239: Update Conference Dates
2017-03-22 08:32:54 -04:00
Matthew Taylor
e9f7748fdf
Merge pull request #1243 from TheGrits/patch-4
...
Fix gh-1242: Update Credits Page
2017-03-16 11:57:11 -04:00
Matthew Taylor
0bb60700ba
Merge pull request #1244 from mewtaylor/issue/opt-in
...
[Develop] Hotfix: re-add checkbox to opt-in to email list for teacher
2017-03-15 10:15:16 -04:00
Matthew Taylor
63c6bf59f2
Merge pull request #1149 from mewtaylor/issue/r2-4092
...
For R2-4092: Add checkbox to opt-in to teacher emails
2017-03-15 10:08:35 -04:00
The_Grits
c45663e966
Add Juanita Buitrago to Previous Members
2017-03-13 17:09:08 -04:00
The_Grits
f1880e47d5
Remove Juanita Buitrago
2017-03-13 17:08:39 -04:00
The_Grits
7e9a6ef410
Add, remove, and resort! (2)
2017-03-13 16:17:12 -04:00
The_Grits
b5cebffe11
Add, remove, resort!
2017-03-13 16:06:37 -04:00
The_Grits
715b05fbdf
whoops
...
12th not 15th
2017-03-08 18:20:28 -05:00
The_Grits
1794b30079
Update dates
...
Costa Rica dates were updated, plus fixed a gotcha with the China dates
2017-03-08 18:18:22 -05:00
The_Grits
46a3cea40c
Fix gh-1234: Update China Conference
2017-03-02 22:14:26 -05:00
Matthew Taylor
a170aec6d2
Merge pull request #1220 from TheGrits/patch-4
...
Fix gh-1218: Community Moderator Page
2017-02-28 09:38:44 -05:00
The_Grits
c26e42f715
Change parenthesis
2017-02-28 09:34:20 -05:00
Matthew Taylor
184947d3d9
Merge pull request #1215 from TheGrits/patch-3
...
Fix gh-1214: Lowercase F in Family
2017-02-24 13:40:53 -05:00
The_Grits
1ac7cd4b79
Bump Path
2017-02-23 12:29:23 -05:00
The_Grits
5eed0fe430
Remove sharing links
2017-02-23 12:14:40 -05:00
The_Grits
90aaf6140f
Remove Back-End Engineer
2017-02-23 11:54:38 -05:00
The_Grits
9a11c04cd2
Add Community Moderator Page
2017-02-23 11:53:29 -05:00
The_Grits
39ceaa2f33
Add Community Moderator
2017-02-23 11:12:18 -05:00
Matthew Taylor
f59774bd0d
Don’t localize an empty string
2017-02-23 09:52:33 -05:00
Matthew Taylor
7a2e7cc949
Some additional tweaks for conference 2017
...
1. Updates svgs for formatting
2. Makes the font size of the title smaller
Fixes #1211 , 5-6 in #1206
2017-02-23 09:39:57 -05:00
The_Grits
4f2768e7f2
Lowercase F in Family
...
Fixes #1214
2017-02-22 21:28:15 -05:00
Matthew Taylor
e13fa6dc4b
add height to svg
...
needed by ie11 to render correctly. fixes #1208
2017-02-22 16:37:57 -05:00
The_Grits
f7d9086296
credits typo
...
Should fix #1201
2017-02-22 11:14:32 -05:00
The_Grits
e0a81c50c3
Lowercase P
...
Should fix #1202
2017-02-22 11:14:26 -05:00
Matthew Taylor
98c163ecb1
Merge pull request #1204 from TheGrits/patch-3
...
Fix gh-1201: credits localization typo
2017-02-22 11:03:20 -05:00
The_Grits
40e2bf8500
credits typo
...
Should fix #1201
2017-02-22 10:57:37 -05:00
The_Grits
d4f840b99d
Lowercase P
...
Should fix #1202
2017-02-22 10:54:50 -05:00
Matthew Taylor
1b0de13d63
Merge pull request #1192 from mewtaylor/issue/conference-fixes
...
Bugfix: Some copy fixes for new conference page
2017-02-22 09:25:56 -05:00
Matthew Taylor
b139f0a606
Additional conference fixes
...
1. border on flags
2. `Conferences` in nav
3. mailto for costa rica
2017-02-22 08:03:16 -05:00
Ray Schamp
6019726453
Fix argument name
...
Thanks @mewtaylor!
2017-02-21 09:42:34 -05:00
Matthew Taylor
4cf3b890fd
Update ordering and text size for “Learn More”
2017-02-21 08:37:05 -05:00
Ray Schamp
405763246d
Wait for the search term before searching
...
Fixes #1189
2017-02-20 11:08:36 -05:00
Ray Schamp
0313346fed
Encode term from search view's search bar
...
Same fix as #1175 , but for the form on the search page.
2017-02-20 11:08:05 -05:00
Matthew Taylor
674270483d
Fix title for conference in China
...
Also add 2017 to date
2017-02-17 17:28:51 -05:00
Matthew Taylor
9669527eb8
Some copy fixes for new conference page
...
Thanks @kaschm!
2017-02-17 11:46:27 -05:00
Matthew Taylor
509d8e84d7
Add new icons
...
and format accordingly
2017-02-16 16:58:27 -05:00
Matthew Taylor
4e65e34275
Merge pull request #1184 from mewtaylor/issue/gh-1086
...
Conference 2017: add new landing page, and archive old site
2017-02-16 07:56:21 -05:00
chrisgarrity
3b4a07c7b8
Adding Fashion and Story activities to Things to Try ( #1176 )
...
Added Fashion and Story activities between Hide and Pong.
Updated description text.
Note that Cards and Guide locations were already included in l10n-static.json
2017-02-15 23:21:27 -05:00
Matthew Taylor
ff1410ee6f
Merge pull request #1180 from TheGrits/patch-4
...
Fix gh-1178: 24 hours => one day
2017-02-15 14:33:57 -05:00
Matthew Taylor
00ba8b2b2a
Merge pull request #1148 from TheGrits/patch-5
...
Fix gh-959: Localize Credits Page
2017-02-15 14:29:40 -05:00
Matthew Taylor
c1a474fe8b
Remove name after feedback
2017-02-15 10:51:13 -05:00
Matthew Taylor
8b772737a3
Add 2017 conference site
2017-02-15 08:35:10 -05:00
Matthew Taylor
67a39e4870
Archive 2016 site
...
move to a subfolder, do some css shuffling and add some trello style guide stylings to help scope for also adding 2017
2017-02-15 08:34:46 -05:00
The_Grits
7f148f1a47
Remove MIT Scratch Team from Localization
2017-02-14 14:01:54 -05:00
The_Grits
574e2134da
24 hours => one day
2017-02-14 13:36:39 -05:00
Ray Schamp
c8a7d3cdc7
Clean up usage of Redux for searchTerm
...
Now that the search term is encoded, we need to be sure both the search fields get a decoded string. Parse, decode and set this string via Redux in componentDidMount, and use it in both places.
2017-02-10 18:54:20 -05:00
The_Grits
1d47e0ef6a
Add Organizations Back In
2017-02-08 09:12:14 -05:00
Matthew Taylor
9255185716
Merge pull request #1164 from LLK/release/2.2.17
...
[Develop] Release 2.2.17
2017-02-08 08:37:42 -05:00
Matthew Taylor
8878726084
Merge pull request #1010 from TheGrits/patch-2
...
Fix gh-1009: Add Tutorials Button
2017-02-06 09:51:53 -05:00
The_Grits
e42cf6f25b
Fix FormattedHTMLMessage
2017-02-01 09:41:19 -05:00
Matthew Taylor
ca0985571e
Revert "Merge pull request #1149 from mewtaylor/issue/r2-4092"
...
This reverts commit 8e82398255
, reversing
changes made to e1a0e9fece
.
2017-01-31 11:38:50 -05:00
The_Grits
79639cb454
Change Search Term and Add "Tutorials" String
2017-01-26 10:10:49 -05:00
The_Grits
4fa2d24601
Add join section
2017-01-23 07:38:58 -05:00
The_Grits
6bc8dc5947
Update l10n.json
2017-01-23 07:34:28 -05:00
Matthew Taylor
8e82398255
Merge pull request #1149 from mewtaylor/issue/r2-4092
...
For R2-4092: Add checkbox to opt-in to teacher emails
2017-01-19 18:37:11 -05:00
chrisgarrity
e1a0e9fece
Fix GH 1102: Don’t allow duplicate strings in a single l10n file ( #1150 )
...
* Don’t allow duplicate strings in a single l10n file
Added check_duplicate_strings to test for duplicates in a single file.
removed duplicates - tried to keep the more generic ‘key’
* revised test case for safer file reads
2017-01-19 18:23:56 -05:00
Matthew Taylor
4c6522ff9d
Merge pull request #1132 from TheGrits/patch-3
...
Fix gh-1130: Update Flash Link
2017-01-19 10:42:14 -05:00
Matthew Taylor
313f267cfe
Add checkbox to opt-in to teacher emails
2017-01-17 15:57:15 -05:00
The_Grits
3f4e40ef5c
Localize Credits Page
2017-01-14 00:38:16 -05:00
The_Grits
4eb3287c0e
FormattedMessage and FormattedHTMLMessage
2017-01-13 23:46:26 -05:00
chrisgarrity
0b857892d2
Merge pull request #1137 from chrisgarrity/issue/gh1113-tttwording
...
Update wording of Animate a Name TTT
2017-01-04 08:55:17 -05:00
morantsur
e763f8a9bf
Merge pull request #1095 from morantsur/microworlds_projects
...
Add a microworlds homepage, and point microworlds pages at the new microworlds projects.
2016-12-22 12:36:03 -05:00
chrisgarrity
1ba27684c8
Update wording of Animate a Name TTT
...
Don’t encourage scratchers to share personal info
2016-12-21 14:37:33 -05:00
The_Grits
4595377ed8
Remove spaces from other strings
2016-12-21 14:23:17 -05:00
morantsur
0df1eec3e0
Merge pull request #1122 from morantsur/fix_fashion
...
Fix #1118 - broken link to fashion microworld video
2016-12-21 12:13:05 -05:00
morant
66f8ee201f
Remove bannerUrl, as it’s only used in the modal.
2016-12-21 12:06:48 -05:00
The_Grits
66c9e14c15
Remove spaces
2016-12-21 11:18:29 -05:00
morantsur
e95caef368
Merge branch 'develop' into microworlds_projects
2016-12-20 13:02:46 -05:00
morant
012321721c
Remove isRequired from description and onGuideClick, and fix naming on l10n strings.
2016-12-20 12:58:16 -05:00
morant
485d3903e0
- Fix routes
...
- move functions to inline rendering in ttt-tile and mw homepage
2016-12-20 12:06:58 -05:00
Matthew Taylor
dbee423814
Update bulk account creation faq string
...
/cc @kaschm
2016-12-20 09:07:16 -05:00
The_Grits
5cc8b2c124
Update Flash Link
...
As per #1130
2016-12-20 00:27:37 -05:00
Matthew Taylor
967b2beb42
Update bulk creation faq content
2016-12-19 17:50:45 -05:00
Ray Schamp
afe63af707
Provide intl to TeacherRegistration
2016-12-19 17:02:03 -05:00
Ray Schamp
c901675b41
Allow empty response, again
...
Missed in #1128 , this fixes the rest of the handler to not expect a body from the request. Fixes #1124 again.
2016-12-19 15:41:32 -05:00
Ray Schamp
3b396019ab
Allow empty responses
...
Fixes #1124 by not assuming there is any body associated with the response. That we don't send one is news to me, but we should cover this possibility in any case.
2016-12-19 13:43:33 -05:00
morant
647bc74ec3
Fix #1118 - broken link to fashion microworld video
2016-12-16 14:03:51 -05:00
morant
7bbb498a4f
- Stop using ttt cscc files, and remove all references to ttt that are not needed.
...
- Update translation strings that are specific to microworlds to have microworlds as prefix.
- Address other comments
2016-12-16 12:18:16 -05:00
morant
e3025ea3e9
Added a microworlds homepage, based on the ttt page, at /microworlds/go.
...
Changed ttt-tile to only show “see guides…” if they exist.
2016-12-15 16:59:48 -05:00
Matthew Taylor
3c3f1c2f8f
Remove HOC Banner
...
Reverts #1073
2016-12-15 15:58:29 -05:00
Ray Schamp
64ceb2ae56
Provide fallback error messages
...
In case the response does not supply `msg` or `errors`, provide a default. If `registrationError(s)` is empty, we do not show the error card, which causes "silent" failures.
2016-12-13 12:12:23 -05:00
Matthew Taylor
cbd983baf8
Merge pull request #932 from TheGrits/patch-3
...
Fix gh-678: Retain Search Term
2016-12-12 22:52:38 -05:00
The_Grits
0b2c1fff1a
Squish
2016-12-12 16:01:06 -05:00
Matthew Taylor
9ae4e5a963
Move validationRequired
into general
...
thanks @rschamp!
2016-12-07 17:24:48 -05:00
Matthew Taylor
16d638672e
Merge pull request #1012 from jwzimmer/issue/gh-942-clarify-compatibility-FAQ
...
Fix gh-942: update compatibility & support FAQ response
2016-12-05 09:54:28 -05:00
Matthew Taylor
48865c279f
Merge pull request #1000 from TheGrits/patch-5
...
Fix gh-997: Update General and Teacher FAQs
2016-12-05 09:53:39 -05:00
Matthew Taylor
6309c30667
Merge branch 'release/hoc-nov-21' of https://github.com/LLK/scratch-www into develop
...
* 'release/hoc-nov-21' of https://github.com/LLK/scratch-www :
Match tutorial ordering to ttt top row
Turn off related videos in embed
Move margin to flex-row element
Add finalized video
Add event row text
Add temporary video for testing
Add windows device manager url
Add `ignoreUrls` to max-len lint rules
switch to column in tablet
Add hoc event row
Update wedo2 text for new Windows deploy
Add “open” string to l10n.json
Add link to TTT page to educators page
Add hoc banner
Move padding to splash element
trello-ize title banner h1,p styling
# Conflicts:
# src/views/explore/explore.jsx
# src/views/search/search.jsx
2016-12-02 10:55:38 -05:00
morant
a17ec2f72c
Point microworlds pages at the new microworlds projects (created by the Scratch user “microworlds”
2016-12-01 22:21:29 -05:00
Matthew Taylor
eef7135a6d
Match tutorial ordering to ttt top row
...
Forgot to do this, sorry.
2016-12-01 08:35:44 -05:00
Matthew Taylor
010ed3c530
Merge pull request #1080 from mewtaylor/issue/gh-930
...
Fix GH-930: Update wedo2 text for new Windows deploy
2016-11-30 09:24:26 -05:00
Matthew Taylor
55a73241d4
Merge pull request #1091 from mewtaylor/issue/hoc-event-row-tweaks
...
Turn off related videos in event row embed
2016-11-30 09:21:13 -05:00
Matthew Taylor
e9d6b58d5e
Turn off related videos in embed
...
See https://github.com/LLK/scratch-www/pull/1081#issuecomment-263746724 . Also adjusts padding to accommodate https://github.com/LLK/scratch-www/pull/1081#issuecomment-263747658 .
2016-11-30 08:33:15 -05:00
Matthew Taylor
435021658b
Move margin to flex-row element
...
so that the header elements are evently aligned vertically. fixes #1089
2016-11-30 08:28:05 -05:00
Matthew Taylor
f84df573a3
Add finalized video
...
but – let the record show: Who has two thumbs and is a Hufflepuff? I’M A HUFFLEPUFF!
2016-11-29 17:40:40 -05:00
Matthew Taylor
d63dcb19fd
Add event row text
...
somehow this got lost from the PR, not sure how.
2016-11-29 16:59:52 -05:00
Matthew Taylor
eb21456b51
Merge pull request #1081 from mewtaylor/feature/gh-982
...
Implement GH-982: Add hoc event row
2016-11-29 16:42:31 -05:00
Matthew Taylor
7e167cc441
Add temporary video for testing
2016-11-29 16:37:42 -05:00
Matthew Taylor
f2cd0d3777
Add windows device manager url
2016-11-29 15:13:16 -05:00
Matthew Taylor
971c520f83
switch to column in tablet
...
since that’s whats in the specs, and it handles centering with `align-items`. Fixes #1083
2016-11-29 12:49:26 -05:00
Matthew Taylor
2daa882331
Add hoc event row
...
still missing the video for content, otherwise should be good to go
2016-11-29 11:13:00 -05:00
Matthew Taylor
14fcef7478
Update wedo2 text for new Windows deploy
...
Fixes #930
2016-11-29 10:06:30 -05:00
Matthew Taylor
636c27bdcb
Add “open” string to l10n.json
...
Fixes #1078 . This also fixes #1076 and https://github.com/LLK/scratch-www/issues/981#issuecomment-263301322 by updating the styling accordingly.
2016-11-29 08:59:14 -05:00
chrisgarrity
110a7f2dc0
Merge pull request #1025 from TheGrits/patch-6
...
Fix gh-1023: Localize Explore Title and Dropdown
2016-11-28 13:48:40 -05:00
chrisgarrity
546ae19065
Merge pull request #1067 from TheGrits/patch-4
...
Fix gh-1066: Localize Search Header
2016-11-28 13:17:19 -05:00
chrisgarrity
02a7cece6b
Merge pull request #1074 from chrisgarrity/issue/gh905-educator-hoc
...
Add link to TTT page to educators page
2016-11-23 13:38:48 -05:00
Matthew Taylor
2e7336ff55
Merge branch 'feature/gh-981' into release/hoc-nov-21
...
* feature/gh-981:
Add hoc banner
Move padding to splash element
trello-ize title banner h1,p styling
# Conflicts:
# src/components/title-banner/title-banner.scss
# src/views/hoc/hoc.jsx
2016-11-23 11:17:47 -05:00
chrisgarrity
a21587a658
Add link to TTT page to educators page
...
Replace ‘Help’ link with ‘Things to Try’: fixes #905
2016-11-23 10:25:54 -05:00
The_Grits
52a57b05a7
Localize Search Header
2016-11-22 12:15:17 -05:00
Matthew Taylor
f98cf53455
Merge pull request #1062 from mewtaylor/hotfix/localized-pdfs-bug
...
remove uri from path
2016-11-21 16:54:16 -05:00
Matthew Taylor
cf67ec0e4b
remove uri from path
2016-11-21 16:52:46 -05:00
Matthew Taylor
0c9f2561f9
Merge branch 'release/hoc-2016-1' into release/2.2.15
...
* release/hoc-2016-1:
Merge pull request #1027 from TheGrits/patch-7
Additional content changes
Fix TTT content
Redirect hoc page to `/go`
Merge pull request #1037 from chrisgarrity/patch-column-count
update ttt content
Update ttt content
Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
Merge pull request #1018 from mewtaylor/issue/gh-995
Merge pull request #1008 from mewtaylor/issue/gh-980
Update pattern so rewrite accepts querystring too
# Conflicts:
# src/components/modal/ttt/modal.jsx
# src/views/jobs/jobs.jsx
# src/views/thingstotry/l10n.json
2016-11-21 15:01:53 -05:00
Matthew Taylor
e84427fcc0
Merge pull request #1050 from mewtaylor/issue/hoc-redirect
...
Implement GH-906: Redirect hoc page to `/go`
2016-11-21 12:41:39 -05:00
Matthew Taylor
bfaf5b35ba
Merge pull request #1027 from TheGrits/patch-7
...
Fix gh-1026: Trust and Safety Manager URL update
# Conflicts:
# src/views/jobs/jobs.jsx
2016-11-21 12:40:13 -05:00
chrisgarrity
58656aea17
Additional content changes
...
- new FlyCards.pdf (fixes shortcut url on title page)
- changes ‘download’ to ‘open’ for PDFs
2016-11-21 11:06:12 -05:00
chrisgarrity
bb777baf4c
Fix TTT content
...
ttt.subtitle:
- ‘try theTutorial’ instead of ‘try a Tutorial’
- Hide and Seek instead of Hide-and-Seek Game
- change <b> to <strong>
title-banner.scss
- add explicit rule to bold <strong> within title-banner for windows browsers
2016-11-21 11:06:02 -05:00
Matthew Taylor
edd41205bc
Redirect hoc page to /go
...
Implements #906
2016-11-20 13:55:00 -05:00
Matthew Taylor
e77e02d5a6
Update ttt content
...
Still missing `FashionGuide`, may need to remove that guide.
2016-11-18 17:42:09 -05:00
Matthew Taylor
b7bfaec438
Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
...
Fix gh-979: TTT page
2016-11-18 17:41:58 -05:00
Matthew Taylor
e6de0d0ba4
Merge pull request #1018 from mewtaylor/issue/gh-995
...
Fix GH-995: Make cards tweaks
2016-11-18 17:41:49 -05:00
Matthew Taylor
9ca54e83ce
Merge pull request #1008 from mewtaylor/issue/gh-980
...
Implement GH-980: add new TTT modal component
2016-11-18 17:41:26 -05:00
The_Grits
f22b698bb6
Bitly URL
2016-11-16 15:24:20 -05:00
The_Grits
62c6a57ff5
Update Trust and Safety Manager URL
...
I have a feeling Travis won't like this
2016-11-16 14:58:58 -05:00
The_Grits
e1f58662d0
Add localization strings
...
For #1023
2016-11-16 14:23:16 -05:00
The_Grits
015cca13f4
Localize Explore Title and Dropdown
...
As per #1023
2016-11-16 14:20:43 -05:00
Matthew Taylor
c4f42b3673
Add hoc banner
2016-11-16 08:52:18 -05:00
Matthew Taylor
e65ba61e7a
Move padding to splash element
...
Having it in the nav was causing issues with positioning the banner, as evidenced by the teacher banner’s `-20px` setting
2016-11-16 08:51:57 -05:00
Matthew Taylor
fe70dd0f9e
trello-ize title banner h1,p styling
...
we need it to be different for the hoc banner, so make it need a class name in order to be styled correctly
2016-11-16 08:50:00 -05:00
Matthew Taylor
e4231e9d57
Update ttt content
...
Still missing `FashionGuide`, may need to remove that guide.
2016-11-15 07:42:36 -05:00
Matthew Taylor
ac46cce989
Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
...
Fix gh-979: TTT page
2016-11-15 07:22:16 -05:00
Matthew Taylor
faa8c879be
Merge pull request #1018 from mewtaylor/issue/gh-995
...
Fix GH-995: Make cards tweaks
2016-11-15 07:21:37 -05:00
chrisgarrity
9693a5a526
Merge pull request #999 from TheGrits/patch-4
...
Fix gh-996: Update Privacy Policy
2016-11-14 16:59:37 -05:00
chrisgarrity
de9fb22fc8
last tweak
...
use .map (.., key) instead of tile.title just in case we ever have two tiles with the same title.
2016-11-14 16:42:06 -05:00
chrisgarrity
a27fea51e6
Integrated ttt-modal
...
integrated modal and added guide pdfs.
Catch and Pet Guides are still missing. We may need to remove them from the TTT list. Wanted to get this committed in any case to start review.
2016-11-14 14:34:45 -05:00
Matthew Taylor
370164c585
Make cards tweaks
...
Fixes #995
2016-11-14 13:35:13 -05:00
chrisgarrity
986a368d2b
Remove Story and Fashion TTTs
...
Create a Story and Fashion Game are not ready, so removing from the ttt json. Leaving in the l10n files so that translations can get started.
2016-11-14 10:37:19 -05:00
chrisgarrity
5854e9ccc9
Adding data for tutorials/guides/cards
2016-11-14 10:31:40 -05:00
Matthew Taylor
1b95e643a9
fix for linting
2016-11-14 10:31:40 -05:00
Matthew Taylor
688ab935d1
Some last tweaks
...
based on feedback from @rschamp, thanks!
1. make `ref` into method
2. remove accidental inclusion of prototype modal
3. use `omit` for props so that we don’t need a separate object for wrapped component properties
2016-11-14 10:31:40 -05:00
Matthew Taylor
438dbb21e1
Edits based on feedback
...
thanks @rschamp !
2016-11-14 10:31:40 -05:00
Matthew Taylor
b1e37360f3
Refactor modal components
...
1. Split out base modal stylings from iframe modal stylings
2. Move iframe-specific stylings into a separate copmonent
3. Move width/height iframe stylings to scss
4. Change global stylings for modals to match #980
5. Update styles to use trello style guide
2016-11-14 10:31:40 -05:00
Matthew Taylor
25f61fdb77
Merge pull request #1008 from mewtaylor/issue/gh-980
...
Implement GH-980: add new TTT modal component
2016-11-14 10:09:00 -05:00
Matthew Taylor
24aa9be30d
fix for linting
2016-11-14 09:58:42 -05:00
Matthew Taylor
402efd8046
Some last tweaks
...
based on feedback from @rschamp, thanks!
1. make `ref` into method
2. remove accidental inclusion of prototype modal
3. use `omit` for props so that we don’t need a separate object for wrapped component properties
2016-11-10 17:13:44 -05:00
Matthew Taylor
d2474c87a5
Edits based on feedback
...
thanks @rschamp !
2016-11-10 15:00:33 -05:00
chrisgarrity
1f8d26186c
Add all the banners
...
Removed the getting started placeholder.
Added all the banners from #980 , updated ttt.json with banner location
2016-11-10 11:32:58 -05:00
jwzimmer
8fce4f3e03
update compatibility & support FAQ response
2016-11-10 11:13:10 -05:00
The_Grits
6f35550ff4
Add Tutorials Button
...
For #1009
2016-11-09 21:32:58 -05:00
chrisgarrity
145da5f872
Styling and formatting clean up pass
...
Went over styles with Carl. Some notes:
renamed tutorial button tutorial tag as it’s not really a button and is unique to ttt.
Found out why cols4 wasn’t working - if your browser default font isn’t 16px, rem isn’t 16px. Opening a separate issue and using cols4 where it should be.
2016-11-09 21:25:35 -05:00
The_Grits
5fb1dd6230
Thanks Travis
...
A more thorough search of the error Travis returned helped me realize the problem.
2016-11-09 12:48:39 -05:00
chrisgarrity
ca7d0cf30e
Next draft
...
Includes new SVGs for banner and resources link
MasonryGrid does the reordering of items
Using react-responsive MediaQuery to change columns
Brought in ../forms/button.scss for button styling, and then modified for TTT
Still needs Modal
Final styling pass with Carl
2016-11-09 09:28:59 -05:00
Matthew Taylor
c9de1d73d9
Refactor modal components
...
1. Split out base modal stylings from iframe modal stylings
2. Move iframe-specific stylings into a separate copmonent
3. Move width/height iframe stylings to scss
4. Change global stylings for modals to match #980
5. Update styles to use trello style guide
2016-11-08 14:44:03 -05:00
chrisgarrity
c6f2fa68a7
First version of TTT page
2016-11-07 15:07:19 -05:00
The_Grits
2c1106adf7
Fix Travis
2016-11-07 11:12:59 -05:00
The_Grits
bfc0b5994e
gotcha
2016-11-07 11:09:44 -05:00
The_Grits
d9df101a66
One Commit More ( #23 )
...
* Update reducer.js
* Update search.jsx
2016-11-07 11:02:33 -05:00
The_Grits
eba009b132
Student Data Privacy Strings
2016-11-03 17:33:48 -04:00
The_Grits
d3f432d247
Add law compliance strings
2016-11-03 17:22:49 -04:00
The_Grits
f3579a2976
Update Privacy Policy
...
Add policy, fix typo, and update update date.
2016-11-03 17:10:02 -04:00
Ray Schamp
ae106a866a
Merge pull request #993 from LLK/release/2.2.14
...
[Develop] Release 2.2.14
2016-10-31 16:25:13 -04:00
The_Grits
8be3e11486
Travis and Other Stuffs
2016-10-31 10:19:35 -04:00
The_Grits
9f2cda0eaa
Bugs and Connections
2016-10-31 10:05:08 -04:00
St19_Galla
2fd2118fe0
change community manager name
2016-10-28 11:29:50 -04:00
St19_Galla
d93212818d
Remove jobs
2016-10-28 11:16:20 -04:00
Matthew Taylor
c6ccf78b2f
Revert "Update requirement string" temporarily
...
This reverts commit 9f93340539
. This is temporary, and we will add it back in once the Windows tool is ready.
2016-10-28 08:00:14 -04:00
The_Grits
379ac78551
Navigation Redux
2016-10-26 10:20:16 -04:00
The_Grits
f77b22b07b
Update with Reducer
2016-10-20 21:30:32 -04:00
chrisgarrity
fa1b6c6c00
Merge pull request #948 from TheGrits/patch-1
...
Fix gh-924: Localize Developers Page
2016-10-20 17:52:16 -04:00
Connor Hudson
dc890d6db8
Merge pull request #964 from technoboy10/gh899-searchbarundefined
...
Fix GH-899: Re-searching should not search for 'undefined'
2016-10-20 12:51:50 -07:00
Technoboy10
3777ab825c
make fix simpler by using value instead of defaultValue
2016-10-20 13:17:23 -06:00
Matthew Taylor
f2b7d4fcf7
Merge pull request #976 from mewtaylor/issue/gh-856
...
Implement GH-856: Add new cards and card thumbs to www
2016-10-20 11:23:57 -04:00
Matthew Taylor
88a78480ba
Back to hide-and-seek with new cards
2016-10-19 16:54:24 -04:00
Matthew Taylor
cdf8059995
Change name to “Hide and Show”
2016-10-19 16:39:51 -04:00
chrisgarrity
991ce989be
Merge pull request #929 from tmickel/feature/developers-scratchjr
...
Add ScratchJr to developers page
2016-10-19 15:29:25 -04:00
Matthew Taylor
e01afa0161
Add new cards and card thumbs to www
...
Fixes #856 . This also updates the styling of the `cards.jsx` view to follow the trello style guide, as previously discussed.
2016-10-19 13:45:37 -04:00
St19_Galla
bb20fa3375
single quotes whoops!
2016-10-13 17:31:57 -04:00
St19_Galla
5775cedc7a
add space
2016-10-13 17:26:46 -04:00
St19_Galla
d6680f129f
Update l10n.json
2016-10-13 17:25:44 -04:00
St19_Galla
e3452e3ea1
Add space in curator row
2016-10-13 15:51:17 -04:00
Technoboy10
4a610296e2
Add check for undefined formData
2016-10-12 16:09:00 -06:00
chrisgarrity
4074b986c2
Merge pull request #960 from chrisgarrity/gh940-missing-i18n
...
Fix gh-940: missing translations
2016-10-12 16:28:34 -04:00
chrisgarrity
29b104741f
Added tests for duplicate strings in build-locales merge
...
Also took out default messages for strings that are in the l10n json files.
2016-10-12 09:41:06 -04:00
The_Grits
8de70e8882
FormattedHTMLMessage fix
2016-10-11 20:38:01 -04:00
chrisgarrity
5b2ff1a4ca
Update md5map fixtures for tests
...
Also cleaned up comments from @mewtaylor
2016-10-11 19:28:13 -04:00
Matthew Taylor
36992e7d8d
Merge pull request #939 from TheGrits/patch-2
...
Fix gh-938: Update Privacy Policy
2016-10-11 15:12:18 -04:00
chrisgarrity
1339683a73
Fix #940
...
Most problems were due to strings being duplicated and overwriting each other. Updated the build-locales script to keep track of duplicates.
Project Curated by on the splash page was just missing the formatMessage call.
2016-10-11 12:33:31 -04:00
The_Grits
9f93340539
Fix #930 : Update requirement string
2016-10-11 12:33:30 -04:00
St19_Galla
b83a3825e9
Add Travis-CI
2016-10-06 15:55:00 -04:00
The_Grits
dd4550899b
unbold
2016-10-06 10:44:08 -04:00
The_Grits
009b6eb75a
Finish Localization and Implementation
2016-10-05 23:03:23 -04:00
The_Grits
e0026d5c44
Part 1
2016-10-05 00:05:03 -04:00
Matthew Taylor
603a1336ce
Merge pull request #931 from TheGrits/patch-1
...
Fix gh-930: Update requirement string
2016-10-04 20:47:58 -04:00
Matthew Taylor
6bcc7eeae3
Update make it fly hoc image to be higher res
...
Higher res AND SMALLER FILE SIZE?!?! This really is 2016. We live in an amazing time.
2016-10-03 16:40:57 -04:00
The_Grits
53e3e34a52
Update link, add reviewed date
2016-10-03 16:12:14 -04:00
Matthew Taylor
c44742e668
Slight content edits to hoc page
...
updates the studio links, and also fixes a link issue for the dance activity. Thanks @jwzimmer!
2016-10-03 16:04:19 -04:00
Ray Schamp
6fa1c13cfb
Move Randy Jou to previous Scratch Team section
2016-10-03 11:39:21 -04:00
The_Grits
4413213caa
Fix #930 : Update requirement string
2016-09-28 08:10:11 -04:00
Tim Mickel
aea35c5b8c
Add ScratchJr to developers page
2016-09-26 11:57:52 -04:00
Matthew Taylor
0156fe8c77
Add cards for fly and make music
2016-09-19 15:59:40 -04:00
Matthew Taylor
cd6a60e5b8
Change bearstack/bball to hide and dance
...
Also make updates to style scoping based on feedback from @rschamp
2016-09-15 11:44:33 -04:00
Matthew Taylor
f4b0b26b5c
make multiline formatting for img
uniform
2016-09-15 08:21:38 -04:00
Matthew Taylor
469d7a35bb
Update hoc page with new tutorials
...
Adds:
1. Make it Fly
2. Make Music
Removes:
1. Hide-and-Seek
2. Dance, Dance, Dance
2016-09-15 08:15:37 -04:00
The_Grits
2b2f4a03e8
Fix lint
2016-09-13 11:49:34 -04:00
The_Grits
68d37e0506
Update Video Link
...
As per @sleggss on #918
2016-09-13 11:41:39 -04:00
Ray Schamp
60f0ee1ded
Merge pull request #913 from rschamp/bugfix/empty-bodies
...
Don't set state to undefined API response bodies
2016-09-12 13:52:54 -04:00
Matthew Taylor
bd911c52d1
Merge pull request #867 from morantsur/feature/microworlds
...
Adding routes to microworlds
2016-09-12 12:06:27 -04:00
Ray Schamp
c0eb1608bd
Don't set state to undefined API response bodies
...
This resolves the "Cannot read property 'x' of undefined" errors that occur when the API returns non-JSON responses. For instance if the proxy endpoints return 500 error responses from scratchr2.
2016-09-08 17:23:49 -04:00
morant
850def5cf0
- Remove commented out content from microword pages, as they are not displayed.
...
- Change art microworld text to not refer to videos.
2016-09-07 16:27:46 -04:00
morant
96c52dc223
Fixing route alias + adding new line
2016-09-07 13:35:14 -04:00
Matthew Taylor
1b4eaf0f0f
Merge pull request #902 from TheGrits/patch-3
...
Fix gh-894: Community Guidelines Image
2016-09-06 11:28:51 -04:00
The_Grits
c224284d81
oops
...
Just realized I took the whole footer off, not just the image.
2016-08-31 21:24:10 -04:00
The_Grits
bf24d592ad
Update guidelines.scss
...
Update to hide page's footer image when the screen is too small.
2016-08-31 21:11:19 -04:00
St19_Galla
f2c176a521
Update Credits
2016-08-31 14:59:03 -04:00
morant
ecdc544dff
Disable lint on require('react') lines as they are required implicitly.
2016-08-29 12:40:17 -04:00
Matthew Taylor
33d06e9721
Merge pull request #865 from St19Galla/patch-2
...
Fix gh-864 // Update Conference Text
2016-08-29 11:57:48 -04:00
morant
2af34efa98
Fix some failed tests.
2016-08-26 15:51:42 -04:00
Matthew Taylor
fae45f191e
Merge pull request #873 from TheGrits/patch-2
...
Fix gh-853: Update Community Guidelines
2016-08-26 10:27:47 -04:00
Matthew Taylor
45d206315f
Merge pull request #863 from St19Galla/patch-1
...
Fix gh-860 // Update FAQ
2016-08-26 10:27:00 -04:00
St19_Galla
5ca03b4e3a
remove on from anchor
2016-08-25 08:05:32 -04:00
Matthew Taylor
ab6f8e1049
Add in an Oxford Comma
...
*whistles as he commits
see https://github.com/LLK/scratch-www/pull/819#issuecomment-242195194
2016-08-24 16:39:03 -04:00
The_Grits
c0c7a1a7e0
Update Community Guidelines
...
As per @Paddle2See on #853
2016-08-23 16:31:43 -04:00
Technoboy10
32ef37e3bf
remove unused variable
2016-08-23 11:10:02 -06:00
Technoboy10
55f95bb2a8
remove inactive class on tabs
2016-08-23 09:26:22 -06:00
Technoboy10
f27e99f1a4
move card styling to grid.scss, use card as default grid style
2016-08-23 09:26:22 -06:00
Technoboy10
6394d3e8cf
make search bar on 4 column layout look right
2016-08-23 09:26:22 -06:00
Technoboy10
647c925a1c
search redesign
2016-08-23 09:26:22 -06:00
Technoboy10
4d0efd1268
explore redesign
2016-08-23 09:26:21 -06:00
Technoboy10
278f7c8819
more tweaks
2016-08-23 09:26:21 -06:00
Technoboy10
cca9b4a7ed
style tweaks
2016-08-23 09:26:21 -06:00
Technoboy10
432b621079
wip
2016-08-23 09:24:44 -06:00
Technoboy10
f883ecfbae
commit changes
2016-08-23 09:24:44 -06:00
morant
191d78fab3
Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/microworlds
2016-08-22 13:43:04 -04:00
morant
28aa4f0b2c
Fixing microword pages and adding routes to them.
...
- Remove temp "open in Scratch" button, now that we have a permanent one.
- Fix microworld pages to work with new changes to environment.
- Fix alignment issues.
- Connect routes to microworld pages.
- Add soccer microworld.
- Comment out videos and tips from arts microworls, so it can be shown publicly.
2016-08-22 13:31:44 -04:00
St19_Galla
2123fc9af8
Updates
2016-08-22 11:04:31 -04:00
St19_Galla
ceb6b38106
whoops
2016-08-22 09:46:47 -04:00
St19_Galla
4f3f978b86
Update FAQ
2016-08-22 09:41:44 -04:00
Matthew Taylor
db2b7ebc34
Merge pull request #851 from St19Galla/patch-1
...
Fix GH-850 // Add image links
2016-08-19 06:42:40 -04:00
St19_Galla
43bcbaf2ac
what was i thinking lol
2016-08-17 18:30:39 -04:00
Matthew Taylor
34a0cfc4e7
Add link to teacher accounts registration in faq
...
also re-order questions based on feedback
2016-08-17 12:55:58 -04:00
St19_Galla
4ca603b050
One more update for '/'
2016-08-17 10:11:00 -04:00
St19_Galla
880413a61d
fix (hopefully)
2016-08-16 21:30:52 -04:00
St19_Galla
5d5e1d9fdf
update to relative
2016-08-16 21:21:29 -04:00
Matthew Taylor
4a0442695a
generalize “Educator Resources”
...
It was getting overwritten since it was defined in multiple places. fixes #840 .
2016-08-16 11:33:07 -04:00
St19_Galla
b1eadf8c12
Add image links
2016-08-16 11:11:46 -04:00
Matthew Taylor
43add1ad35
Clean up some intl formatting
...
remove `defaultMessage` from inline, which we don’t use right now
2016-08-16 08:56:01 -04:00
Matthew Taylor
41a0ef73ba
Add missing strings for translation
...
1. Explore page header
2. “by” in the project thumbnail
2016-08-16 08:55:32 -04:00
Matthew Taylor
f4d7cbd235
Merge pull request #819 from mewtaylor/issue/gh-546
...
Fix GH-546: Update faq language
2016-08-15 13:30:29 -04:00
Matthew Taylor
59d558116e
Merge pull request #836 from mewtaylor/issue/gh-760
...
Fix GH-760: Add username `not equals` to password validation
2016-08-15 13:29:46 -04:00
Matthew Taylor
f8de61f067
Update from feedback
...
use props for username rather than constructed form data, and `studentUsername -> username`. Thanks @rschamp!
2016-08-12 10:11:14 -04:00
Matthew Taylor
537104c56b
Add username validation to student complete registration
...
Fixes #760
2016-08-12 08:10:20 -04:00
Ray Schamp
1df251ca2a
Merge pull request #832 from rschamp/bugfix/3937
...
[Develop] Update teacher FAQ copy
2016-08-11 14:22:46 -04:00
Ray Schamp
46b23beda5
Update teacher FAQ copy
...
Resolves LLK/scratchr2#3937
2016-08-11 13:00:45 -04:00
Ray Schamp
47d0cca883
Merge pull request #824 from St19Galla/patch-1
...
Fix GH-806: Teacher Account Video Embded
2016-08-10 12:15:56 -04:00
St19_Galla
ecd1963bbe
Update faq.jsx
2016-08-10 12:14:08 -04:00
Connor Hudson
f49d6e6a83
Merge pull request #767 from technoboy10/mobile-nav-footer
...
Fix GH-217: Implement responsive nav and footer (woohoo!)
2016-08-09 15:09:01 -04:00
St19_Galla
8b18629264
amend text
2016-08-09 10:22:48 -04:00
St19_Galla
fd5be4bf8d
Embed Video
2016-08-09 10:16:08 -04:00
The_Grits
722b7ec20c
Add email address link
...
Fixes #822
2016-08-08 19:37:58 -04:00
Matthew Taylor
68042b056b
Merge pull request #821 from mewtaylor/hotfix/gh-673
...
[Develop] Hotfix: Bind the banner api method to the splash page
2016-08-08 16:39:39 -04:00
Matthew Taylor
7cb14c17b9
Bind the api method to the splash page
...
otherwise, `this` is undefined. Fixes #673 .
2016-08-08 16:31:03 -04:00
Matthew Taylor
b1f7d9666e
Update faq language
...
Fixes #546
2016-08-08 16:28:48 -04:00
Matthew Taylor
967e5b6d3f
remove link to “My Classes” from faq
...
so that it doesn’t 403 for people without educator accounts. Fixes #658
2016-08-08 08:34:20 -04:00
Ray Schamp
e5b62ba61b
Merge pull request #808 from rschamp/hotfix/ta-yt-ta-faq
...
[Develop] Add link to teacher account walkthrough video
2016-08-03 17:04:41 -04:00
Ray Schamp
77644aafb2
Merge pull request #807 from rschamp/hotfix/ta-yt-ta-faq
...
[Master] Add link to teacher account walkthrough video
2016-08-03 17:04:35 -04:00
Matthew Taylor
776623bbb3
Merge pull request #790 from mewtaylor/hotfix/conference-livestream
...
[Master] Hotfix: Add hyperlink to keynote livstream for 2016 conf
2016-08-03 17:03:09 -04:00
Ray Schamp
42229e84e7
Add link to teacher account walkthrough video
2016-08-03 16:53:38 -04:00
Matthew Taylor
4a527fdd2e
Merge branch 'master' of https://github.com/LLK/scratch-www into hotfix/conference-livestream
...
* 'master' of https://github.com/LLK/scratch-www :
Only redirect approved educators to My Classes
Lint
Add "Request Account" button to Educators landing
Add `align` prop to `SubNavigation` component
2016-08-03 16:19:09 -04:00
Matthew Taylor
fc20f59a7e
Merge branch 'master' of https://github.com/LLK/scratch-www into isseu/gh-792
...
* 'master' of https://github.com/LLK/scratch-www :
Only redirect approved educators to My Classes
Lint
Add "Request Account" button to Educators landing
Add `align` prop to `SubNavigation` component
2016-08-03 16:17:30 -04:00
Ray Schamp
d2d78da580
Merge pull request #793 from rschamp/hotfix/activate-teacher-registration
...
[Master] Add "Request Account" button to Educators landing page
2016-08-03 15:50:48 -04:00
Ray Schamp
c55595fbc3
Merge pull request #802 from rschamp/hotfix/waiting-room-loop
...
[Develop] Only redirect approved educators to My Classes
2016-08-02 11:24:01 -04:00
Ray Schamp
0e6a7e6fdc
Merge pull request #794 from rschamp/hotfix/activate-teacher-registration
...
[Develop] Add "Request Account" button to Educators landing page
2016-08-02 10:55:43 -04:00
Ray Schamp
a9039ca63b
Only redirect approved educators to My Classes
...
Fixes #800
2016-08-02 10:52:47 -04:00
Ray Schamp
0e8e842eb2
Lint
2016-08-02 09:50:46 -04:00
Matthew Taylor
85377193a8
Merge pull request #796 from mewtaylor/isseu/gh-792
...
[Develop] Hotfix: Create space between paragraph elements
2016-08-02 09:37:27 -04:00
Matthew Taylor
5cbaabbe97
Merge pull request #791 from mewtaylor/hotfix/conference-livestream
...
[Develop] Hotfix: Add hyperlink to keynote livstream for 2016 conf
2016-08-02 09:37:16 -04:00
Matthew Taylor
2e962c7831
Create space between paragraph elements
...
Fixes #792
2016-08-01 14:21:27 -04:00
Ray Schamp
c842d06ac4
Add "Request Account" button to Educators landing
2016-08-01 12:19:29 -04:00
Matthew Taylor
00e6ad2ee1
Add hyperlink to keynote livstream for 2016 conf
2016-08-01 10:59:27 -04:00
Technoboy10
6b63f5b7ad
set image width to 100%
2016-07-29 17:37:24 -04:00
Ray Schamp
e218cc5169
Move "select country" to general strings
...
It's reused in the other registration views so doesn't belong in teacherregistration/l10n.json
Fixes #783
2016-07-28 12:26:56 -04:00
Matthew Taylor
cf4a057278
Fix “afterschool” typo
...
Also make default country selectable in the user demographic step, and fix the spacing with `Create a Username`
2016-07-27 23:33:45 -04:00
Ray Schamp
19d67dc0b4
Resurrect old invite step design for new users
2016-07-27 19:32:08 -04:00
Ray Schamp
d1f73c3ef4
Redesign invite step, add option to log out
...
Resolves #752
2016-07-27 10:24:37 -04:00
Matthew Taylor
806fd25e46
Move to the view
...
thanks @rschamp!
2016-07-26 17:03:41 -04:00
Technoboy10
2a5f330884
hide intro if not desktop width
2016-07-26 11:29:45 -04:00
Ray Schamp
74f56d42c5
Explicitly show a spinner while loading class data
...
To make this view work consistently with the complete registration view
2016-07-25 16:59:55 -04:00
Ray Schamp
4df4ea8930
Show an error to logged out users
...
When logged out users visit the complete registration view, show them an error rather than a spinner.
2016-07-25 16:58:38 -04:00
Ray Schamp
61e21f6b5b
Show an error if the API doesn't return class data
...
Fixes #747 .
Also explicitly show a spinner when the component is waiting on the class API, and hide it when it returns.
2016-07-25 11:41:10 -04:00
Technoboy10
daf803d4a3
experiment with the react-responsive library
2016-07-25 10:53:57 -04:00
Technoboy10
a9def9c1ae
tweak splash to not be terrible on mobile
2016-07-22 14:53:39 -04:00
Ray Schamp
7455807591
Provide RegistrationError content as children
...
This allows us to do more inline formatting, so we don't have any of that outside of `render`.
Thanks @mewtaylor
2016-07-22 09:38:37 -04:00
Ray Schamp
be41d004ad
Show password by default
2016-07-21 21:08:07 -04:00
Ray Schamp
a4dd1611d1
Add student registration update view
2016-07-21 21:08:06 -04:00
Ray Schamp
1df6eb5d2a
Update incorrect CSS class name
2016-07-21 21:08:06 -04:00
Ray Schamp
7a6e5c3eb4
Fix student registration localization
...
Add missing strings, actually translate the content of the steps
2016-07-21 21:08:06 -04:00
Ray Schamp
b06a9e49d0
Fix wording on student username step
2016-07-21 20:44:51 -04:00
Ray Schamp
9aa7e828b7
Remove "blank" classroom, show spinner instead
...
It was broken due to a key error on `classroom.images` anyway
2016-07-21 20:44:51 -04:00
Ray Schamp
8038fbcdc1
Fix classroom API call
2016-07-21 18:10:41 -04:00
Andrew Sliwinski
74b26267d2
Merge pull request #741 from thisandagain/bugfix/740
...
Adjustments to the educators page as per feedback
2016-07-21 13:49:37 -04:00
Andrew Sliwinski
99c61ef0f7
Adjustments to the educators page as per feedback. Resolves GH-740
2016-07-21 13:43:35 -04:00
Matthew Taylor
859877c1ff
refresh session on successful registration
...
This is needed to ensure that the approval step displays the correct “Wait for Approval” message. Fixes #698
2016-07-21 12:57:49 -04:00
Andrew Sliwinski
4f6c071c2c
Pluralize example headlines on educators page
2016-07-21 08:41:31 -04:00
Andrew Sliwinski
4d2f9d7a05
Educator page language adjustments as per feedback. Resolves GH-734
2016-07-20 17:53:02 -04:00
Technoboy10
22dc55c030
change verbiage, begin work on responsive nav/footer
2016-07-20 16:53:50 -04:00
Ray Schamp
d3f1046a42
Merge pull request #730 from rschamp/feature/3679-student-flow
...
Add student registration flow
2016-07-20 15:57:47 -04:00
Technoboy10
74afd163b5
fix typo
2016-07-20 14:28:46 -04:00
Ray Schamp
a3b56dcbf1
Fix lint errors, l10n issues
2016-07-20 12:07:19 -04:00
Ray Schamp
6d5b7d3c02
Update description of demographics step
2016-07-19 22:58:50 -04:00
Ray Schamp
1c5940cc05
Add student registration flow
2016-07-19 16:51:28 -04:00
Ray Schamp
47ebef1b6f
Scope message strings more reusably
2016-07-19 16:51:10 -04:00
Ray Schamp
67ecb60f48
Make registration styles reusable
2016-07-19 16:49:12 -04:00
Ray Schamp
5b6a1fe8b9
Fix whitespace
2016-07-19 09:24:07 -04:00
Technoboy10
8c260032fa
card margin auto
2016-07-18 10:39:13 -04:00
Matthew Taylor
7741cb2c7e
Merge pull request #685 from St19Galla/patch-1
...
Fix gh-684 - Changing error message
2016-07-12 19:04:16 -04:00
Matthew Taylor
6fd1d08d56
Merge pull request #720 from mewtaylor/issue/usernames-search
...
[Develop] GH-710: only show username in search and explore
2016-07-11 20:21:58 -04:00
Matthew Taylor
27b5afddfb
Forgot search
...
thanks @thisandagain!
2016-07-11 19:59:13 -04:00
Matthew Taylor
845ddb2966
only show username in search and explore
...
fixes #710
2016-07-11 16:35:03 -04:00
Andrew Sliwinski
f8ee125bfe
Update job listings
2016-07-11 16:16:46 -04:00
Matthew Taylor
075f1481a2
Add custom validation for organization and phone
...
It appears that the `required` field is not applied in the way we'd like it to be for the custom checkbox group and custom phone input fields, so do a `required` check on form submission. Additionally, this adds in a few style fixes. Fixes #695 , #694 , #693 , #691
2016-07-07 16:56:51 -04:00
St19_Galla
ea6cd2ab2c
final fix
2016-07-07 14:18:16 -04:00
Matthew Taylor
7f466aacc6
Add language to search / explore api requests
...
Fixes #686 , thanks @thisandagain !
2016-07-07 08:38:10 -04:00
St19_Galla
16a985212c
alphanumeric only text fix
2016-07-06 21:20:46 -04:00
Technoboy10
717a2319b4
remove button, use div instead
2016-07-06 14:16:08 -04:00
Technoboy10
66c3a02340
default cursor on coming soon, make cards into links
2016-07-06 12:27:42 -04:00
Matthew Taylor
9a037fda81
don't use let
yet for variable definitions
...
Fixes #670
2016-07-05 14:21:40 -04:00
Matthew Taylor
aa3cbe552a
Make category options into key/value
...
so that we can store the query string with the tab name, since it's not the same in every instance. fixes #666 , and makes a couple other style tweaks.
2016-07-05 13:38:51 -04:00
Ray Schamp
7fe82c11be
Get rid of most splash warnings in development
2016-07-03 14:49:01 -04:00
Technoboy10
5e5c2a4f9d
Remove z-index as it wasn't needed
2016-06-30 16:46:44 -04:00
Connor Hudson
7f3af0f8be
Merge pull request #639 from technoboy10/gh637-relativepaths
...
Fix GH-637: Make links to help and tips window relative
2016-06-30 15:57:43 -04:00
Ray Schamp
a0a82ef5a7
Merge pull request #646 from rschamp/bugfix/608
...
Fix localization of address validation message
2016-06-30 15:55:26 -04:00
Ray Schamp
554e21cd15
Fix localization of address validation message
...
Fixes #608
2016-06-30 15:54:32 -04:00
Matthew Taylor
2017e1573d
point landing page to teacher faq page
...
Fixes #636
2016-06-30 13:37:12 -04:00
Technoboy10
b5bf0298d7
Make s.m.e links relative
2016-06-30 10:06:10 -04:00
Technoboy10
088eb7cc66
inherit width on iframe
2016-06-30 09:46:39 -04:00
Technoboy10
b0f0bce211
enable fullscreen, fix border radius and aspect ratio
2016-06-30 09:43:24 -04:00
Matthew Taylor
9fb6170569
style error-step like last-step
...
Since they're both mostly info cards. Fixes #627 .
2016-06-29 14:08:16 -04:00
Connor Hudson
42ccc6c0a0
Merge pull request #622 from technoboy10/gh620-coming-soon
...
Fix GH-620: Replace "Request account" with "Coming Soon"
2016-06-29 10:41:28 -04:00
Technoboy10
ce4069fdb1
tweak padding
2016-06-29 09:56:15 -04:00
Technoboy10
db039739dd
change request account button to coming soon
2016-06-29 09:51:23 -04:00
Matthew Taylor
7bb52c25fe
move permissions checks to mirror session more
...
thanks @rschamp!
2016-06-28 14:25:11 -04:00
Matthew Taylor
f2310170b2
Add permissions dispatch for WillReceiveProps
...
We still need `componentWillMount` to handle the initial render for a logged in teacher first visting the page. Fixes issue in which a teacher would not see the banner immediately after dynamic login.
2016-06-28 13:30:36 -04:00
Matthew Taylor
16fe86b2fd
Fix scratch ed links
...
they are not domain agnostic. fyi @rschamp
2016-06-28 08:35:01 -04:00
Matthew Taylor
c5f85022f3
Copy edits for conference site
2016-06-28 07:51:49 -04:00
Connor Hudson
5724a4c609
Merge pull request #606 from technoboy10/gh604-localize-educator-landing
...
Fix GH-604: Localize Educator Landing Page
2016-06-24 10:51:34 -04:00
Technoboy10
0277b96698
move teacher accounts string to general
2016-06-24 10:39:55 -04:00
Technoboy10
3d18f04a43
localize educator landing page
2016-06-24 10:05:44 -04:00
Matthew Taylor
633fee162a
Merge pull request #603 from TheGrits/patch-2
...
Fix gh-602: Remove Community Counselor
2016-06-24 08:58:10 -04:00
Connor Hudson
5cb46b1579
Merge pull request #601 from technoboy10/educator-landing
...
Fix GH-311: Educator landing page
2016-06-24 08:21:02 -04:00
Matthew Taylor
ebf45c6f1d
Fix linting errors
...
Signed-off-by: Connor Hudson <technoboy10@fake.email>
2016-06-24 08:13:32 -04:00
The_Grits
f233f660b0
Fix gh-602: Remove Community Counselor
2016-06-23 18:28:24 -04:00
Connor Hudson
53eb56c1df
style tweaks
2016-06-23 17:23:35 -04:00
Matthew Taylor
74bd2b3255
Merge pull request #599 from mewtaylor/feature/teacher-registration-flow
...
[Updates] Teacher registration flow
2016-06-23 16:48:58 -04:00
Connor Hudson
7de13d029b
get rid of carousel, make things centered if they need it
2016-06-23 15:46:02 -04:00
Matthew Taylor
0c1abada3a
Small tweaks
...
1. left-align form elements even in mobile
2. Bolden input labels, except for checkboxes and radio elements
/cc @carljbowman
2016-06-23 15:44:14 -04:00
Matthew Taylor
6aeee284bc
style waiting room
...
also "deep purple" :)
2016-06-23 15:25:22 -04:00
Matthew Taylor
10f154ca10
accidentally took this out
2016-06-23 15:10:41 -04:00
Matthew Taylor
1a08e7ae49
Finalize styling for registration flow
...
/cc @carljbowman
One issue we ran into is that our `frameless` configuration is in `em` rather than `rem`, making it difficult to have an aboslute grid applied uniformly at all hierarchies. For now, we're using straight `rem` calculations instead of `$cols{1,8}` in the styling until we can refactor `frameless` to use `em`.
2016-06-23 14:06:36 -04:00
Connor Hudson
6d3d8b7446
more styling
2016-06-23 13:48:18 -04:00
Connor Hudson
c52a6e16e9
attempted mobile styling
2016-06-23 13:18:45 -04:00
Matthew Taylor
1910d38bc6
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 :
Add teacher waiting room view
Only pass necessary props to steps
# Conflicts:
# src/components/registration/steps.jsx
# src/views/teacherregistration/teacherregistration.jsx
2016-06-23 07:35:06 -04:00
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
9c14f7cb3f
create landing page
2016-06-22 13:18:19 -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
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
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
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
Ray Schamp
37f0eb3348
Fetch news from api if the user is logged in
2015-10-07 16:23:08 -04:00
Ray Schamp
6fba6c0a8f
Merge pull request #15 from rschamp/feature/session-api
...
Share session from scratchr2, add logging in/out
2015-10-07 15:27:29 -04:00
Ray Schamp
31fb5911ea
Don't use boolean coersion
2015-10-07 11:48:55 -04:00
Andrew Sliwinski
bb3870c43d
Merge pull request #20 from carljbowman/hoc-landing-updates
...
Hoc landing updates
2015-10-06 17:32:40 -04:00
carljbowman
c26378f53d
Update as many links as possible with live content
...
Links still to be added
- Hide & Seek Tips Window
- Hide & Seek Tips Cards Download
- Compose a Dance Tips Cards Download
- Animate Your Name Tips Cards Download
2015-10-06 16:14:01 -04:00
carljbowman
4a51ffeb59
Remove Red Outline on "href='''
2015-10-06 15:49:10 -04:00
Andrew Sliwinski
3a648a20cb
Merge pull request #17 from rschamp/feature/better-featured-json
...
Add real content for homepage rows
2015-10-06 15:47:38 -04:00
Ray Schamp
08de438208
Fix thumbnail URL per discussion
2015-10-06 13:07:24 -04:00
Ray Schamp
e0d17005e4
Get session from scratchr2 via proxy
...
Cookies aren't shared across ports, so the proxy is necessary to share the session between scratchr2 and www.
2015-10-02 16:58:08 -04:00
Ray Schamp
d73b7508bc
Add missing key, heed React warning
2015-10-02 16:58:08 -04:00
Ray Schamp
f811cf82af
Add real content for homepage rows
...
Also update the thumbnail and carousel components to account for the new API spec
2015-10-02 13:08:57 -04:00
carljbowman
d36c020b8f
Update IMG tags to self close & 'mbs' to 'MBS'
2015-10-01 15:01:24 -04:00
carljbowman
823609f1a7
Update HOC Landing Page
...
- Added folder of SVGS (includes on for the landing page)
- Swapped out images assets (removed links to Dropbox)
- Added resource styling
2015-10-01 14:30:30 -04:00
carljbowman
41e4b3b990
Add Global Colors and Updated SCSS / Linter
...
Created a new global style sheet to manage colors and converted all the current SCSS to match the new color scheme.
2015-09-29 11:22:48 -04:00
carljbowman
c2371d2a9f
Add a (link) style for empty links
2015-09-25 12:51:06 -04:00
carljbowman
127629fc1a
Update SCSS Linter for Leading Zeros and 0 Units
2015-09-25 12:47:26 -04:00
carljbowman
5a812ee89c
Update HOC Content for Lint CharCount
2015-09-25 11:12:32 -04:00
carljbowman
fbd54998e6
Add HOC Landing page View
...
Created a HOC Landing View. Currently all the SCSS lives at the view level and needs to be made into componets. After building out some Global style sheets I will revisit.
2015-09-25 09:59:56 -04:00
Ray Schamp
f429140b07
Fix indentation
2015-09-22 10:26:20 -04:00
Ray Schamp
d6576409f1
Something like session handling
2015-09-22 10:26:19 -04:00
Ray Schamp
438919ac72
Heed warnings about giving children keys
2015-09-22 10:23:47 -04:00
carljbowman
e93b47285a
Merge pull request #10 from carljbowman/navigation
...
Navigation
2015-09-21 13:42:01 -04:00
carljbowman
d3ebcd6744
Replacing Tabs with Spaces
2015-09-21 11:32:17 -04:00
Andrew Sliwinski
a85db60610
Resolve merge conflicts
2015-09-21 10:44:58 -04:00
carljbowman
9a67d3fb98
Navigation WIP
2015-09-21 09:18:00 -04:00
Ray Schamp
a2ffa76b1d
Enforce consistent function style
2015-09-14 16:14:40 -04:00
Ray Schamp
c4d7cdbdb2
Enforce no trailing spaces
2015-09-14 16:14:40 -04:00
Ray Schamp
f76374b24e
Add an "intro" component to the homepage
2015-09-09 22:26:07 -04:00
Ray Schamp
b4147a8d53
Resolve feedback from PR, fix stylistic issues
2015-09-09 10:01:10 -04:00
Andrew Sliwinski
826ed270e5
Add stub for 'Activity' component
2015-09-08 19:54:55 -07:00
Ray Schamp
730e440ee6
Add example feature content to splash
2015-09-08 18:15:02 -04:00
Ray Schamp
d53a84925d
Fix carousel styling for box container
2015-09-08 15:10:25 -04:00
Andrew Sliwinski
02d38c513a
Resolve feedback from review.
2015-09-08 07:54:15 -07:00
Andrew Sliwinski
4e7cd53e5c
Adds basic 'box' and 'news' component
2015-09-06 16:18:53 -07:00
Andrew Sliwinski
3716d0462c
Merge and resolve feedback from review
2015-09-04 08:26:18 -07:00
Andrew Sliwinski
41176aaee1
Extend build process to support multiple views
2015-09-03 22:26:56 -07:00
Andrew Sliwinski
79dce3f711
Clean-up travis config and demo code
2015-09-02 13:33:31 -07:00
Andrew Sliwinski
fa4fce1b1c
Initial commit
2015-09-02 12:08:58 -07:00