Skip to content

evening DTT#9724

Merged
davidsbailey merged 39 commits into
testfrom
staging
Jul 27, 2016
Merged

evening DTT#9724
davidsbailey merged 39 commits into
testfrom
staging

Conversation

@davidsbailey

Copy link
Copy Markdown
Member

unresolved failures from previous DTT:

  • Chrome44XP_copypaste
  • IE11Win10_blockTrashing

Josh Lory and others added 30 commits June 21, 2016 15:40
# 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
Add when_up/down/left/right blocks to toolbox editor
Show a warning for logged in under 13 applab users
Gamelab: Accept strings in addition to constants for mouse blocks
@davidsbailey davidsbailey merged commit a1d58c6 into test Jul 27, 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