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
52a968f6ce
Merge pull request #1427 from TheGrits/patch-3
...
Alphabetize Routes List v2
2017-07-31 08:07:30 -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
0d76d58f5f
Make donate a redirect
2017-07-26 10:26:32 -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
The_Grits
d936d0d9c4
Add -redirect tags + reorder
2017-07-21 09:51:45 -04:00
The_Grits
5fa9c6a05f
Alphabetize Routes List v2
2017-07-21 07:30:42 -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
8561385324
Update name for legacy carousel
2017-07-20 13:56:11 -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
chrisgarrity
4cc353ab43
remove obsolete strings
...
‘Help’ and ‘Discuss’ are not needed now that they’ve been replaced with the Tips page.
Fixes #1362
2017-07-17 10:14:32 -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
chrisgarrity
ced9339fb6
Remove unnecessary ‘^’ from routeAliases
2017-06-29 15:30:26 -04:00
chrisgarrity
ece3d4a1f9
update /help and /info routes
2017-06-29 14:42:17 -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
chrisgarrity
f1cfeeca81
Merge pull request #1390 from chrisgarrity/issue/gh1387
...
Add /info redirect
2017-06-29 07:33:07 -04:00
chrisgarrity
ed056701c4
Add /info redirect
2017-06-28 17:25:36 -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
Matthew Taylor
b22aaa8465
Add /store
to footer
2017-06-26 10:35:29 -04:00
Andrew Sliwinski
a16a189a7f
Update compatibility requirements to clarify support for ChromeOS
2017-06-26 09:42:56 -04:00
Matthew Taylor
df2b7fd7df
Merge pull request #1367 from mewtaylor/issue/gh-1364
...
Fix GH-1364: Change `help` to `tips` in footer
2017-06-23 16:39:19 -04:00
chrisgarrity
6469ac3362
Simplify /help redirect pattern ( #1366 )
...
Restrict /help redirect to just `/help` or `/help/`. Anything else following help should get handled by scratchr2.
2017-06-23 12:02:15 -04:00
Matthew Taylor
c1e5c7cb03
Change help
to tips
in footer
...
Fixes #1364
2017-06-23 11:55:43 -04:00
chrisgarrity
39b1400705
Handle /help redirect ( #1363 )
2017-06-23 10:28:34 -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
Matthew Taylor
dd923aa586
change download route
2017-06-22 10:57:30 -04:00
Andrew Sliwinski
124c8e36d7
Update navigation. Resolves GH-1262 ( #1285 )
2017-06-22 09:40:34 -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
2c7cc52a70
Merge pull request #1359 from mewtaylor/issue/store
...
[Develop] Hotfix: add redirect for store
2017-06-20 15:37:35 -04:00
Matthew Taylor
73b88c850b
Add redirect for store
2017-06-20 14:38:14 -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
670633a459
s/view/redirect
...
thanks @chrisgarrity :)
2017-06-19 11:35: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
7a958f0326
Revert "[Master] Revert PR #1324 "
2017-06-08 15:31:37 -04: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
e7c04044ae
remove ?$
from search expressjs expression
...
I don’t see a reason for this to be here, and it’s breaking the build with the explore change
2017-05-24 17:33:55 -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
a8cf1af73c
Merge pull request #1316 from mewtaylor/issue/explore-projects
...
Fix r2-3978: Use regex in express patterns to limit scope
2017-05-24 12:49:09 -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
Matthew Taylor
87da9f3d8a
Use regex in express patterns to limit scope
...
This fixes https://github.com/LLK/scratchr2/issues/3798 by using regex in expressjs patterns, and then also parsing those regex patterns for fastly, such that we can limit the scope of the regex created for a specific view
2017-05-18 13:57:49 -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
Matthew Taylor
a5281179cd
Merge pull request #1293 from TheGrits/patch-4
...
Fix gh-1292: Dropdown Mobile Un-Friendly
2017-05-08 15:54:51 -04:00
The_Grits
f589ed0f4d
Update dropdown.scss
2017-05-08 10:10:24 -04:00
The_Grits
f901d3b429
Restyle the Download Page
2017-05-03 16:19:56 -04:00
The_Grits
8ae401e861
Move mobile rule
2017-05-03 15:58:14 -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
The_Grits
83baa2ada6
import frameless
2017-04-26 23:14:50 -04:00
The_Grits
8f827d812a
Re-add min-width for mobile
2017-04-26 23:13:24 -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
aed3093bc0
Change invalidation to year
2017-04-21 07:51:03 -04:00
Matthew Taylor
f61fe17353
use birthOffset
for age validation
...
Fixes #1278
2017-04-20 16:47:35 -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
9c50f31ce3
Merge pull request #1270 from TheGrits/patch-4
...
Fix gh-728: Align Misaligned Nav-bar Dropdown
2017-04-19 16:40:15 -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
The_Grits
7c9f6f4fad
Fix gh-728
...
Fixes mis-aligned nav-bar dropdown
2017-04-14 06:46:50 -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
a56c8d0b37
Update jobs route to include moderator
...
Fixes #1265 by updating the logic for checking the route to include an optional moderator endpoint check
2017-04-11 12:57:02 -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
7522be4c03
Merge pull request #1253 from TheGrits/patch-4
...
Fix gh-1194: Remove Scratch Day from Localization
2017-03-22 08:41:51 -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
The_Grits
77bdd356d8
Remove Scratch Day from Localization File
2017-03-20 11:06:28 -04:00
The_Grits
bc43e89d36
Remove localization of Scratch Day
2017-03-20 11:05:52 -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
86b5e462c6
Between, not Around
2017-03-06 16:34:21 -05:00
Matthew Taylor
f76707381a
Merge pull request #1235 from TheGrits/patch-3
...
Fix gh-1234: Update China Conference
2017-03-06 11:10:03 -05:00
Matthew Taylor
56bf384459
Merge pull request #1233 from mewtaylor/issue/max-chars
...
Match `routeAlias` with that of `/jobs` route
2017-03-06 10:23:44 -05:00
Matthew Taylor
8d2a43530e
Merge pull request #1205 from TheGrits/patch-2
...
Fix gh-1183: Remove slashes
2017-03-06 10:11:43 -05:00
The_Grits
46a3cea40c
Fix gh-1234: Update China Conference
2017-03-02 22:14:26 -05:00
Matthew Taylor
2954d0916b
match routeAlias
with that of /jobs
route
...
this `routeAlias` is being added as it’s own path pattern since it’s not matching the other one, causing us to hit our 512 char limit.
2017-02-28 09:55:16 -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
82af7786a0
Put back some slashes
2017-02-28 09:38:43 -05:00
The_Grits
c26e42f715
Change parenthesis
2017-02-28 09:34:20 -05:00
The_Grits
8772ab5605
Fix jobs-moderator route
2017-02-28 09:33:18 -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
Ray Schamp
4e67f95577
Merge pull request #1229 from LLK/release/2.2.18
...
[Develop] Release 2.2.18
2017-02-24 12:05:06 -05:00
The_Grits
55f94eb19c
24 hours => one day
...
zap!
2017-02-23 15:14:03 -05:00
The_Grits
b01c8a44e0
/jobs route
...
R is for route and that's good enough for me
2017-02-23 12:47:42 -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
eb56b27a88
Update otherDisabled
check
...
Fall out from #1217 . We should likely change the way this is set up, it seems not ideal. But not sure the best way atm.
2017-02-23 10:57:27 -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
The_Grits
b75fb7debe
Remove slashes
2017-02-22 11:14:12 -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
dd940235cd
Add language chooser to conf footer
...
thanks @jwzimmer!
2017-02-22 10:31:40 -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
Ray Schamp
d6093f19b0
Fix React key warnings
...
The number of warnings was locking up my browser, making it hard to test things out.
2017-02-20 11:04:41 -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
06ebc88287
Change footer for 2017
...
Take out sponsors
2017-02-17 13:13:03 -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
19757ef730
Update details uri to have 2016 path
2017-02-15 08:44:28 -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
The_Grits
7a9f213cfb
24 hours => one day
2017-02-14 13:35:54 -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
Ray Schamp
05adcde88d
URI-encode search string on form submit
...
This prevents the search form from setting an invalid URL.
Resolves #1153
2017-02-10 18:51:42 -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
2ea8eace6a
Merge pull request #1166 from TheGrits/patch-3
...
Fix gh-1157: Search Redirect
2017-02-08 08:37:21 -05:00
The_Grits
e4ffcf00c3
Remove ajax
2017-02-06 17:00:48 -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
1cc8083137
Travis Fix
2017-02-01 16:15:18 -05:00
The_Grits
ee2cb185bd
Search Redirect
2017-02-01 15:57:04 -05:00
Ray Schamp
22802f87e8
Merge pull request #1160 from TheGrits/patch-3
...
Fix gh-1159: Add 2017 to Teacher Registration
2017-02-01 12:44:23 -05:00
Andrew Sliwinski
c2991fb185
Merge pull request #1155 from TheGrits/patch-4
...
Fix gh-1154: Join Us Section on Developers Page
2017-02-01 10:44:41 -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
32bd01ab88
Automagic Year
2017-01-31 11:01:22 -05:00
The_Grits
d19d0844a9
Add 2017
...
Resolves #1159
2017-01-31 10:10:05 -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
6363a16b47
Merge pull request #1151 from mewtaylor/issue/r2-4219
...
For r2-4451: Change password reset anchor text
2017-01-20 07:49:34 -05:00
Matthew Taylor
b2c32c465a
Merge pull request #1138 from mewtaylor/issue/gh-1097
...
Fix GH-1097: Don’t validate username server side unless it passes client-side checks
2017-01-20 07:48:49 -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
Matthew Taylor
7cfc29f2dc
Update content
...
Thanks @kaschm!
2017-01-19 18:36:28 -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
e1665c2b34
Change password reset anchor text
...
This is part of https://github.com/LLK/scratchr2/pull/4451
2017-01-19 11:12:54 -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
Matthew Taylor
6c589e1dc7
remove test ref
...
whoopsie :)
2016-12-28 10:03:11 -05:00
Matthew Taylor
5da9514f4d
Don’t validate username server side if error
...
Fixes #1097 by not making the server-side username validation call if the client side validations have failed. This is not the ideal way to do this, since it’s getting the input from an array. However, to make this different would require significant refactor.
2016-12-28 09:54:46 -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
Matthew Taylor
ccd6713ef1
get formatMessage
from props
...
Fixes #1125 . I had fixed this last iteration, not sure how it got re-introduced.
2016-12-18 22:08:17 -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
Matthew Taylor
134dbbd3a8
Remove routeAlias
from splash redirect
...
It’s not necessary, and I believe is causing confusion for the faslty config.
2016-12-16 10:41:45 -05:00
Matthew Taylor
34ff8fc50f
Merge pull request #1116 from mewtaylor/issue/remove-hoc-banner
...
Remove HOC Banner
2016-12-16 10:33:57 -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
Matthew Taylor
0111278fa5
Update id string for general error message strings
...
Fixes #1112 , which was created by moving the error message into `general`
2016-12-15 15:32:40 -05:00
Ray Schamp
2539c4cf63
Merge pull request #1110 from rschamp/bugfix/fallback-registration-error
...
Provide fallback error messages
2016-12-13 15:08:42 -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
ba50840809
only apply right margin to radio input
...
fixes #1101 . I wanted to apply a custom class to the input, however that is unfortunately obscured and unreachable with our current implementation of `formsy-react-components`
2016-12-13 12:11:24 -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
83f6bc6892
add slash
...
thanks @rschamp!
2016-12-08 17:37:34 -05:00
Matthew Taylor
d3e6fd48cd
Move out to redirect
2016-12-08 17:20:34 -05:00
Matthew Taylor
b1595caa95
Handle double slash in splash pattern
...
This fixes https://github.com/LLK/scratchr2/issues/4195 by updating the regex to catch two slashes. I decided to intentionally not catch more than 2 – it’ll 404 on 3 or more, which seems appropriate.
2016-12-08 10:19:17 -05:00
Matthew Taylor
11828d2d44
Merge pull request #1099 from mewtaylor/issue/gh-966
...
Fix GH-966: Localize default “required” message
2016-12-08 09:35:57 -05:00
Matthew Taylor
9ae4e5a963
Move validationRequired
into general
...
thanks @rschamp!
2016-12-07 17:24:48 -05:00
Matthew Taylor
6be9fc1084
Localize default “required” message
...
Fixes #966 . I was trying, if possible, to not introduce localization at the component level in order to keep it in the views – but that seemed a bit too involved given that the fix in this way is only a few lines long.
2016-12-06 11:36:24 -05:00
Matthew Taylor
afa25dc1c2
Move other input to be the label for the button
...
thanks @rschamp! Never would’ve thought label would accept html.
2016-12-05 14:05:27 -05:00
Matthew Taylor
cc0496619d
use width for radio buttons, not margin
...
This fixes #962 – the margin was causing flex to overflow the radio buttons when the text was long, causing the male and other options to render on top of each other. This fixes that by giving the radio buttons a fixed with relative to the parent container, and by ensuring that languages with long localizations will still be visible in overflow text.
2016-12-05 12:53:04 -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
Matthew Taylor
12e7326f49
Merge pull request #1069 from mewtaylor/issue/go-page-querystring
...
Remove extra $
2016-11-22 14:58:06 -05:00
Matthew Taylor
788b034f32
Remove extra $
2016-11-22 14:56:27 -05:00
Matthew Taylor
20bc8b874c
Merge pull request #1065 from mewtaylor/issue/go-page-querystring
...
[Staging] Hotfix: allow querystrings for `/go`
2016-11-22 14:22:21 -05:00
The_Grits
52a57b05a7
Localize Search Header
2016-11-22 12:15:17 -05:00
Matthew Taylor
a182367a4e
allow querystrings for /go
...
again, the same as #1004 , but needed too soon for a full fix of this issue.
2016-11-22 10:40:35 -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
chrisgarrity
b58163c420
Merge pull request #1037 from chrisgarrity/patch-column-count
...
fix column count for IE and Edge
2016-11-18 17:42:20 -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
chrisgarrity
0ab62689ce
fix column count for IE and Edge
...
Set column-count for all widths since it’s needed for Firefox, IE and Edge browsers
2016-11-18 17:08:23 -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
d72a605e69
Last tweaks
...
thanks @rschamp!
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
fa380a7148
edit copy/paste error
...
Thanks @chrisgarrity !
2016-11-14 10:31:40 -05:00
Matthew Taylor
95b6d6bd5c
Update microworld iframe modal
2016-11-14 10:31:40 -05:00
Matthew Taylor
484e3d2544
Add ttt modal component
...
This assumes that the parent view that renders it will contain the strings that are specific to the ttt element.
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
652c328cbd
Last tweaks
...
thanks @rschamp!
2016-11-14 08:39:19 -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
Matthew Taylor
c6cd701464
edit copy/paste error
...
Thanks @chrisgarrity !
2016-11-10 09:39:52 -05:00
Matthew Taylor
cbaab105f1
Update microworld iframe modal
2016-11-10 09:39:23 -05:00
The_Grits
6f35550ff4
Add Tutorials Button
...
For #1009
2016-11-09 21:32:58 -05:00