Skip to content

Level builder changes#9745

Merged
joshlory merged 3 commits into
stagingfrom
levelbuilder
Jul 29, 2016
Merged

Level builder changes#9745
joshlory merged 3 commits into
stagingfrom
levelbuilder

Conversation

@joshlory

Copy link
Copy Markdown
Contributor

No description provided.

breville and others added 3 commits July 28, 2016 11:30
Use an accessor to correctly check free response user uploads flag when it's included in a LevelGroup.  This allows it to deal with free response levels defined in .level files, as well as those that are DS_defined.  (One had "false", the other had false.)
Level group: fix free response validation
@joshlory joshlory merged commit 9b03d61 into staging Jul 29, 2016
deploy-code-org added a commit that referenced this pull request Jul 29, 2016
26780fa Merge pull request #9721 from code-dot-org/netsim-teacher-view (Brad Buchanan)
751ca8a Automatically built. (Continuous Integration)
da1d1b8 Merge pull request #9748 from code-dot-org/bump-block-svg-framed (Elijah Hamovitz)
f646303 Fix tests by passing locale into component (Brad Buchanan)
5bf6038 Merge pull request #9750 from code-dot-org/fix-topinstructions-feature-test (Elijah Hamovitz)
4de1a32 Removes last .new-router-log-modal style (Brad Buchanan)
2821f6e Move most styles into JSX (Brad Buchanan)
5f3e688 Merge pull request #9739 from code-dot-org/hideStagesNonAuthorized2 (Brent Van Minnen)
d327da6 move uitest-specific className from custom Component which does not support classnames to standard paragraph tag which does (Elijah Hamovitz)
c53f0ac Use px for filters marginBottom (Brad Buchanan)
31be25a Move sort methods onto the component (Brad Buchanan)
952a54e Indent conditional component (Brad Buchanan)
50cd059 Restore localized log browser header (Brad Buchanan)
e38b4f8 Manually specify blockSvgFramed clippath width (Elijah Hamovitz)
cf3c84e Merge pull request #9742 from code-dot-org/topInstructions-fix-unwanted-dashed-border (Elijah Hamovitz)
06d30ae Merge pull request #9744 from code-dot-org/fix-survey-view (Brendan Reville)
9b03d61 Merge pull request #9745 from code-dot-org/levelbuilder (Josh Lory)
26501e2 Level builder changes (Continuous Integration)
0cbfc1e Content changes (Continuous Integration)
3d4ef73 Merge branch 'staging' into fix-survey-view (Brendan Reville)
169026f Merge pull request #9702 from code-dot-org/touch-tunneling-fix (Caley Brock)
c863139 Merge pull request #9740 from code-dot-org/prevent-auto-starting-animations (Brad Buchanan)
12ee7ac Merge pull request #9729 from code-dot-org/survey-fixes (Brendan Reville)
c3af7a1 Merge branch 'staging' into survey-fixes (Brendan Reville)
98ace8a Teacher dashboard: Fix teacher view default course (Brendan Reville)
564d930 chat bubble tip stroke should default to none rather than white (Elijah Hamovitz)
9fba967 Clean up test syntax from code review (Caley Brock)
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.

3 participants