Skip to content

Deploy to levelbuilder#9754

Merged
joshlory merged 206 commits into
levelbuilderfrom
test
Jul 29, 2016
Merged

Deploy to levelbuilder#9754
joshlory merged 206 commits into
levelbuilderfrom
test

Conversation

@joshlory

Copy link
Copy Markdown
Contributor

No description provided.

Hamms and others added 30 commits June 20, 2016 13:06
- Float image right.
- Format errors and identifiers as code.
- Open links in new window.
- Use asset version of board image.
# Conflicts:
#	apps/src/feedback.js
#	dashboard/app/controllers/activities_controller.rb
#	dashboard/app/helpers/users_helper.rb
#	dashboard/app/models/user.rb
#	dashboard/app/views/shared/_concept_trophy_block.html.haml
#	dashboard/test/dsl/dsl_test.rb
#	dashboard/test/helpers/users_helper_test.rb
- Move makerlab dependencies bundle into makerlab/dependencies file
- Remove semicolons after ES6 functions
deploy-code-org and others added 29 commits July 27, 2016 19:43
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
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 a06e767 into levelbuilder 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.