Commit Graph

19654 Commits

Author SHA1 Message Date
Chris Dodge
b54ebb3460 make discussion module use MetadataOnlyEditingDescriptor which will not present a code edit region and only display the metadata editor 2013-03-15 22:43:20 -04:00
Victor Shnayder
d91008b73a Prevent random.Random() from running at import time. 2013-03-15 19:40:47 -07:00
brianhw
b5cf9b326e Merge pull request #1679 from MITx/content/rocha/xblocks-announcement
Content/rocha/xblocks announcement
2013-03-15 14:27:01 -07:00
Chris Dodge
03caf94c98 remove redundent XML attribtues which are in metadata 2013-03-15 16:26:39 -04:00
Vik Paruchuri
e4efda9a47 Reformat code 2013-03-15 16:21:36 -04:00
Will Daly
5fd1e7426d Lettuce tests now import one_time_startup.py to ensure
that mongo caches are initialized for the test database.
This avoids a warning from the mongo modulestore.
2013-03-15 16:17:45 -04:00
Vik Paruchuri
cd3e88fdd5 Fix version tuples to be a dictionary 2013-03-15 16:05:38 -04:00
Vik Paruchuri
500c4ab86e Convert versions to tuples 2013-03-15 15:40:04 -04:00
Brian Talbot
06b118ae33 studio - sass cleanup: resolved static pages display issue after local merge master 2013-03-15 15:23:03 -04:00
Vik Paruchuri
01b1974f50 Address review comment 2013-03-15 15:15:23 -04:00
Will Daly
3a13cd7b34 Merged changes in factories.py with version in master 2013-03-15 15:09:39 -04:00
Vik Paruchuri
b609ab0e6a Convert to using versioninteger class 2013-03-15 15:05:47 -04:00
Vik Paruchuri
405ea8d675 Remove copy.copy 2013-03-15 14:57:48 -04:00
Vik Paruchuri
97839d9de5 Fix default version string integer issues 2013-03-15 14:52:55 -04:00
Victor Shnayder
64e1eb9903 Fix randomness bug in cohort placement
capa re-seeds the global RNG all the time, resulting in non-random
cohort placement.  Switch to using a local random module.

(Thanks Cale for helping me figure this out!)
2013-03-15 11:35:27 -07:00
Vik Paruchuri
c34666af80 Fix version handling 2013-03-15 14:20:55 -04:00
Will Daly
e41bb8462c Added lettuce tests for script (customresponse) problems.
Increased wait time for login screen to reduce false positives.
2013-03-15 14:04:22 -04:00
Will Daly
8423816076 LMS contentstore lettuce tests now dynamically create courses in mongo
using terrain.factories.py and capa.tests.response_xml_factory
2013-03-15 14:04:22 -04:00
Will Daly
a20a3a02bb Refactored lettuce problem test assertion that a problem is
correct/incorrect/unanswered
2013-03-15 14:02:21 -04:00
Will Daly
3d8625da9c Refactored problem lettuce test implementation 2013-03-15 14:02:21 -04:00
Will Daly
5a2a4055f8 Added lettuce test for formula problem 2013-03-15 14:02:21 -04:00
Will Daly
4d5a8e757c Added lettuce tests for numerical problem 2013-03-15 14:02:20 -04:00
Will Daly
b3946828c0 Added lettuce tests for string problems 2013-03-15 14:02:20 -04:00
Will Daly
e6466fdddc Changed user creation so that it creates the user only if it doesn't
already exist

Updated login dialog handling to workaround multiple login dialogs
that sometimes appear on a page (where the first one is hidden)
2013-03-15 14:02:20 -04:00
Will Daly
56a6363d7a CSS selectors in lettuce tests for problems now include the element tag. 2013-03-15 14:02:20 -04:00
Will Daly
90213d483c Wrote lettuce tests for drop-down, multiple choice, and checkbox
problems.
2013-03-15 14:02:20 -04:00
Carlos Andrés Rocha
93a59f244d XBlock SDK announcement
LMS Lighthouse [#261]
2013-03-15 10:43:56 -07:00
Your Name
53257a3c47 i need more sleep: 2013-03-15 12:47:28 -04:00
Your Name
68cb63daa8 accidentally deleted models file 2013-03-15 12:42:59 -04:00
Brian Talbot
84a5475d5a studio - sass cleanup: resolving conflicts with local master merge 2013-03-15 12:42:33 -04:00
Arthur Barrett
20767d5cc7 create notes djangoapp for annotator.js 2013-03-15 12:41:52 -04:00
Calen Pennington
6ed279ce38 Pin versions of testing tools 2013-03-15 12:40:27 -04:00
Your Name
a761e2e829 make pinning backward compatible 2013-03-15 12:38:28 -04:00
Carlos Andrés Rocha
7697a43cf4 Fix typo in signup forms
LMS Lighthouse [#263]
2013-03-15 09:38:06 -07:00
Calen Pennington
3b0aed5d42 Merge pull request #1572 from MITx/feature/alex/poll-merged
Feature/alex/poll merged
2013-03-15 09:04:42 -07:00
Calen Pennington
0f5a05c8a2 Merge pull request #1673 from MITx/jmpm-analytics
Addressing some pep8/pylint concerns
2013-03-15 09:04:15 -07:00
Calen Pennington
f1d4096bcd Mark snippets as raw strings to avoid having to escape backslashes 2013-03-15 11:52:50 -04:00
Your Name
0a53ec3ee6 updates 2013-03-15 11:37:58 -04:00
Calen Pennington
10de617dea Squelch a few more pylint exceptions 2013-03-15 11:28:46 -04:00
Calen Pennington
9f99c9004b Fix up capa tests 2013-03-15 11:28:33 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
f1c66e9178 Make common/djangoapps not a python module either 2013-03-15 11:16:15 -04:00
David Ormsbee
67a0cccba9 Addressing some pep8/pylint concerns 2013-03-15 11:08:09 -04:00
Your Name
470e402723 patch for backward compatibility 2013-03-15 10:51:34 -04:00
Calen Pennington
fd3ba7db2a Don't make cms.djangoapps a python module 2013-03-15 10:50:46 -04:00
Calen Pennington
fb8352e2cc Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-15 10:33:54 -04:00
Calen Pennington
8531d56268 Merge pull request #1665 from MITx/jmpm-analytics
Enables basic analytics tab in instructor dashboard
2013-03-15 07:06:02 -07:00
Calen Pennington
029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
2013-03-15 09:46:47 -04:00
Calen Pennington
116ecf2a50 Disable sequence nav buttons when the sequence is empty 2013-03-15 08:39:24 -04:00
Calen Pennington
44e6572e12 Make StringyInteger and StringyFloat return None when they can't parse the string from json, and don't try to overwrite max_attempts if it's '' 2013-03-15 08:25:27 -04:00