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.

Sign up for GitHub

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

Jump to bottom

Apply folders by feature to Exploration Player and Admin page #6892

Merged
merged 13 commits into from
Jun 12, 2019
Merged

Apply folders by feature to Exploration Player and Admin page #6892

merged 13 commits into from
Jun 12, 2019

Conversation

YashJipkate
Copy link
Contributor

Explanation

This PR applies folders by feature to Exploration Player and Admin page.

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The linter/Karma presubmit checks have passed.
    • These should run automatically, but if not, you can manually trigger them locally using python scripts/pre_commit_linter.py and bash scripts/run_frontend_tests.sh.
  • The PR is made from a branch that's not called "develop".
  • The PR has an appropriate "CHANGELOG: ..." label (If you are unsure of which label to add, ask the reviewers for guidance).
  • The PR follows the style guide.
  • The PR addresses the points mentioned in the codeowner checks for the files/folders changed. (See the codeowner's wiki page.)
  • The PR is assigned to an appropriate reviewer.
    • If you're a new contributor, please ask on Gitter for someone to assign a reviewer and don't tick this checkbox.
    • If you're not sure who the appropriate reviewer is, please assign to the issue's "owner" -- see the "talk-to" label on the issue. Do not only request the review but also add the reviewer as an assignee.

@codecov
Copy link

codecov bot commented Jun 10, 2019 •
edited
Loading

Codecov Report

Merging #6892 into develop will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #6892   +/-   ##
========================================
  Coverage    95.19%   95.19%           
========================================
  Files          371      371           
  Lines        50419    50419           
========================================
  Hits         47995    47995           
  Misses        2424     2424
Impacted Files Coverage Δ
core/controllers/reader.py 81.51% <ø> (ø) ⬆️
core/controllers/admin.py 72.86% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bd95914...d255208. Read the comment docs.

@YashJipkate
Copy link
Contributor Author

Hi @seanlip @kevinlee12 The checks now pass. PTAL!

@oppiabot
Copy link

oppiabot bot commented Jun 11, 2019

Hi @YashJipkate. Due to recent changes in the "develop" branch, this PR now has a merge conflict. Please follow this link if you need help resolving the conflict, so that the PR can be merged. Thanks!

@YashJipkate YashJipkate reopened this Jun 11, 2019
seanlip
seanlip approved these changes Jun 11, 2019
View reviewed changes
Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Happy to merge once checks pass.

@oppiabot
Copy link

oppiabot bot commented Jun 11, 2019

Hi @YashJipkate. Due to recent changes in the "develop" branch, this PR now has a merge conflict. Please follow this link if you need help resolving the conflict, so that the PR can be merged. Thanks!

@YashJipkate YashJipkate reopened this Jun 11, 2019
@YashJipkate
Copy link
Contributor Author

Hi @seanlip @kevinlee12 The tests now pass! Could this be merged?

@oppiabot
Copy link

oppiabot bot commented Jun 12, 2019

Hi @YashJipkate. Due to recent changes in the "develop" branch, this PR now has a merge conflict. Please follow this link if you need help resolving the conflict, so that the PR can be merged. Thanks!

@seanlip
Copy link
Member

seanlip commented Jun 12, 2019

Sorry @YashJipkate, been running around the whole day, but back home and free now. Yep, happy to merge this once tests pass!

@YashJipkate
Copy link
Contributor Author

@seanlip The checks pass now. Could this be merged?

@seanlip seanlip merged commit 419a0f2 into oppia:develop Jun 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@seanlip seanlip seanlip approved these changes

@aks681 aks681 Awaiting requested review from aks681

@AllanYangZhou AllanYangZhou Awaiting requested review from AllanYangZhou

@ankita240796 ankita240796 Awaiting requested review from ankita240796

@apb7 apb7 Awaiting requested review from apb7

@bansalnitish bansalnitish Awaiting requested review from bansalnitish

@brianrodri brianrodri Awaiting requested review from brianrodri

@DubeySandeep DubeySandeep Awaiting requested review from DubeySandeep

@nithusha21 nithusha21 Awaiting requested review from nithusha21

@prasanna08 prasanna08 Awaiting requested review from prasanna08

@vinitamurthi vinitamurthi Awaiting requested review from vinitamurthi

@vojtechjelinek vojtechjelinek Awaiting requested review from vojtechjelinek

Assignees

@kevinlee12 kevinlee12

@seanlip seanlip

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@YashJipkate @seanlip @kevinlee12