Skip to content

Commit

Permalink
Merge pull request #651 from jhamrick/changelog
Browse files Browse the repository at this point in the history
Update changelog with changes from 0.3.3 release
  • Loading branch information
jhamrick committed Jan 15, 2017
2 parents 26bfc5b + c0c11e3 commit c9bcca0
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
13 changes: 13 additions & 0 deletions nbgrader/docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,19 @@ A summary of changes to nbgrader.
0.3.x
-----

0.3.3
~~~~~

Version 0.3.3 of nbgrader is a minor bugfix release that fixes an issue with
running ``nbgrader fetch`` on JupyterHub. The following PR was merged for the 0.3.3 milestone:

- PR #600: missing sys.executable, "-m", on fetch_assignment

Thanks to the following contributors who submitted PRs or reported issues that were merged/closed for the 0.3.3 release:

- alikasamanli
- hetland

0.3.2
~~~~~

Expand Down
5 changes: 3 additions & 2 deletions nbgrader/docs/source/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ admin
Afterwards
ajax
alchemyst
alikasamanli
alope
app
apps
Expand Down Expand Up @@ -54,6 +55,7 @@ Gradebook
gradebook
Granger
hardcoded
hetland
hOlle
Homebrew
html
Expand Down Expand Up @@ -106,7 +108,6 @@ plugin
plugins
positionally
postgres
precendence
prepend
prepending
prepopulate
Expand Down Expand Up @@ -167,4 +168,4 @@ Workflow
workflow
workflows
xsrf
XSRF
XSRF
2 changes: 1 addition & 1 deletion nbgrader/docs/source/user_guide/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ What happens if I do some manual grading, and then rerun the autograder?
------------------------------------------------------------------------

If you rerun the autograder, nbgrader will never overwrite any manual grades or
comments that you have added, and manual grades *always* take precendence over
comments that you have added, and manual grades *always* take precedence over
autogrades.

However, if you have given a manual grade, then rerun the autograder, and the
Expand Down

0 comments on commit c9bcca0

Please sign in to comment.