Skip to content

DTT#9763

Merged
caleybrock merged 53 commits into
testfrom
staging
Aug 1, 2016
Merged

DTT#9763
caleybrock merged 53 commits into
testfrom
staging

Conversation

@caleybrock

Copy link
Copy Markdown
Contributor

No description provided.

ashercodeorg and others added 30 commits July 18, 2016 18:26
Puts back a bunch of code I removed to get the old version working again.
Also get everything working nicely in storybook again, with neat randomly-generated sample data.
The survey and the per-level assessment results were only showing properly after changing the course in the teacher dashboard using the dropdown menu.  This fix makes them show properly when the page is initially loaded too.
Conflicts:
	pegasus/sites.v3/code.org/public/teacher-dashboard/index.haml
Because otherwise IE's getBBox grants it an absurdly large width that
breaks block bumping
This is a common pain point for levelbuilders when creating or cloning
external levels; the dsl text requires the level's unique name, but you
can't actually access that name once you're in the edit environment. It
only appears in the header for the page, which is not selectable and
therefore not copyable, and many of the names end up being long enough
that re-typing them is tedius and error-prone.

The simple fix is to have the dsl text default to including the name.
Teacher dashboard: Fix teacher view default course
…ed-dashed-border

Fix unwanted dashed border in Top Instructions
Hamms and others added 23 commits July 29, 2016 11:22
...including changes to reflect current filter settings.
…upport classnames to standard paragraph tag which does

[test ui] [test all]
have user_progress report whether user can see lockable stages
Replaced with a custom reactabular cell transform wrapper to add the correct sort icons to the header cells.
Manually specify blockSvgFramed clippath width
5bf6038 Merge pull request #9750 from code-dot-org/fix-topinstructions-feature-test (Elijah Hamovitz)
5f3e688 Merge pull request #9739 from code-dot-org/hideStagesNonAuthorized2 (Brent Van Minnen)
…lease-unused-blocks

Revert "Revert "enable unusedBlocks everywhere""
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)
survey: tiny fix to teacher dashboard.
Stops showing script and/or level links to admins.
Revert "Modify startAvatars to reflect custom cell sprites"
Add name to DSL Defined External levels default
@caleybrock caleybrock merged commit 7560ca8 into test Aug 1, 2016
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.

8 participants