Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

post lockdown merge staging-next into staging #26331

Merged
merged 291 commits into from Dec 13, 2018
Merged

post lockdown merge staging-next into staging #26331

merged 291 commits into from Dec 13, 2018

Conversation

sureshc
Copy link
Contributor

@sureshc sureshc commented Dec 11, 2018

Checking for merge conflicts and running CircleCI.

Clare Constantine and others added 30 commits November 16, 2018 17:53
Ensure that force_db_access is enabled on staging-next
Revert "Add Tags column to list view, cohort view, and teacher CSVs"
Separate tutorial landing page UI tests
deploy-code-org and others added 23 commits December 10, 2018 23:41
revert i18n sync that was accidentally merged directly to staging-next
Remove rowCount prop from <CourseBlocksHoc/>
Remove teacher-dashboard/landing and course wide blocks
Update to latest version of redactable-markdown
Convert EnrolledWorkshops and EnrolledWorkshopsTable components to ES6
davidsbailey and others added 4 commits December 12, 2018 15:34
@islemaster islemaster merged commit 672099b into staging Dec 13, 2018
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.

None yet