cahrens
9a7b0fb563
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
...
Conflicts:
cms/templates/checklists.html
2013-03-14 13:47:55 -04:00
cahrens
017fd06bfc
Pre-merge.
2013-03-14 13:37:22 -04:00
Brian Talbot
0aea85a4d9
studio - checklists: moved content to yaml file, cleaned up new checklists production view, added in page-level nav, and collapse/expand indicators
2013-03-14 12:55:44 -04:00
cahrens
564374048e
A little cleanup.
2013-03-14 09:35:26 -04:00
cahrens
065e850449
Merge with Brian's changes.
2013-03-14 09:32:54 -04:00
cahrens
e0207432ca
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
2013-03-14 09:23:05 -04:00
cahrens
54156b7ac1
Saving work.
2013-03-14 09:22:58 -04:00
Brian Talbot
1fce77d8b2
Merge branch 'master' into feature/btalbot/studio-checklists
2013-03-13 19:19:38 -04:00
Brian Talbot
7b74d972a1
studio - checklists: defaulting checklist visual progress to 0%
2013-03-13 19:18:47 -04:00
Brian Talbot
16f6744aef
studio - checklists: revised task completion styles, added in checklist visual progress UI and demo/PoC JS and cleaned up some content/status states
2013-03-13 19:13:26 -04:00
Brian Talbot
bf71f099d4
studio - checklists: finished static styling, initial checklist content import, and some basic JS
2013-03-13 14:09:18 -04:00
Brian Talbot
66a8735a58
studio - Checklists: initial design and front end proofing/firming up - WIP
2013-03-13 10:50:34 -04:00
Brian Talbot
1b5f040021
studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI
2013-03-12 21:57:40 -04:00
John Hess
0b2226b051
Merge pull request #1660 from MITx/hotfix/jkarni/folditorder
...
Table order fix (again), changes a single character
2013-03-12 16:17:08 -07:00
Diana Huang
faab0ac139
Merge pull request #1657 from MITx/fix/brian/regrade-partial
...
add management command to regrade partial-credit problems affected by ge...
2013-03-12 13:40:15 -07:00
Christina Roberts
349348fcd3
Merge pull request #1661 from MITx/fix/cdodge/dont-clobber-on-delete-draft
...
hot fix for delete_item. The 'delete_all_versions' is useful in that it ...
2013-03-12 13:21:42 -07:00
Calen Pennington
47420fe7c5
Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads
2013-03-12 16:18:48 -04:00
Ned Batchelder
b05b627c23
Reduce some more pylint noise
2013-03-12 16:10:37 -04:00
Brian Wilson
046e0fd75e
Merge remote-tracking branch 'origin/master' into fix/brian/regrade-partial
2013-03-12 16:09:10 -04:00
Calen Pennington
174ba0039d
Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads
2013-03-12 15:51:29 -04:00
Brian Wilson
47e708e713
fix pylint and pep8 warnings
2013-03-12 15:49:48 -04:00
Chris Dodge
e5ee0a77ed
hot fix for delete_item. The 'delete_all_versions' is useful in that it is set to true when doing explicit deletes as opposed to 'delete draft'. If delete_all_versions=False, then don't remove the deleted item from the parent children collection
2013-03-12 15:24:10 -04:00
Brian Wilson
6aed059d5f
Change date and remove filtering by grade. Add check for student_answers.
2013-03-12 14:55:27 -04:00
Ned Batchelder
bc854ef068
Merge branch 'master' of github.com:MITx/mitx
2013-03-12 14:34:54 -04:00
Ned Batchelder
70af75e852
Don't run pylint on migrations, and it's ok to have a global name 'log'
2013-03-12 14:34:39 -04:00
Jay Zoldak
0ee656316b
Merge pull request #1659 from MITx/fix/vik/oe-pep8
...
Fix/vik/oe pep8
2013-03-12 11:34:26 -07:00
Vik Paruchuri
c40ab310c3
Blank line fixes
2013-03-12 14:24:42 -04:00
Brian Wilson
fe0447093c
add management command to regrade partial-credit problems affected by get_npoints bug.
2013-03-12 14:00:18 -04:00
Vik Paruchuri
554cb752fa
Pep8 cleanup
2013-03-12 12:20:11 -04:00
Julian Arni
1058b552f2
Table order fix (again)
2013-03-12 11:30:14 -04:00
Calen Pennington
dfd66c6520
Merge pull request #1650 from MITx/victor/fix-auto-cohorting
...
Add logging to debug strange cohort behavior on prod.
2013-03-12 04:28:28 -07:00
chrisndodge
90caa65b53
Merge pull request #1651 from MITx/fix/cdodge/pylint-improvements
...
do a bunch of pylint improvements
2013-03-11 18:18:00 -07:00
Chris Dodge
bf0e5a2701
do a bunch of pylint improvements
2013-03-11 21:14:24 -04:00
John Hess
331806f155
Merge pull request #1646 from MITx/feature/jkarni/folditx
...
Feature/jkarni/folditx
2013-03-11 15:50:05 -07:00
Victor Shnayder
b06615298f
Add logging to debug strange cohort behavior on prod.
...
Strange behavior:
- There are 20 cohorts that users should be randomly assigned
into in HeroesX
- Almost all, but not all (e.g. ~3300 / 3400) users end up in the
same group.
- testing manually locally and on prod in a django shell shows
nothing wrong
2013-03-11 15:24:14 -07:00
John Hess
ad92eb4d02
whitespace back to original. for real though.
2013-03-11 18:05:34 -04:00
John Hess
00c35c95a4
whitespace back to original
2013-03-11 18:05:10 -04:00
John Hess
cc2c26b924
reverted change to definition to/from xml
2013-03-11 18:04:21 -04:00
chrisndodge
894f9171be
Merge pull request #1647 from MITx/fix/zoldak/pep8-cleanup-tests
...
Fix modulestore tests for pep8 violations
2013-03-11 12:20:38 -07:00
Jay Zoldak
1c98d5fc8d
Fix modulestore tests for pep8 violations
2013-03-11 15:16:09 -04:00
Don Mitchell
d85f7ac9be
Merge pull request #1645 from MITx/feature/cdodge/pylint-cleanup
...
Feature/cdodge/pylint cleanup
2013-03-11 12:10:05 -07:00
Julian Arni
6e92666a20
Fixed score order.
...
Less is more.
2013-03-11 14:57:19 -04:00
Chris Dodge
4ec3683c3c
clean up some pylint violations
2013-03-11 14:57:04 -04:00
Chris Dodge
26f4424581
clean up some pylint violations
2013-03-11 14:55:37 -04:00
Chris Dodge
78c8358957
clean up pyling violations from views.py
2013-03-11 14:51:44 -04:00
David Ormsbee
0605c94113
Merge pull request #1636 from MITx/feature/brian/htmlbook
...
Initial implementation of htmlbook.
2013-03-11 11:38:46 -07:00
Brian Wilson
53f85f2a07
return empty list if no html or pdf textbook appears in policy.json
2013-03-11 13:52:43 -04:00
David Ormsbee
aceb666076
Merge pull request #1642 from MITx/fix/rocha/numericresponse-exponential
...
Make numeric response handle plus sign exponential correctly
2013-03-11 10:03:44 -07:00
Christina Roberts
ce1807b735
Merge pull request #1641 from MITx/fix/cdodge/delete-not-removing-parent-reference
...
delete_item should update the parent's list of children to reflect the d...
2013-03-11 10:00:39 -07:00
Carlos Andrés Rocha
5f95c6848c
Make numeric response handle plus sign exponential correctly
...
NumericResponse was failing to accept as correct an answer with a plus
sign in the exponential. For example: 5.0e+1 was marked as incorrect
if the answer was 50. However, 5.0e1 was marked as correct. This
caused confusion, since the answer shown to students included the plus
sign.
LMS Lighthouse [#242 ]
2013-03-11 12:53:01 -04:00
