Skip to content

DTT#9746

Merged
joshlory merged 65 commits into
testfrom
staging
Jul 29, 2016
Merged

DTT#9746
joshlory merged 65 commits into
testfrom
staging

Conversation

@joshlory

Copy link
Copy Markdown
Contributor

No description provided.

tanyaparker and others added 30 commits July 13, 2016 17:17
- Float image right.
- Format errors and identifiers as code.
- Open links in new window.
- Use asset version of board image.
- Move makerlab dependencies bundle into makerlab/dependencies file
- Remove semicolons after ES6 functions
- Add default "waiting" state for steps which haven't been reached.
- Refactor to use a promise chain for spin/check/fail handling
- Turn off success LEDs after a bit, add extremely necessary thumbs up during song and extra beep at the end
The teacher now sees an explanation that they can't see a student's survey, and nothing more, when attempting to see the student's view of the survey.

Also fix a couple issues in the dots.  Firstly, make the dots click handler go to the correct URL with the teacher's view of the student's work, rather than the teacher's view of their own work, matching the URL that was already shown correctly when hovering.  Secondly, make the click handler do nothing when the level is locked.
Caley Brock and others added 29 commits July 27, 2016 11:08
hook up various applab import dialogs to redux state
…bound this functions. Update instructions. Slower setup song.
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.)
…date

Update maker setup doc, add note on Windows checking
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
add teacher announcement for CSP widgets page
…argin

LevelGroup: Don't indent External sublevel
Conflicts:
	dashboard/app/views/levels/_level_group.haml
…ations

Add level option to pause animations by default
@joshlory joshlory merged commit 9a24497 into test Jul 29, 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