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

Add fakeout choices #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add fakeout choices #1

wants to merge 1 commit into from

Conversation

iturgeon
Copy link
Member

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.

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.
@iturgeon iturgeon requested a review from nathaned December 21, 2018 19:28
@nathaned
Copy link
Contributor

nathaned commented Jan 8, 2019

things I noticed:

  • player needs to be updated to not use jquery
  • some errors/warnings in the console
  • scorescreen is weird with unused labels, should probably make a custom scorescreen

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