Skip to content

Getting latest updates from master #42

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
Merged
flysaiah merged 65 commits into from
Aug 30, 2016
Merged

Getting latest updates from master #42

flysaiah merged 65 commits into from
Aug 30, 2016

Conversation

@flysaiah
Copy link
Owner

@flysaiah flysaiah commented Aug 30, 2016

No description provided.

jeff-rick and others added 30 commits July 20, 2016 22:13
@jeff-rick
Style changes to wrong indent feedback
6e43bd1
@ericsonga
Merge remote-tracking branch 'RunestoneInteractive/master'
5599835
@ericsonga
Merge remote-tracking branch 'RunestoneInteractive/master'
bd49b5a
@bnmnetp
Bug fix for python2.7 in how we bind the port
ef6dd9c
@bnmnetp
Move fitb to its own folder.
dfb49cc
@bnmnetp
Start to add the RunestoneDirective class.
4b31d32
@bnmnetp
Merge branch 'master' into runestone_directive
cb87bfb
@bnmnetp
Make RunestoneComponents inherit from RunestoneDirective
afde331
@bnmnetp
remove print
534bea0
@bnmnetp
Add __init__ to RunestoneDirective. Provide chapter, subchapter as in…
e4ec8d1 
…stance variables. along with line number and full path.
@bnmnetp
document some environmental variables.
7c48cd9
Fixed bug where renderFeedback sometimes gets called before feedback …
31b215a 
…div is rendered
@bnmnetp
simple question directive
796b19c
@bnmnetp
add selenium tests for question directive
ac67fb6
@bnmnetp
fix port
2324dd8
@bnmnetp
Merge pull request #210 from RunestoneInteractive/runestone_directive
869e4c6 
Runestone directive
@bnmnetp
point to favicon.ico
e72e623
@bnmnetp
bump Version
9b0f5c1
@ericsonga
Added logging of pause and resume for the timed exam
4684e8c 
I added logging of pause and resume for the timed exam
@ericsonga
Merge remote-tracking branch 'RunestoneInteractive/master'
87286ae
@bnmnetp
bug fix: encode source for questions as ascii. otherwise spaces myste…
b589f4d 
…riously disappear on their way into the database.
@bnmnetp
Bug Fix: text losing spaces on db entry.
c60be3a
@bnmnetp
don't die on a Unicode error. Just don't put the directive in the DB
a2cd487
@bnmnetp
bug fix: unicode errors
67637ea
@bnmnetp
eradicate hard coded forward slashes
aafe26b
@bnmnetp
bug fix for path separators
a79f685
@bnmnetp
For question directives, write out html to question table
2b42721
@bnmnetp
Make question directives cross referenceable. -- Also this will gener…
ff50b4b 
…ate a warning if we duplicate an id.
@bnmnetp
Make using a deprecated multiple choice an ERROR
ea520fe
@bnmnetp
Raise a sever warning on unicode characters in source of questions
f91c326
bnmnetp and others added 29 commits August 14, 2016 18:02
@bnmnetp
when an sid is provided as an opt set it for use in loading history
3d2fc83
@bnmnetp
Minor bug fix to properly set sid for an activecode for grading.
e23a55a
@jeff-rick
feedback on indent wrong
6a1339f
Activecode now runs on submit. Also fixed tiny Mchoice bug
cab3c7c
@bnmnetp
Merge pull request #216 from CSLearning4U/master
33214a0 
Added logging of pause and resume on timed exam
@bnmnetp
Merge pull request #226 from jochenrick/master
4466fce 
Refinements on Parsons
@bnmnetp
Merge pull request #227 from flysaiah/timedFixes
c01d86a 
Timed fixes
@bnmnetp
Merge branch 'master' of github.com:RunestoneInteractive/RunestoneCom…
9187f1d 
…ponents
@bnmnetp
Critical Bug fix: Logic error causing nothing to get saved!
0efcd3b
@bnmnetp
Critical Bug Fix
7754a44
@aerenchyma
Remove now-unnecessary hack from activecode.py
5614af6
@bnmnetp
Merge pull request #234 from aerenchyma/remove-unicode-hack
abb2a8e 
Remove now-unnecessary hack for unicode from activecode.py
@bnmnetp
populate chapters and subchapters from new style toc arrangement that…
c192874 
… allows us to

have numbered sections.
@bnmnetp
Merge remote-tracking branch 'origin/master'
8fd4849
@bnmnetp
Release: Add support for numbered sections
2478162
@bnmnetp
Configure myself to be lean and mean when I'm in on a grading page.
091423d
@bnmnetp
Bug Fix: restore the prompt on input
e607fd9
@bnmnetp
Bug fix: restore the prompt to the alert dialog.
6b540f6
@bnmnetp
Move cmap into __init__ to make it usable by others
0bef071
@bnmnetp
Move cmap into __init__ to make it usable by others
21fc730
@bnmnetp
Add an id to the pre tag for output unit testing
8f7b7c1
@bnmnetp
update alabaster
dad4e9f
@bnmnetp
New version of stdlib with improved unittest.gui and document
764fa80
@bnmnetp
release unittest logging
72b6fd7
@bnmnetp
Add section to contents of activecode to contain the question.
d6c4c7b 
The section for adding explanatory text to an activecode that we intend to use as an exercise, starts at the beginning of the body and goes to a line that contains ~~~~  (four tilde)  This section is recursively parsed by Sphinx and so may contain any sphinx markup you wish.  The line with the ~ is discarded and the remainder of the body is processed as usual.
@bnmnetp
Capture basecourse in the runestonedirective parent class.
113f96e
@bnmnetp
Fix addActiveCodeToDiv to work with the history slider for grading.
4402a51
@bnmnetp
save chapter/subchapter to options
5d9a052
@bnmnetp
activecode can now contain instructions when used as an exercise
37d5239
@flysaiah flysaiah merged commit 302aab5 into flysaiah:master Aug 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@flysaiah @presnick @jeff-rick @ericsonga @bnmnetp @aerenchyma