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

Bug/settings page studio #103

Merged
merged 7 commits into from
Feb 6, 2017
Merged

Bug/settings page studio #103

merged 7 commits into from
Feb 6, 2017

Conversation

dorosh
Copy link

@dorosh dorosh commented Feb 6, 2017

No description provided.

Copy link

@z4y4ts z4y4ts left a comment

Choose a reason for hiding this comment

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

Looks good to me. Remove pylint thing and it's good to go.
Please remember to squash.

@@ -92,10 +92,11 @@ def download_default_transcript(self, url): # pylint: disable=unused-argument
def customize_xblock_fields_display(editable_fields): # pylint: disable=unused-argument
Copy link

Choose a reason for hiding this comment

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

You can now remove pylint muting

-fill method customize_xblock_fields_display for return video fields
@dorosh dorosh force-pushed the bug/settings-page-studio branch from 496de26 to e0077db Compare February 6, 2017 13:19
@dorosh dorosh merged commit d934373 into dev Feb 6, 2017
z4y4ts added a commit that referenced this pull request Feb 6, 2017
…codeclimate

* commit 'd9343737e8092535da4fdc3cbdaaf3690080d090':
  Bug/settings page studio (#103)
z4y4ts added a commit that referenced this pull request Feb 6, 2017
* dev:
  Bug/settings page studio (#103)
  Fix saving playback progress by correctly reading it from localStorage (#102)
z4y4ts added a commit that referenced this pull request Feb 9, 2017
* dev:
  Add markdownlint to .codeclimate.yml and fix minor README.md issues (#105)
  Tweak .travis.yml for faster build times and bump XBlock dependency (#113)
  Refactoring of exceptions (#114)
  added statuses constants (#111)
  Add comments into .editorconfig with a link to download page
  Add Default transcripts upload and Brightcove HLSe (#104)
  Bug/settings page studio (#103)
  Fix saving playback progress by correctly reading it from localStorage (#102)
  Move bower.json to root directory, add .bowerrc, add make deps target (#101)

# Conflicts:
#	.travis.yml
#	Makefile
#	requirements.txt
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.

2 participants