Reconnecting Token Generator for Annotation Tool [Fix]#3744
Merged
singingwolfboy merged 7 commits intoopenedx:masterfrom May 20, 2014
Merged
Reconnecting Token Generator for Annotation Tool [Fix]#3744singingwolfboy merged 7 commits intoopenedx:masterfrom
singingwolfboy merged 7 commits intoopenedx:masterfrom
Conversation
lduarte1991
referenced
this pull request
in cpennington/edx-platform
May 19, 2014
…her than extracting it from the page
Contributor
|
👍 |
singingwolfboy
added a commit
that referenced
this pull request
May 20, 2014
Reconnecting Token Generator for Annotation Tool [Fix]
|
@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. |
Contributor
Author
|
I can fix the pep8/pylint violations from my files and put them in my next PR. |
lduarte1991
added a commit
to lduarte1991/edx-platform
that referenced
this pull request
Jun 9, 2014
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 sayingdiacritics: ""but now it throws a Name undefied error.