Skip to content

Commit

Permalink
Merge pull request #27637 from code-dot-org/dtp_candidate_3936a43f
Browse files Browse the repository at this point in the history
DTP (Test > Production: 3936a43)
  • Loading branch information
breville committed Mar 22, 2019
2 parents e9f3c28 + 3936a43 commit 71646e4
Show file tree
Hide file tree
Showing 629 changed files with 28,567 additions and 10,915 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Code.org

[![Circle CI](https://circleci.com/gh/code-dot-org/code-dot-org/tree/staging.svg?style=svg)](https://circleci.com/gh/code-dot-org/code-dot-org/tree/staging)
[![Coverage Status](https://codecov.io/gh/code-dot-org/code-dot-org/branch/staging/graph/badge.svg)](https://codecov.io/gh/code-dot-org/code-dot-org)

Welcome! You've found the source code for [the Code.org website](https://code.org/) and [the Code Studio platform](https://studio.code.org/). Code.org is a non-profit dedicated to expanding access to computer science education. You can read more about our efforts at [code.org/about](https://code.org/about).
Expand Down
2 changes: 1 addition & 1 deletion SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ Many Windows developers have found that setting up an Ubuntu virtual machine is
* run `ssh yourname-ec2` to connect to your instance
1. Go back up to the [overview](#overview) and run the commands there.
1. Once you have successfully completed `rake build`, you can connect to it as follows:
* run `ssh -L 3000:127.0.0.1:3000 yourname-ec2 ~/code-dot-org/bin/dashboard-server` on your local machine. This sets up SSH port forwarding from your local machine to your ec2 dev instance for as long as your dashboard server is running.
* run `ssh -L 3000:127.0.0.1:3000 yourname-ec2` and then `~/code-dot-org/bin/dashboard-server` on your local machine. This sets up SSH port forwarding from your local machine to your ec2 dev instance for as long as your ssh connection is open.
* navigate to http://localhost-studio.code.org:3000/ on your local machine

## Enabling JavaScript builds
Expand Down
6 changes: 5 additions & 1 deletion apps/docs/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ different configurations get run. Here is the approximate flow of commands/files
serving the exact same assets. Cloudfront provides a caching layer in front
of this.

### Replicating production behavior locally
### Replicating production behavior locally (long way)

Sometimes, bugs may show up only in production (or circle ci) and not locally
under development configurations. Usually these bugs are related to the build
Expand All @@ -216,3 +216,7 @@ will need to redo steps 2-4. Relying on watch mode won't work. If you are having
a hard time wrapping your head around the minified bundles which get used with
this configuration, you can try changing `pretty_js` back to `true`
so that the unminified files get served instead.

### Replicating production behavior locally (short way)

If you believe that the production behavior you are observing has only to do with the js being minified and not with the dashboard asset pipeline, you can quickly build minified JS locally by running `npm run build:dist:debug`. **WARNING** this will output minified js with the `.js` suffix, without the `.min` suffix. If you do this, it's on you to remember to do a regular `npm run build` to get back into a normal state.
4 changes: 4 additions & 0 deletions apps/envConstants.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ module.exports = {
CDO_VERBOSE_TEST_OUTPUT: getBoolEnv('CDO_VERBOSE_TEST_OUTPUT'),
// If set, will build uncompressed JS
DEV: !!getMoocEnv('DEV'),
// enable sourceMaps and skip adding .min suffix when building minified js,
// making it easier to debug and iterate quickly. For details, see:
// https://github.com/code-dot-org/code-dot-org/blob/staging/apps/docs/build.md
DEBUG_MINIFIED: !!getMoocEnv('DEBUG_MINIFIED'),
// Used by karma to force singleRun mode
WATCH: !!getMoocEnv('WATCH'),
// If set, will collect code coverage info
Expand Down
4 changes: 2 additions & 2 deletions apps/i18n/bounce/ro_ro.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"playSoundRetro": "redă sunet retro",
"playSoundRubber": "redă sunet de cauciuc",
"playSoundSlap": "redă sunet de plezneală",
"playSoundSlapshot": "redă sunet de lovitură palmă",
"playSoundSlapshot": "redă sunet de lovitură cu palma",
"playSoundSwish": "redă sunet de şuierat de plasă",
"playSoundTooltip": "Redă sunetul ales.",
"playSoundWhistle": "redă sunet de fluier",
Expand Down Expand Up @@ -122,7 +122,7 @@
"setTeam": "Seteaza echipa {team}",
"setTeamRandom": "Seteaza echipa la întâmplare",
"shareBounceTwitter": "Hai să vezi ce joc de ricoșeu am făcut. L-am realizat eu insămi cu @codeorg",
"shareBounceTwitterDonor": "Check out joc Bounce am făcut. (Mulțumesc {donor} pentru sprijinirea @codeorg)",
"shareBounceTwitterDonor": "Ia uite ce joc Bounce am făcut. (Mulțumesc {donor} pentru sprijinirea @codeorg)",
"shareGame": "condivide jocul tău:",
"turnLeft": "ia-o la stânga",
"turnRight": "ia-o la dreapta",
Expand Down
2 changes: 1 addition & 1 deletion apps/i18n/common/cs_cz.json
Original file line number Diff line number Diff line change
Expand Up @@ -1127,4 +1127,4 @@
"workspaceHeaderShort": "Pracovní prostor: ",
"yes": "Ano",
"yourSchoolTellUs": "Povězte nám o vaší škole"
}
}
5 changes: 5 additions & 0 deletions apps/i18n/common/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@
"deleteSection": "Delete Section",
"deleteSectionConfirm": "Are you sure you want to delete this section? You will not be able to undo this.",
"deleteSectionHideSuggestion": "If you simply want to remove this section from your list of sections, consider using the 'Hide section' option instead.",
"deleteUsedImage": "{name} is used in {value} {places} in this app. If you delete it, the image will not appear in any of those places. Are you sure you want to delete it?",
"deleting": "Deleting",
"designMode": "Design",
"dialogCancel": "Cancel",
Expand Down Expand Up @@ -939,6 +940,8 @@
"personalLoginDialog_body5": "on how they can create a personal login. Give them at least a few days to follow these instructions BEFORE you delete your account.",
"personalLoginDialog_body6": "If you have already done this, click “Next” to continue with account deletion.",
"personalLoginDialog_button": "Next",
"place": "place",
"places": "places",
"play": "play",
"playzoneArtistDescription": "Draw cool pictures and designs with the Artist!",
"playzoneArtistTitle": "New Drawing",
Expand Down Expand Up @@ -1434,6 +1437,7 @@
"vocabulary": "Vocabulary",
"volunteer": "Volunteer/Community Advocate",
"wantToLearn": "Want to learn to code?",
"warning": "Warning",
"watchVideo": "Watch the Video",
"welcomeToDanceParty": "Welcome to Dance Party!",
"when": "when",
Expand All @@ -1448,6 +1452,7 @@
"wrongUnitVersionWarningDetails": "We noticed you have progress in an older version of this course. You can go back to that version any time by going to the course page and selecting the version of the course you want.",
"yes": "Yes",
"yesNo": "Yes / No",
"yesSure": "Yes, I'm sure",
"youCannotUndoThisAction": "You cannot undo this action.",
"yourEmail": "Private contact email",
"yourEmailPlaceholder": "you@example.com",
Expand Down
13 changes: 13 additions & 0 deletions apps/i18n/common/es_es.json
Original file line number Diff line number Diff line change
Expand Up @@ -608,8 +608,10 @@
"featured": "Destacado",
"featureUnpublishedWarning": "Este proyecto no está publicado actualmente. Todavía se puede marcar como destacado, pero no se mostrará en la galería hasta que el propietario lo publique.",
"feedback": "Sugerencias",
"feedbackCommentAreaHeader": "Comentario del profesor",
"feedbackFrom": "Sugerencias de {teacher}",
"feedbackLoadError": "Ha habido un error al establecer una conexión a nuestros servidores. Por favor refresca la página y vuelve a intentarlo.",
"feedbackNotSavedWarning": "¿Estás seguro? Tus comentarios no serán guardados.",
"feedbackPlaceholder": "Introduza las sugerencias para su alumno aquí. Se harán visibles para su alumno al hacer clic en \"Guardar y compartir\".",
"feedbackSaveError": "Hubo un error en salvar su retroalimentación. Por favor intenta salvarlo de nuevo.",
"fewerNumberOfBlocks": "Menos de {numBlocks, plural, one {1 bloque} other {# bloques}}",
Expand Down Expand Up @@ -1090,7 +1092,12 @@
"record": "Grabar",
"recording": "Grabando",
"recordAudio": "Grabar audio",
"redirectConfirm": "¿Quieres visitar esta página web?",
"redirectCourseVersionWarningDetails": "Parece que accidentalmente fuiste a una versión desactualizada del curso. Has sido redirigido a una versión recomendada o a la versión asignada por tu profesor.",
"redirectExplanation": "Este es un enlace a un sitio web externo que no opera ni es supervisado por Code.org y no sigue, por tanto, las políticas de privacidad de Code.org. Por favor, comuníquenos si este link es inseguro o muestra contenidos inapropiados: ",
"redirectRejectExplanation": "Esta aplicación está intentando abrir un sitio web que parece no ser seguro.",
"redirectRejectTitle": "Se ha detectado navegación por un sitio web inseguro",
"redirectTitle": "Estás saliendo de esta aplicación",
"reloadPage": "Recargar página",
"relockStage": "Etapa de re-bloqueo",
"relockStageInstructions": "\"Etapa de re-bloqueo\" para prevenir compartir respuestas con otras clases/escuelas.",
Expand Down Expand Up @@ -1123,6 +1130,12 @@
"reviewDocuments": "Revisar documentos",
"reviewResponses": "Ve a la pestaña de evaluación/encuesta para que tu sección revise las respuestas de estudiantes.",
"rotateText": "Gira tu dispositivo.",
"rubricHeader": "Rúbrica de evaluación ",
"rubricApproachesHeader": "Enfoques",
"rubricExceedsHeader": "Excede",
"rubricKeyConceptHeader": "Concepto clave",
"rubricMeetsHeader": "Cumple con",
"rubricNoEvidenceHeader": "Sin prueba",
"runProgram": "Ejecutar",
"runTooltip": "Ejecuta el programa definido por los bloques del espacio de trabajo.",
"runtimeErrorMsg": "Tu programa no se ejecutó correctamente. Elimina la línea {lineNumber} e inténtalo de nuevo.",
Expand Down

0 comments on commit 71646e4

Please sign in to comment.