Prod#33

Open

creighton wants to merge 98 commits into

adlnet-archive:masterfrom

Commits on Dec 16, 2013

Commits on Dec 17, 2013

Commits on Dec 18, 2013

added mybadges page and fixed xml error
Lou Wolford
committed
started perf stuff
creighton
committed
added getComponent
creighton
committed
fixed misspelling
Lou Wolford
committed
merged with tomMerge branch 'performance' of https://github.com/creighton/competency-example into tetris
Lou Wolford
committed
merged with tom againMerge branch 'performance' of https://github.com/creighton/competency-example into tetris
Lou Wolford
committed
adding some fns
creighton
committed
added update fns
creighton
committed
added perf funcs
Lou Wolford
committed
fixed issue
creighton
committed
Merge pull request #12 from creighton/performance
Lou Wolford
committed
pulled from upstreamMerge branch 'performance' of https://github.com/adlnet/competency-example into tetris
Lou Wolford
committed

Commits on Dec 19, 2013

added my badges page that works
Lou Wolford
committed
Merge pull request #13 from ljwolford/tetris
creighton
committed

Commits on Dec 23, 2013

added admin and all comps page
Lou Wolford
committed
added fwk form back in
Lou Wolford
committed
forgot to include perf parse
Lou Wolford
committed
changed lrs endpoint
creighton
committed
added parse fwk to reset
Lou Wolford
committed
added check for tetris comps
Lou Wolford
committed
added check for tetris comps in template
Lou Wolford
committed
Merge pull request #14 from ljwolford/tetris
creighton
committed
Merge branch 'performance' of github.com:adlnet/competency-example into performance
creighton
committed

Commits on Jan 3, 2014

tweaked code for www. mishap and lrs endpoint
techteam
committed

Commits on Jan 6, 2014

Commits on Jan 7, 2014

Commits on Jan 8, 2014

Commits on Jan 9, 2014

Merge pull request #18 from creighton/performance
Lou Wolford
committed
added programming quizzes
Lou Wolford
committed
merged nav bar link changes
Lou Wolford
committed
added last quiz
Lou Wolford
committed
Merge pull request #19 from ljwolford/tetris
creighton
committed
nothing really
creighton
committed
Merge branch 'performance' of github.com:adlnet/competency-example into performance
creighton
committed
Merge branch 'performance' of github.com:adlnet/competency-example into performance
creighton
committed
changed language on results page
Lou Wolford
committed
Merge pull request #20 from ljwolford/tetris
creighton
committed
fixed init conflictMerge branch 'performance' of https://github.com/adlnet/competency-example
techteam
committed
deal with www issue
creighton
committed
deal with www issue
creighton
committed
just saving www so i can pull
techteam
committed
er conflict res
techteam
committed
Merge pull request #21 from creighton/performance
Lou Wolford
committed

Commits on Jan 17, 2014

Commits on Jan 22, 2014

rename files
creighton
committed
Merge pull request #23 from creighton/performance
Lou Wolford
committed

Commits on Apr 1, 2014

not sure
creighton
committed

Commits on Apr 11, 2014

removed option to update lrs endpoint
Lou Wolford
committed

Commits on Apr 14, 2014

added testapp
Lou Wolford
committed
Merge pull request #27 from ljwolford/perf
Lou Wolford
committed
uses gunicorn now
Lou Wolford
committed
i don't know anymore
techteam
committed
Merge pull request #28 from ljwolford/perf
creighton
committed
Merge branch 'prod' of https://github.com/adlnet/competency-example into prod
techteam
committed
removing the ~ ones
techteam
committed
and # 5's
techteam
committed
fixed objectURI
Lou Wolford
committed
fixed conflict
Lou Wolford
committed
Merge pull request #29 from ljwolford/perf
Lou Wolford
committed
added button
creighton
committed
Merge pull request #30 from creighton/prod
Lou Wolford
committed

Commits on Jun 6, 2014

saved production settings
techteam
committed

Commits on Jan 6, 2016

Commits on Jan 8, 2016