Skip to content

DTP - #4597

Merged
aoby merged 82 commits into
productionfrom
test
Oct 15, 2015
Merged

DTP#4597
aoby merged 82 commits into
productionfrom
test

Conversation

@aoby

@aoby aoby commented Oct 15, 2015

Copy link
Copy Markdown
Contributor

No description provided.

ashercodeorg and others added 30 commits October 13, 2015 12:44
…s these up to the display. Adds a column for the number of students associated with the teacher. Changes routing appropriately.
…condition

Tests will not reliably pass on localhost for mobile browser, because the emulator may pop up a dialog so skipping mobile
Allow ttf files to be cached by proxies
route Activity Monitor logs to the developer room
Increase ajax timeout to 15 seconds
Not sure why this wasn't also failing in other environments.
… Knife, to reduce the window of race-conditions where we try to allocated two nodes with same name
Re-merge "Allow projects with non-ascii asset filenames to be remixed"
deploy-code-org and others added 28 commits October 15, 2015 17:01
Merge staging to level builder
Creates the skeleton of a Search for Teachers page.
Conflicts:
	pegasus/emails/10-15-hoc-general-1.md
Merge staging to level builder
aoby added a commit that referenced this pull request Oct 15, 2015
@aoby
aoby merged commit 47d0d80 into production Oct 15, 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.

10 participants