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

Reconnecting Token Generator for Annotation Tool [Fix] #3744

Merged
merged 7 commits into from
May 20, 2014

Conversation

lduarte1991
Copy link
Contributor

Background: Follows PR #3466 which was reverted and pulled from master because of an error during staging.

Instructions: In order to instantiate the tool head over to Advanced Settings for the course and add "textannotation" to the advanced_modules key. Then create a new unit. An "Advanced" large green button should show up that when clicked will allow you to select the "Text Annotation" option. It will show a default testing image. Make sure that the annotation_storage_url and annotation_secret_token are filled in with test values in the course's Advanced Settings.

CMS Update: None.

LMS Update: The offending line below is number 149. It should never have been in this PR at all, but rather PR #3480. In previous builds you could have ${diacritic_marks} and if the variable didn't exist it would just resolve to empty string. Thus saying diacritics: "" but now it throws a Name undefied error.

lduarte1991 referenced this pull request in cpennington/edx-platform May 19, 2014
@singingwolfboy
Copy link
Contributor

👍

singingwolfboy added a commit that referenced this pull request May 20, 2014
Reconnecting Token Generator for Annotation Tool [Fix]
@singingwolfboy singingwolfboy merged commit 6e0e130 into openedx:master May 20, 2014
@cahrens
Copy link

cahrens commented May 20, 2014

@singingwolfboy There are some pep8/pylint violations that should be cleaned up. It would also be good to get tests for the "raw" changes in the pipeline file.

@lduarte1991
Copy link
Contributor Author

I can fix the pep8/pylint violations from my files and put them in my next PR.

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.

3 participants