Skip to content

DTP (test > production)#9452

Merged
ashercodeorg merged 50 commits into
productionfrom
test
Jul 12, 2016
Merged

DTP (test > production)#9452
ashercodeorg merged 50 commits into
productionfrom
test

Conversation

@ashercodeorg

Copy link
Copy Markdown
Contributor

No description provided.

mehalshah and others added 30 commits July 4, 2016 23:05
Some of the new CSF chatbubble-style TopInstructions changes required
making a change to MarkdownInstructions. Unfortunately, this component
is also used by non-CSF TopInstructions, which caused an unintentional
eyes failure. This fix reverts non-CSF instructions to the old style
while keeping CSF instructions looking as they did.
…nplugged

Titles in bubbles can be either strings or numbers
Conflicts:
	apps/src/code-studio/progress.js
	apps/test/code-studio/progressTest.js
… render the title if we were on a course overview page, are not showing an icon, and are not showing the level name [test ui]
Do not render the title in a bubble if we are rendering an icon. Only…
…d-CSP-MarkdownInstructions

Separate MarkdownInstructions styles for CSF and CSP
deploy-code-org and others added 20 commits July 12, 2016 16:13
…bubbles

Revert "Do not render the title in a bubble if we are rendering an icon. Only…"
…_types_for_unplugged

Revert "Titles in bubbles can be either strings or numbers"
…rators

Fixes violations of and reenables Style/SpaceAroundOperators.
Creates the bin/archive/ directory and README, moving messages-sent-to in it.
…inally

Revert "Merge pull request #9293 from code-dot-org/peer_review_ui_2"
@ashercodeorg ashercodeorg merged commit d0a8291 into production Jul 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants