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.

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

DTL (Test > Levelbuilder: e5a5ba41) #16894

Merged
merged 199 commits into from Aug 7, 2017
Merged

Conversation

ashercodeorg
Copy link
Contributor

No description provided.

Erin Peach and others added 30 commits July 24, 2017 14:44
…ode-dot-org/code-dot-org into section-flow-teacher-dashboard

Conflicts:
	apps/src/templates/studioHomepages/Sections.jsx
	apps/src/templates/studioHomepages/SetUpMessage.jsx
	apps/src/templates/teacherDashboard/AddSectionDialog.jsx
	apps/src/templates/teacherDashboard/EditSectionForm.jsx
	apps/src/templates/teacherDashboard/LoginTypeCard.jsx
…ode-dot-org/code-dot-org into section-flow-teacher-dashboard

Conflicts:
	apps/src/templates/studioHomepages/Sections.jsx
breville and others added 28 commits August 6, 2017 01:31
…both organizeres and facilitators - workshops they organied but didn't facilitated (and vice versa) were being omitted
…margin

Content container: add some breathing room below description
Add Bounce, Basketball & Sports project pages
DTT (Staging > Test) [robo-dtt]
Update React from 15.3.2 to 15.4.2
Add mirrored constant warning to SharedConstants.
Stub StorageApps in a scoped fashion.
LevelSources are now shared with R links on the client
Revert "Stub StorageApps in a scoped fashion."
…tor-sounds

Only use three of the available collector collect sounds
Increase memory for `npm run build:dist`
…rganizers_who_are_facilitators

Fix load collection for organizers who are facilitators
@ashercodeorg ashercodeorg merged commit 0b9f1cf into levelbuilder Aug 7, 2017
@deploy-code-org deploy-code-org deleted the dtp_candidate_e5a5ba41 branch August 7, 2017 23:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet