Skip to content

Merge staging to level builder#4289

Merged
ashercodeorg merged 98 commits into
levelbuilderfrom
staging
Oct 1, 2015
Merged

Merge staging to level builder#4289
ashercodeorg merged 98 commits into
levelbuilderfrom
staging

Conversation

@ashercodeorg

Copy link
Copy Markdown
Contributor

No description provided.

caleybrock and others added 30 commits September 16, 2015 13:49
- Remove 2.0.0 version constraints from Gemfile
- Run Travis tests on 2.2.3 and 2.0.0
update hoc events page with new nav
cpirich and others added 28 commits September 30, 2015 14:40
enable annotations for playlab, add clearRuntimeAnnotations()
commit 61b0b53
Merge: e5b2318 c115392
Author: Chris Pirich <chris@code.org>
Date:   Wed Sep 30 14:40:35 2015 -0700

    Merge pull request #4273 from code-dot-org/playlab_annotations

    enable annotations for playlab, add clearRuntimeAnnotations()

commit e5b2318
Merge: aad7706 d3089ea
Author: Will Jordan <wjordan@users.noreply.github.com>
Date:   Wed Sep 30 14:28:56 2015 -0700

    Merge pull request #4267 from code-dot-org/session_key

    Refactor environment-specific session key and storage_id cookie constants
Promote layout on hourofcode.com
Rename foo.js.erb files to foo.js if they contain no embedded Ruby
Add Javascript clientState helper.  Introduce Mocha+Chai JS test framework for dashboard.
checking in scripts used to send hoc mail today (-laurel)
back merging scripts used to send hoc mail today (-laurel)
ashercodeorg added a commit that referenced this pull request Oct 1, 2015
Merge staging to level builder
@ashercodeorg ashercodeorg merged commit 5e4eef8 into levelbuilder Oct 1, 2015
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.