Arthur Barrett
d860b167d6
fixed tooltip positioning for non-overlapping spans in studio
2013-03-12 14:09:56 -04:00
Christina Roberts
1379ba9c58
Merge pull request #1658 from MITx/fix/zoldak/poll-merged-fix-factory
...
Update course factory to reflect XBlock changes
2013-03-12 11:09:51 -07:00
Jay Zoldak
f9f0bd0deb
Update course factory to reflect XBlock changes
2013-03-12 14:05:12 -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
Calen Pennington
c0b6c01fd1
Use the right pip for bash OR
2013-03-12 13:30:24 -04:00
Calen Pennington
137662081f
Squelch pep8 and pylint output unless they fail
2013-03-12 13:26:17 -04:00
Calen Pennington
7b2efa9dbf
Merge pull request #1656 from MITx/fix/vik/oe-xblock-stage2
...
Fix/vik/oe xblock stage2
2013-03-12 10:20:52 -07:00
Vik Paruchuri
f4930fff42
Merge remote-tracking branch 'origin/feature/alex/poll-merged' into fix/vik/oe-xblock-stage2
2013-03-12 13:04:42 -04:00
Vik Paruchuri
3a22dbafbe
Change task states
2013-03-12 13:04:40 -04:00
Calen Pennington
2aa24350cd
Migrate the randomize module to the new storage model
2013-03-12 12:59:06 -04:00
Calen Pennington
222aca7045
Make sure to parse integers that have been stored as strings in the DB
2013-03-12 12:45:16 -04:00
Calen Pennington
433e50e04f
Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads
2013-03-12 12:41:22 -04:00
Vik Paruchuri
554cb752fa
Pep8 cleanup
2013-03-12 12:20:11 -04:00
Don Mitchell
6922152165
Merge pull request #1653 from MITx/feature/studio/advanced-settings-revamp-merge
...
Advanced Settings changes.
2013-03-12 09:13:16 -07:00
Calen Pennington
f155bd0943
Merge pull request #1655 from MITx/fix/vik/oe-xblock-stage
...
Potentially fix xblock storage model for open ended
2013-03-12 08:46:03 -07:00
Julian Arni
1058b552f2
Table order fix (again)
2013-03-12 11:30:14 -04:00
Vik Paruchuri
19e3e79cfa
Remove model data, save instance state after init
2013-03-12 11:30:08 -04:00
cahrens
eea5900591
Add in Mark's copy changes.
2013-03-12 11:15:50 -04:00
Calen Pennington
f6b4d3aa46
Make the markdown attribute default to None, to distinguish it from the empty string
2013-03-12 10:50:14 -04:00
Calen Pennington
1411fadd28
Fix access to children via definition
2013-03-12 10:41:10 -04:00
Kevin Chugh
a2be6dd420
first cut of UI
2013-03-12 10:31:05 -04:00
Calen Pennington
2a96c45677
Make default value for format setting None, and force lms and cms to be explicit about a string default
2013-03-12 10:16:14 -04:00
cahrens
bdf1b1b097
Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp-merge
2013-03-12 09:38:34 -04:00
Calen Pennington
cfd7e6d214
Coerce correctmap keys to strings, so that they are pickleable
2013-03-12 09:32:19 -04:00
cahrens
99f55266f5
Do not need to pass blacklist keys to client.
2013-03-12 09:27:46 -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
Calen Pennington
2113541632
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
.ruby-version
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/models/settings/course_metadata.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/modulestore/tests/factories.py
2013-03-12 07:23:28 -04:00
Calen Pennington
40f134ed4d
Don't use mutable defaults for fields
2013-03-11 22:23:23 -04: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
d44e7272d2
readding Julian Arni's update to definition
2013-03-11 18:17:12 -04: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
Arthur Barrett
fcf82ba2bc
fixed pep8 violations for annotation module
2013-03-11 18:02:22 -04:00
cahrens
84f2137935
Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp
2013-03-11 16:57:07 -04:00
cahrens
7e8fcb85ff
Updated Selenium test, deleted dead code related to Advanced Settings.
2013-03-11 16:56:24 -04:00
Arthur Barrett
946af8e189
Merge branch 'master' into feature/abarrett/annotation-styling-fixes
2013-03-11 16:27:55 -04:00
Arthur Barrett
094458dd6f
Modified tooltip positioning on non-overlapping annotation spans.
2013-03-11 16:19:36 -04:00
Will Daly
9d8c023acb
Removed calls to Navigation.bind() and Calculator.bind()
...
that were causing phantomjs interpreter to fail
with undefined method error.
2013-03-11 15:58:31 -04:00
Calen Pennington
a39d607a8d
Make default course grading weights integers, to minimize floating point variation
2013-03-11 15:41:59 -04:00
Calen Pennington
4cea094f70
Be a little more liberal with what count's as not having a due date in a section
2013-03-11 15:29:58 -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
