Add fakeout choices - #1
Open
iturgeon wants to merge 1 commit into
Open
Conversation
Merge remote-tracking branch 'origin' into fixup switched fakeout options to be buttons instead of divs removed unnecessary code shifted label movement to account for extra term text added x button for fakeout list minor final fakeout improvements refined edit behavior renamed and restyled elements improved checks for scoring fixed scoring null bug accounts for fakeouts when checking if done adjusted styling for fakeouts removed duplicate method and made the fakeout list p elements updated player to support unused labels Merge branch 'issue/588-limit-label-text' into 'master' Issue/588 limit label text See merge request materia/labeling!24 Merge branch 'master' into issue/588-limit-label-text Merge branch 'issue/588-label-text-scroll' into 'master' Issue/588 Large labels scroll vertically See merge request materia/labeling!9 Merge branch 'issue/571-skip-resizing-on-new-image' into 'master' Removed the resizing step on a new image See merge request materia/labeling!15 Merge remote-tracking branch 'origin' into issue/571-skip-resizing-on-new-image Merge branch 'issue/922-no-html-titles' into 'master' Prevents <script> tags from firing from title See merge request materia/labeling!19 Add LICENSE optimize assets, remove jquery from player v1.0.1 Merge branch 'issue/convert-to-webpack' into 'master' Converts from gulp to webpack via Mateira dev kit See merge request materia/labeling!21 Updated MWDK dependency and README Adjusted MWDK requirement, removed materia.score.js requirement from player. converts from gulp to webpack via Mateira dev kit remove requirement for backend/config.json to compile removed duplicate lines and added padding to labels added side padding for labels Merge branch 'master' of clu.cdl.ucf.edu:materia/labeling into issue/588-label-text-scroll Merge branch 'master' of clu.cdl.ucf.edu:materia/labeling into issue/571-skip-resizing-on-new-image Removed turning on the boardcover after import Removed the resizing step on a new image Merge branch 'master' into issue/588-label-text-scroll Added onkeypress function to limit label text Added onkeypress function to set text limit for labels.
Contributor
|
things I noticed:
|
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
2 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.
Merge remote-tracking branch 'origin' into fixup
switched fakeout options to be buttons instead of divs
removed unnecessary code
shifted label movement to account for extra term text
added x button for fakeout list
minor final fakeout improvements
refined edit behavior
renamed and restyled elements
improved checks for scoring
fixed scoring null bug
accounts for fakeouts when checking if done
adjusted styling for fakeouts
removed duplicate method and made the fakeout list p elements
updated player to support unused labels
Merge branch 'issue/588-limit-label-text' into 'master'
Issue/588 limit label text
See merge request materia/labeling!24
Merge branch 'master' into issue/588-limit-label-text
Merge branch 'issue/588-label-text-scroll' into 'master'
Issue/588 Large labels scroll vertically
See merge request materia/labeling!9
Merge branch 'issue/571-skip-resizing-on-new-image' into 'master'
Removed the resizing step on a new image
See merge request materia/labeling!15
Merge remote-tracking branch 'origin' into issue/571-skip-resizing-on-new-image
Merge branch 'issue/922-no-html-titles' into 'master'
Prevents <script> tags from firing from title
See merge request materia/labeling!19
Add LICENSE
optimize assets, remove jquery from player
v1.0.1
Merge branch 'issue/convert-to-webpack' into 'master'
Converts from gulp to webpack via Mateira dev kit
See merge request materia/labeling!21
Updated MWDK dependency and README
Adjusted MWDK requirement, removed materia.score.js requirement from player.
converts from gulp to webpack via Mateira dev kit
remove requirement for backend/config.json to compile
removed duplicate lines and added padding to labels
added side padding for labels
Merge branch 'master' of clu.cdl.ucf.edu:materia/labeling into issue/588-label-text-scroll
Merge branch 'master' of clu.cdl.ucf.edu:materia/labeling into issue/571-skip-resizing-on-new-image
Removed turning on the boardcover after import
Removed the resizing step on a new image
Merge branch 'master' into issue/588-label-text-scroll
Added onkeypress function to limit label text
Added onkeypress function to set text limit for labels.