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.

Sign up for GitHub

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

Jump to bottom

V1 of Curriculum-Tools #39

Merged
merged 55 commits into from
Mar 16, 2018
Merged

V1 of Curriculum-Tools #39

merged 55 commits into from
Mar 16, 2018

Conversation

lizTheDeveloper
Copy link
Contributor

In order for us to merge this we need the following issues resolved:

mihaiberq and others added 30 commits November 27, 2017 15:15
@mihaiberq
set up test env, first tests
2479afb
@mihaiberq
Merge branch 'master' into tests
d7e2084
@mihaiberq
contentReader tests
0199476
Added exercise parsing functionality
723b0ea
resolving merge conflict
102ffd8
Workout lib to parse exercises
280f2a3
Rendering Exercises and parsing link keys
b1a6ec2
add some game handing logic
ae7454d
bump v
fc1e1a0
clean up the scripts folder, stop using index.js as a notepad
6889b6f
cleanup scripts
775dc01
temporary workaround for interstitial state.
361b5be
fix up script
561fc33
merge
071c6a7
Remove old algorithm (for when we are done with parent ordering)
764e32e
cleanup code slightly
d7d6487
@lizTheDeveloper
Update package.json
47d9c74
@lizTheDeveloper
update comment
60c4dab
render sections scripts done
ecaab90
merge
edf14fa
add several insight fixtures, add two tests to insight to get everyon…
bea7d7c 
…e started
added test outline
36c3bd1
Added step to parse Exercises in workout
99c066a
Merging with master
9a270a1
Resolving merge conflict
564bc22
Resolving merge conflict
7293218
Appending exercises to Workout model
180b25a
Resolving merge conflict
d5a0142
[Squash] Appending exercise data to workout object
b678af2
Resolving merge conflict
c45e8a5
Liz Howard and others added 18 commits February 23, 2018 17:34
add exercises to v1
0ba9948
ugh didn't save
0f14c61
add findBySlug
dedbaf3
merge
06316b8
merging tests into v1 branch, also added a method for getting element…
fc79377 
…s by their slug and element
added a file that will break all your tests
ea591e6
Fixed obscure bug where Revision existed as an h3
87caed7
@lizTheDeveloper
Merge pull request #42 from enkidevs/patch-of-v1
f497fac 
Fixed obscure h3 bug
@lizTheDeveloper
Update package.json
3bd7338
added workout fixture with standards-aligned exercises
e1475e4
fixed up standards parser, added an analytics script
ed0854b
bump v up one major number
d9d5fad
add standards parser that works properly
195cb9b
bump v
3925a63
update standards analyics script
e32c247
fix tests
a83e4e8
remove logging statement
e64c54f
@lizTheDeveloper
Merge pull request #44 from enkidevs/add-standards-parser
6e79c40 
Add standards parser
@loopiezlol loopiezlol merged commit 6e79c40 into master Mar 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mihaiberq mihaiberq

@loopiezlol loopiezlol

@milesflo milesflo

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lizTheDeveloper @mihaiberq @loopiezlol @milesflo