Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(03-interactive): reorganiza retos de código de 01-making-your-site-interactive #364

Merged
merged 51 commits into from
Oct 31, 2017
Merged

chore(03-interactive): reorganiza retos de código de 01-making-your-site-interactive #364

merged 51 commits into from
Oct 31, 2017

Conversation

ivandevp
Copy link
Contributor

No description provided.

@ivandevp
reduce el scope de los code-challenges en 00-html-and-css
77c2268
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
d692360 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
6a664d0 
…cula-js into 03-interactive
@ivandevp
resuelve conflictos de actualización
7778156
@ivandevp
quita el reto de Twitter y actualiza porcentajes en evaluación
6701ded
@ivandevp
Merge branch '03-interactive' of https://github.com/ivandevp/curricul…
b201f57 
…a-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
a0aecf8 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
dbd58e0 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
94a79be 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
1913fc4 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/ivandevp/curricul…
e91fa72 
…a-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
ddb30c1 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
b2e1c2d 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
406f78e 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
0357329 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/ivandevp/curricul…
4fe4629 
…a-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
1b0f6ca 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/ivandevp/curricul…
2d762ec 
…a-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
4b8aeec 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
de0eb03 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
537bf20 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
6f867bd 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
77f4e11 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
af93b30 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
4fe6003 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
60d765d 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
51e3126 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
0a6b6cf 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
d301bb5 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
baa4fd6 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
aed97f8 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
09aa36f 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
6250e73 
…cula-js into 03-interactive
@ivandevp
actualiza README.md en base a actualización de contenido de la unidad…
036474e 
…es 1, 2 y 3
@ivandevp
Merge branch '03-interactive' of https://github.com/ivandevp/curricul…
9916edf 
…a-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
b947e20 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
dd1d915 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
9befd2f 
…cula-js into 03-interactive
@ivandevp
actualiza cambios de rama master
f8264e9
@ivandevp
Merge branch '03-interactive' of https://github.com/ivandevp/curricul…
0892251 
…a-js into 03-interactive
@ivandevp
soluciona conflictos de merge
1088938
@ivandevp
actualiza rama con master
22f9dcb
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
a1caddc 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
652d0a3 
…cula-js into 03-interactive
@ivandevp
agrega talleres 6 y 7 de HSE
0e35951
@ivandevp
Merge branch '03-interactive' of https://github.com/ivandevp/curricul…
8ac068f 
…a-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
5cc1ddd 
…cula-js into 03-interactive
@ivandevp
Merge branch '03-interactive' of https://github.com/Laboratoria/curri…
f51c6fe 
…cula-js into 03-interactive
@ivandevp
cambia orden de retos de código, haciendo opcional
d6057e4
@ivandevp
limpia el markdown en base al linter
90c0e3b
@ivandevp
Merge branch '03-interactive' of https://github.com/ivandevp/curricul…
7b2bef6 
…a-js into 03-interactive
@ivandevp ivandevp added chore Tareas pertinentes al equipo de mantenimiento content Relacionado al contenido de proyectos y tópicos enhancement New feature or request labels Oct 31, 2017
@ivandevp ivandevp self-assigned this Oct 31, 2017
@ivandevp ivandevp merged commit f56b002 into Laboratoria:03-interactive Oct 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ivandevp ivandevp

Labels
chore Tareas pertinentes al equipo de mantenimiento content Relacionado al contenido de proyectos y tópicos enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ivandevp