Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

9300 Commits

Author SHA1 Message Date
Diana Huang
a26006f7c3 Add new test for the CombinedOpenEndedModule 2013-01-25 15:09:01 -05:00
Diana Huang
5e34f38ca9 Better error handling. 2013-01-25 13:46:57 -05:00
Diana Huang
47c24d8e7e Raise smarter exceptions when parsing rubrics. 2013-01-25 13:33:35 -05:00
Victor Shnayder
66934ce220 Address Dave's comments on https://github.com/MITx/mitx/pull/1350 2013-01-25 13:33:19 -05:00
Diana Huang
115f6c3acf Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-25 11:19:38 -05:00
Diana Huang
71d27def0d Fix tests and add new documentation 2013-01-25 11:18:30 -05:00
Diana Huang
3ec2a83ec1 Merge branch 'diana/open-ended-ui-updates' into tests/diana/update-oe-unit-tests 
Fix

Conflicts:
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
 2013-01-25 10:35:55 -05:00
Diana Huang
bb521a20b7 fix a bug caught with testing and update some tests 
(the last couple are still broken, though)
 2013-01-25 10:19:09 -05:00
Victor Shnayder
22ccf9c500 Some test cleanups 2013-01-24 17:33:25 -05:00
Diana Huang
bb60dde45e Add OpenEndedModule tests 2013-01-24 17:09:19 -05:00
Jay Zoldak
896933a3c4 Fix broken IE 2013-01-24 17:02:18 -05:00
Victor Shnayder
69711a91ff Fix inline discussion cohorting, debug logging 2013-01-24 16:58:19 -05:00
Victor Shnayder
3bfe9decf4 Change config keys to use underscores for consistency with other policy keys 2013-01-24 15:14:34 -05:00
Victor Shnayder
9e84ae14d4 Started integration work with Kevin's cohort changes 
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.

Next: testing :)
 2013-01-24 15:14:33 -05:00
Victor Shnayder
7bdb5c23e1 Allow listing of users in cohorts and adding users 
- still needs style, more features, but basic functionality works
 2013-01-24 15:12:53 -05:00
Victor Shnayder
0d41a04490 fix line length 2013-01-24 15:12:52 -05:00
Victor Shnayder
90a5703419 Test for cohort config 2013-01-24 15:12:52 -05:00
Victor Shnayder
f005b70f3b Minor test cleanups 2013-01-24 15:12:52 -05:00
Victor Shnayder
fa17913a91 is_cohorted course descriptor property, docs 2013-01-24 15:12:52 -05:00
Diana Huang
37c7b47017 Update comments and add new OpenEndedChild tests 2013-01-24 14:02:24 -05:00
Diana Huang
1f8db18903 New tests for open ended module 2013-01-24 12:36:48 -05:00
David Ormsbee
e074c629fc Merge pull request #1344 from MITx/bugfix/brian/pearson-reg-end-date 
add UTC time to registration end date
 2013-01-24 09:27:11 -08:00
Don Mitchell
f2b43ec459 Merge pull request #1343 from MITx/feature/christina/tiny-mce 
Make code inline instead of block.
 2013-01-24 05:34:36 -08:00
Brian Wilson
0cb5f101ae add UTC time to registration end date 2013-01-24 01:18:10 -05:00
cahrens
711cc9a041 Tell tinyMCE to not change image paths. 
#143
 2013-01-23 20:18:28 -05:00
Diana Huang
cc67017d4c Merge branch 'master' into diana/open-ended-ui-updates 2013-01-23 16:45:40 -05:00
cahrens
4a79643fde Make code inline instead of block. 2013-01-23 16:43:49 -05:00
Victor Shnayder
abcc5c0204 Merge pull request #1342 from MITx/feature/cdodge/add-standard-problem-metadata 
update templates to include attemps and weight values. Also update capa_...
 2013-01-23 13:40:46 -08:00
Chris Dodge
2856971b45 update templates to include attemps and weight values. Also update capa_module.py to accept empty strings ('') to mean 'default value' 2013-01-23 16:36:16 -05:00
chrisndodge
fe8e25e72d Merge pull request #1341 from MITx/feature/christina/tiny-mce 
Toggling of code should mark editor as dirty.
 2013-01-23 13:25:01 -08:00
cahrens
2969a9e48d Toggling of code should mark editor as dirty. 2013-01-23 16:19:17 -05:00
Chris Dodge
9d5ac308b1 remove flag to hide progress tab 2013-01-23 15:11:41 -05:00
Calen Pennington
27b57bb48b Don't update settings based on data from content for discussion modules during init 2013-01-23 14:51:07 -05:00
Calen Pennington
993c24b72b WIP: Model data caching work 2013-01-23 14:51:07 -05:00
Calen Pennington
c44898b1de Remove random printing during XModuleDescriptor equality check 2013-01-23 14:47:05 -05:00
Calen Pennington
2eca8bd0e9 Set default video position to 0, but don't overwrite it during __init__ 2013-01-23 14:47:05 -05:00
Calen Pennington
e5a6509bb0 Add a first_time_user attribute to CourseModule so that we can check for that explicitly, rather than looking for an implicitly created StudentModule 2013-01-23 14:47:05 -05:00
Calen Pennington
ce76b64bae Handle problem resets in such a way that the LoncapaProblem generates the new random seed, and the CapaModule saves that seed 2013-01-23 14:47:05 -05:00
Calen Pennington
9d66169d06 Don't set a seed to None that's already None 2013-01-23 14:47:05 -05:00
Calen Pennington
8e5373f993 Make Randomization return un-adjusted values as a passthrough 2013-01-23 14:47:05 -05:00
Brian Talbot
5fee7eeaec studio - further resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:58:20 -05:00
Brian Talbot
2ca267dc52 studio - resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:50:10 -05:00
Don Mitchell
b0bbb34644 Merge pull request #1331 from MITx/feature/christina/tiny-mce 
Feature/christina/tiny mce
 2013-01-23 09:14:42 -08:00
Ned Batchelder
376575dedd Make system.xblock_model_data more explicit to fix the problem where error descriptors can't get any data because the schema and the data don't match. 2013-01-23 11:34:24 -05:00
cahrens
2609ba4093 Delete unused icon, reorder dropdown. 2013-01-23 11:02:16 -05:00
Don Mitchell
966db4fbaf Merge pull request #1329 from MITx/fix/cdodge/draft-store-get-items 
add optional course_id parameter to DraftMongoStore.get_items()
 2013-01-23 07:39:36 -08:00
Diana Huang
5ca1586e0c Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 2013-01-23 08:57:47 -05:00
Diana Huang
71e4541c69 Merge branch 'master' into feature/diana/rubric-input 2013-01-23 08:56:55 -05:00
Brian Talbot
5e7726079e studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon 2013-01-22 23:32:51 -05:00
Brian Talbot
023dadd074 studio - resolved base variable missing issue on lms side 2013-01-22 16:31:42 -05:00